aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into joindepAaron Patterson2013-10-2116-215/+328
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (23 commits) Escape the parentheses in the default function regexp Update docs on Tilt::Template in Asset Pipeline guide Fix loading a sql structure file on postgres when the file's path has whitespace in it remove trailing whitespace added with b057765 [ci skip]. Allow unscope to work with `where.not` Raise an exception when model without primary key calls .find_with_ids Process sub-query relation's binding values Instrument the generation of Action Mailer messages Remove extra variable creation and merge. In Relation#empty? use #exists? instead of #count. [ci skip] avoid deprecation warning in sample code Convert Fixnum into String the port number in MySQL Fix some indentation on autosave association Make define_non_cyclic_method simpler Add Sass gobbling info to asset pipeline docs Ensure the state is clean after one failure Fix typo in form_helper.rb add a new local variable to track if digests are being stored, to ensure the cleanup works correctly [ci skip] Fix number of methods added by association. update digestor code based on review ...
| * Merge pull request #12588 from jetthoughts/12586_subquery_with_unprepared_sqlRafael Mendonça França2013-10-214-6/+56
| |\ | | | | | | | | | | | | | | | | | | Inline bind values for sub-queries generated for Relation in where Conflicts: activerecord/CHANGELOG.md
| | * Process sub-query relation's binding valuesPaul Nikitochkin2013-10-204-4/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | Generated sub-query for Relation as array condition for `where` method did not take in account its bind values, in result generates invalid SQL query. Fixed by adding sub-query relation's binding values to base relation Closes: #12586
| * | Escape the parentheses in the default function regexpRafael Mendonça França2013-10-212-1/+6
| | | | | | | | | | | | | | | | | | | | | This is causing every default value in PostreSQL database to being handled as default function. Fixes #12581
| * | Fix loading a sql structure file on postgres when the file's path has ↵Kevin Mook2013-10-213-1/+13
| | | | | | | | | | | | whitespace in it
| * | remove trailing whitespace added with b057765 [ci skip].Yves Senn2013-10-211-2/+2
| | |
| * | Allow unscope to work with `where.not`Eric Hankins2013-10-213-7/+23
| | | | | | | | | | | | | | | | | | Allows you to call #unscope on a relation with negative equality operators, i.e. Arel::Nodes::NotIn and Arel::Nodes::NotEqual that have been generated through the use of where.not.
| * | Raise an exception when model without primary key calls .find_with_idsShimpei Makimoto2013-10-213-0/+13
| | |
| * | In Relation#empty? use #exists? instead of #count.Szymon Nowak2013-10-192-2/+5
| |/
| * Merge pull request #12560 from sue445/modify_find_lock_sample_codeYves Senn2013-10-181-3/+3
| |\ | | | | | | avoid deprecation warning in sample code [ci skip]
| | * [ci skip] avoid deprecation warning in sample codesue4452013-10-181-3/+3
| | | | | | | | | | | | | | | Account.find(1, lock: true) -> DEPRECATION WARNING: Passing options to #find is deprecated. Please build a scope and then call #find on it.
| * | Convert Fixnum into String the port number in MySQLKenta Okamoto2013-10-183-1/+15
| | |
| * | Fix some indentation on autosave associationArthur Neves2013-10-171-196/+196
| | |
| * | Make define_non_cyclic_method simplerArthur Neves2013-10-171-7/+7
| |/
* | @base_klass is not usedAaron Patterson2013-10-211-1/+0
| |
* | join_type isn't used on the node anymoreAaron Patterson2013-10-212-11/+7
| |
* | make joins generation method look similarAaron Patterson2013-10-211-6/+9
| |
* | remove node duping codeAaron Patterson2013-10-211-57/+19
| |
* | refactor outer join generationAaron Patterson2013-10-211-11/+6
| |
* | add outer joins for matching nodesAaron Patterson2013-10-211-2/+14
| |
* | construct joins by walking the outer join treeAaron Patterson2013-10-211-5/+34
| |
* | pass the outer joins to join_constraintsAaron Patterson2013-10-202-6/+3
| |
* | disconnect join_constraints from the instanceAaron Patterson2013-10-202-3/+3
| |
* | pass in scope chain so reflection is not neededAaron Patterson2013-10-202-3/+3
| |
* | pass the foreign table and class to the join_constraints methodAaron Patterson2013-10-202-5/+4
| |
* | pass the join type to the join_constraints methodAaron Patterson2013-10-202-2/+3
| |
* | Merge branch 'master' into joindepAaron Patterson2013-10-161-6/+6
|\| | | | | | | | | | | | | * master: Rephrase ActiveRecord transaction rollback warning Fix code blocks identation on AR and AS CHANGELOGs Removing unused fake models from actionpack tests
| * Fix code blocks identation on AR and AS CHANGELOGsLucas Mazza2013-10-161-6/+6
| |
* | use the node as cache so we can avoid accessing the tableAaron Patterson2013-10-151-13/+13
| |
* | apply tables to the whole tree from the outsideAaron Patterson2013-10-151-14/+8
| |
* | apply table aliases after the AST has been builtAaron Patterson2013-10-151-1/+13
| |
* | stop reversing tables until we absolutely mustAaron Patterson2013-10-152-3/+3
| |
* | pass the chain the join_constraintsAaron Patterson2013-10-152-3/+4
| |
* | Merge branch 'master' into joindepAaron Patterson2013-10-155-4/+11
|\| | | | | | | | | | | | | | | | | | | | | * master: use the cached arel table Fix typo in the changelog entry Don't remove the select values to add they back again Pluck on NullRelation accepts a list of columns Conflicts: activerecord/lib/active_record/relation/finder_methods.rb
| * 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`.
* | | Merge branch 'master' into joindepAaron Patterson2013-10-1532-96/+240
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (44 commits) grammar fix (reverted in e9a1ecd) Revert "fixed a doc bug in the CHANGELOG.md s/does no longer depend on/no longer depends on/" Add missed require making `enable_warnings` available Prepare generated Gemfile for Capistrano 3 Added --model-name option scaffold_controller_generator. read the association instead of sending we should have unique sponsorable ids in the fixtures at least simplify populating the ordering hash the preloader for the RHS has all the preloaded records, so ask it only calculate offset index once. #12537 Remove size alias for length validation Fix `singleton_class?` Minor Refactoring to `NumberHelper#number_to_human` `$SAFE = 4;` has been removed with Ruby 2.1 scope_chain should not be mutated for other reflections Remove `default_primary_key_type` and extract contains of `native_database_types` to a constant since they aren't conditional now in SQLite3Adapter. Makes it more like other adapters. cleanup changelog entry format. [ci skip] Extract a function to determine if the default value is a function Push default_function to superclass to avoid method check Dump the default function when the primary key is uuid ... Conflicts: activerecord/lib/active_record/relation/finder_methods.rb
| * | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-13 06:50:09 +0000