aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #11416 from tigrish/masterYves Senn2013-07-213-4/+4
|\ | | | | Rename the I18n keys for associations' restrict_dependent_destroy errors
| * Remove ambiguity with pluralizations and I18n keys used for association ↵Christopher Dell2013-07-133-4/+4
| | | | | | | | restrict_dependent_destroy errors
* | use the superclass implementationAaron Patterson2013-07-182-2/+4
| |
* | Improve ActiveRecord::QueryMethods#includes docsHenrik Hodne2013-07-171-0/+8
| | | | | | | | | | | | | | | | It's not immediately clear whether you can pass in multiple relations or not. After going through the code a bit, I saw that the arguments are just appended to an array. Also, added nested relations example. [ci skip]
* | Revert "Merge pull request #11120 from awilliams/ar_mysql2_boolean_quoting"Yves Senn2013-07-174-53/+6
| | | | | | | | | | This reverts commit cb1d07e43926bcec95cb8b4a663ca9889173395a, reversing changes made to 754a373e301d2df0b12a11083405252722bc8366.
* | parent_table is only used internallyAaron Patterson2013-07-161-4/+4
| |
* | decouple the manager class from building join constraintsAaron Patterson2013-07-162-10/+11
| |
* | cache the klass member of the reflectionAaron Patterson2013-07-161-8/+10
| |
* | cache the scope chain on the stack and eliminate `i`Aaron Patterson2013-07-161-7/+4
| |
* | just push on to the scope chain items. Oops! (thanks @carlosantoniodasilva)Aaron Patterson2013-07-161-2/+1
| |
* | use Relation#merge to combine scope chain itemsAaron Patterson2013-07-161-6/+6
| |
* | make sure scope_chain_items has consistent typesAaron Patterson2013-07-161-7/+9
| |
* | removes the obsolete private method column_methods_hash [Closes #11406]Xavier Noria2013-07-164-43/+28
| |
* | Move initializing process for query cache to ↵kennyj2013-07-162-2/+6
| | | | | | | | ActiveRecord::ConnectionAdapters::QueryCache module.
* | Unifies mysql and mysql2 casting of booleansawilliams2013-07-164-6/+53
| | | | | | | | | | Using the mysql2 adapter, boolean values were sometimes being incorrectly cast to 't' or 'f'. This changes the cast to match the mysql adapter behavior, ie 1 and 0.
* | `change_column` for PG adapter respects `:array` option.Yves Senn2013-07-163-2/+19
| |
* | save another array allocationAaron Patterson2013-07-151-1/+1
| |
* | removing useless assingmentAaron Patterson2013-07-151-1/+1
| |
* | reorder bind parameters when merging relationsAaron Patterson2013-07-153-3/+43
| |
* | use arel rather than slapping together SQL stringsAaron Patterson2013-07-152-5/+10
| |
* | Merge pull request #11451 from ↵Yves Senn2013-07-152-0/+8
|\ \ | | | | | | | | | | | | jetthoughts/11450_do_not_resave_destroyed_association Do not re-save destroyed association on saving parent object
| * | Do not re-save destroyed association on saving parent objectPaul Nikitochkin2013-07-152-0/+8
| | | | | | | | | | | | Closes #11450
* | | Remove deprecation warning from attribute_missing Arun Agrawal2013-07-153-29/+4
|/ / | | | | for attributes that are columns.
* | Merge pull request #11434 from jetthoughts/new_save_transaction_bugfixSantiago Pastorino2013-07-143-3/+23
|\ \ | | | | | | Remove extra decrement of transaction level
| * | #4566: Remove extra decrement of transaction levelPaul Nikitochkin2013-07-143-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `rollback_active_record_state!` tries to restore model state on `Exception` by invoking `restore_transaction_record_state` it decrement deep level by `1`. After restoring it ensure that states to be cleared and level decremented by invoking `clear_transaction_record_state`, which cause the bug: because state already reduced in `restore_transaction_record_state`. Removed double derement of transaction level and removed duplicated code which clear transaction state for top level.
* | | Merge pull request #11439 from ernie/only-scan-strings-for-nodesYves Senn2013-07-142-1/+8
|\ \ \ | | | | | | | | Blacklist->whitelist for reference scans in order!
| * | | Blacklist->whitelist for reference scans in order!Ernie Miller2013-07-142-1/+8
| |/ / | | | | | | | | | | | | | | | Stop special-casing Arel::Nodes as exempt from reference scanning in order. Instead, only scan order values that are strings for a table reference.
* / / re-introduce `select_for_count` private method.Yves Senn2013-07-141-5/+10
|/ / | | | | | | See https://github.com/rails/rails/commit/da9b5d4a8435b744fcf278fffd6d7f1e36d4a4f2#commitcomment-3630064 for discussion.
* | Reset @column_defaults when assigning .kennyj2013-07-143-0/+15
| |
* | Typo fix [skip ci]Ankit Gupta2013-07-121-1/+1
|/
* Avoid creating an extra Range instanceAkira Matsuda2013-07-101-1/+1
|
* fix visibility of the relation construction methodsAaron Patterson2013-07-091-5/+7
|
* pass arel to select_all rather than depend on method_missingAaron Patterson2013-07-091-1/+1
|
* Make sure that a joins Relation can be merged with has_many :through + ↵Akira Matsuda2013-07-102-1/+11
| | | | | | association proxy Closes #11248.
* Fix: attribute_for_inspect truncate upto (51 => 50) characters.namusyaka2013-07-092-3/+3
|
* Merge pull request #11174 from vipulnsward/remove_column_passingRafael Mendonça França2013-07-091-2/+2
|\ | | | | Stop sending column info to `substitute_at` as it doesn't get utilized.
| * Document where `column` param gets utilized in `substitute_at`.Vipul A M2013-07-011-2/+2
| |
* | Remove redundant test about `push_with_attributes` removal.Vipul A M2013-07-091-7/+0
| |
* | close our connection when we are doneAaron Patterson2013-07-082-14/+17
| |
* | remove dead codeAaron Patterson2013-07-081-16/+0
| |
* | if we remove the connection from the pool, we should close itAaron Patterson2013-07-081-0/+1
| |
* | use latches rather than mucking with the schedulerAaron Patterson2013-07-081-7/+7
| |
* | refactor to_sql so it does not depend on the to_sql implementation ofAaron Patterson2013-07-081-4/+11
| | | | | | | | the connection
* | Merge pull request #11274 from arunagw/deprecation-removed-build-fixedRafael Mendonça França2013-07-071-20/+0
|\ \ | | | | | | Deprecation removed build fixed
| * | Removed unused test for DateTime.local_offsetArun Agrawal2013-07-071-20/+0
| | | | | | | | | | | | see discussion here #11274
* | | Merge pull request #11336 from ankit8898/performance-bmRafael Mendonça França2013-07-061-1/+13
|\ \ \ | | | | | | | | Some performance benchmarking for take vs limit
| * | | Some performance benchmarking for take vs limitAnkit Gupta2013-07-061-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also added a dummy progress bar during insert of records so it shows something is happening. Performance report Model.take 6198.9 (±13.4%) i/s - 121743 in 20.042671s Model.take! 6173.6 (±13.6%) i/s - 121242 in 20.057006s Model.all limit(100) 107.8 (±15.8%) i/s - 2106 in 20.022316s Model.all take(100) 105.2 (±15.2%) i/s - 2061 in 20.062509s
* | | | Merge pull request #11306 from ↵Rafael Mendonça França2013-07-063-2/+50
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | jetthoughts/11288_remove_extra_queries_for_belongs_to_with_touch #11288: Removed duplicated touching Conflicts: activerecord/CHANGELOG.md
| * | | #11288: Removed duplicated touchingPaul Nikitochkin2013-07-053-2/+50
| | | | | | | | | | | | | | | | | | | | | | | | if belongs to model with touch option on touch Closes #11288
* | | | Extract common query to a constant.Vipul A M2013-07-061-1/+3
| | | | | | | | | | | | | | | | Perf ref: https://gist.github.com/vipulnsward/8209749201dfdd678c97