aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Fix some indentation on autosave associationArthur Neves2013-10-171-196/+196
|
* Make define_non_cyclic_method simplerArthur Neves2013-10-171-7/+7
|
* Fix code blocks identation on AR and AS CHANGELOGsLucas Mazza2013-10-161-6/+6
|
* use the cached arel tableAaron Patterson2013-10-152-2/+2
|
* Don't remove the select values to add they back againRafael Mendonça França2013-10-151-1/+1
| | | | | Conflicts: activerecord/lib/active_record/relation/finder_methods.rb
* Merge pull request #12547 from derekprior/dp-fix-null-relation-pluckRafael Mendonça França2013-10-153-2/+9
|\ | | | | Pluck on NullRelation should accept a list of columns
| * Pluck on NullRelation accepts a list of columnsDerek Prior2013-10-153-2/+9
| | | | | | | | | | | | `pluck` was updated to accept a list of columns, but the `NullRelation` was never updated to match that signature. As a result, calling `pluck` on a `NullRelation` results in an `ArgumentError`.
* | grammar fix (reverted in e9a1ecd)Vijay Dev2013-10-151-1/+1
|/
* read the association instead of sendingAaron Patterson2013-10-141-1/+3
|
* we should have unique sponsorable ids in the fixtures at leastAaron Patterson2013-10-141-1/+1
|
* simplify populating the ordering hashAaron Patterson2013-10-141-10/+5
|
* the preloader for the RHS has all the preloaded records, so ask itAaron Patterson2013-10-141-3/+3
|
* only calculate offset index once. #12537Aaron Patterson2013-10-141-6/+10
|
* Merge pull request #10538 from neerajdotname/3882Rafael Mendonça França2013-10-149-1/+65
|\ | | | | scope_chain should not be mutated for other reflections
| * scope_chain should not be mutated for other reflectionsNeeraj Singh2013-10-149-1/+65
| | | | | | | | | | | | | | | | | | | | | | Currently `scope_chain` uses same array for building different `scope_chain` for different associations. During processing these arrays are sometimes mutated and because of in-place mutation the changed `scope_chain` impacts other reflections. Fix is to dup the value before adding to the `scope_chain`. Fixes #3882.
* | Merge pull request #12527 from vipulnsward/sqlite_database_typesRafael Mendonça França2013-10-141-18/+16
|\ \ | |/ |/| SQLite3 Adapter datatypes cleanup
| * Remove `default_primary_key_type` and extract contains of ↵Vipul A M2013-10-141-18/+16
| | | | | | | | `native_database_types` to a constant since they aren't conditional now in SQLite3Adapter. Makes it more like other adapters.
* | Merge pull request #9499 from ↵Rafael Mendonça França2013-10-143-2/+24
|\ \ | |/ |/| | | | | | | | | | | | | dmitry/inverse_instance_should_not_be_reloaded_after_stale_state_change Inversed instance should not be reloaded after stale state was changed Conflicts: activerecord/CHANGELOG.md
| * Add a note to the changelog for #9499Dmitry Polushkin2013-10-131-0/+6
| |
| * add inversed accessor to association classDmitry Polushkin2013-10-131-2/+3
| |
| * inversed instance should not be reloaded after stale state was changedDmitry Polushkin2013-10-132-2/+17
| | | | | | check at association reader that record is inverted and should not be reloaded because of stale was changed at target record
* | Merge pull request #11833 from vipulnsward/remove_autoincrementRafael Mendonça França2013-10-142-15/+3
|\ \ | | | | | | Remove sqlite specific`supports_autoincrement?` which defaults to true
| * | Remove sqlite specific`supports_autoincrement?` which always defaults to trueVipul A M2013-08-102-15/+3
| | |
* | | cleanup changelog entry format. [ci skip]Yves Senn2013-10-141-2/+4
| | |
* | | Extract a function to determine if the default value is a functionRafael Mendonça França2013-10-141-1/+5
| | |
* | | Push default_function to superclass to avoid method checkRafael Mendonça França2013-10-143-15/+18
| | |
* | | Dump the default function when the primary key is uuidRafael Mendonça França2013-10-142-2/+3
| | | | | | | | | | | | Fixes #12489
* | | Merge pull request #12486 from cjolly/newline-eof-structure-sqlRafael Mendonça França2013-10-131-0/+1
|\ \ \ | |_|/ |/| | newline at end of structure.sql file
| * | newline at end of structure.sql fileChad Jolly2013-10-131-0/+1
| | |
* | | Merge pull request #12518 from vipulnsward/remove_count_optionsRafael Mendonça França2013-10-135-20/+17
|\ \ \ | | | | | | | | `Relation#count` doesn't use options anymore.
| * | | Stop accepting `options` for `Relation#average`, `Relation#minimum`, ↵Vipul A M2013-10-143-12/+12
| | | | | | | | | | | | | | | | `Relation#maximum`, `Relation#calculate`, `perform_calculation`, `NullRelation#calculate` as they isn't used anymore.
| * | | `Relation#count` doesn't use options anymore.Vipul A M2013-10-133-8/+5
| | | |
* | | | Add nodoc to methodRafael Mendonça França2013-10-131-1/+1
| | | |
* | | | Merge pull request #12508 from ↵Rafael Mendonça França2013-10-134-2/+40
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jetthoughts/12415_generate_subqueries_for_relation_from_binding_params Generate subquery for Relation passed as array condition for where Conflicts: activerecord/CHANGELOG.md
| * | | | Generate subquery for Relation passed as array condition for wherePaul Nikitochkin2013-10-134-2/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of executing 2 queries for fetching records filtered by array condition with Relation, added generation of subquery to current query. This behaviour will be consistent when passes Relation as hash condition to where Closes: #12415
* | | | | Merge pull request #12456 from razielgn/ar-test-fixesRafael Mendonça França2013-10-133-5/+11
|\ \ \ \ \ | | | | | | | | | | | | Fixed MRI dependent stuff in AR tests
| * | | | | Allow methods arity below -1 in assert_responds.Federico Ravasio2013-10-081-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Every method from MRI's core classes is written in C. This means Method#arity always returns -1 for methods with a variable number of arguments. This is not the case with Rubinius, where, for example Array#slice! is implemented in Ruby and has arity -2, since is defined as def slice!(start, length = undefined)
| * | | | | Assert presence of "frozen" in error message, not the full MRI message.Federico Ravasio2013-10-081-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Related to all the other issues regarding message independent assertions to make Rails compatible with other Ruby implementations other than MRI. The best way here would be to have a specific error raised when modifying frozen objects, like FrozenObjectError or something. But since Ruby doesn't provide such a thing, we must limit the assertion to the lowest common denominator, which is word "frozen".
| * | | | | Just change ENV and restore it afterwards.Federico Ravasio2013-10-071-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stubbing ENV[] is not safe outside MRI. At some point after the stubbing has occurred a backtrace is printed to the ActiveSupport warning log: there Rubinius accesses ENV['RBX_NOCOLOR'] to determine if it should print the backtrace with colors or not, causing the stub to fail. Other implementations might access ENV in a different way too, we just can't predict it. The only thing we can do here is to actually set the ENV with what we want and restore it afterwards.
* | | | | | Merge pull request #12511 from ↵Rafael Mendonça França2013-10-132-3/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | jetthoughts/informative_raise_message_for_incorrect_association Make missed association exception message more informative
| * | | | | | Make missed association exception message more informativePaul Nikitochkin2013-10-132-3/+9
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Add target class name, which should have missed association on preload, into exception message to simplify detecting problem part.
* | | | | | Drop unused iterator varVipul A M2013-10-131-1/+1
| |_|/ / / |/| | | |
* | | | | Merge pull request #11791 from versioncontrol/includes_with_persistent_selectRafael Mendonça França2013-10-123-1/+15
|\ \ \ \ \ | |/ / / / |/| | | | Includes with persistent select, fixes #11773
| * | | | Fixes #11773 when using includes combined with select, the select statement ↵Edo Balvers2013-10-083-1/+15
| | | | | | | | | | | | | | | | | | | | was overwritten.
* | | | | no reason to do this column addition and subtraction businessAaron Patterson2013-10-111-1/+1
| | | | |
* | | | | refactor a little so we can remove some methodsAaron Patterson2013-10-102-4/+1
| | | | |
* | | | | the parent node is on the stack, so use itAaron Patterson2013-10-101-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | we don't need to walk back up the node's parents when we have the parent on the stack
* | | | | pass the parent node to the construct methodAaron Patterson2013-10-101-7/+6
| | | | |
* | | | | nodes do not need to be sortedAaron Patterson2013-10-101-1/+1
| | | | |
* | | | | delete unused codeAaron Patterson2013-10-102-50/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Now that we merge trees from the top down, we don't need to search through the whole tree for particular nodes, just walk it and merge.