aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'mainstream/master'Pratik Naik2010-01-0474-1395/+3150
|\
| * Ensure using proper engine for Arel::TablePratik Naik2010-01-043-3/+15
| |
| * Relation#merge and Relation#except should respect locksPratik Naik2010-01-032-1/+8
| |
| * Relation#merge and Relation#except should respect havingsPratik Naik2010-01-031-1/+3
| |
| * Add Relation#exceptPratik Naik2010-01-033-0/+39
| |
| * Rename a variable name for consistencyPratik Naik2010-01-033-7/+7
| |
| * Move Relation#spawn and Relation#merge to a separate modulePratik Naik2010-01-033-46/+51
| |
| * Give preference to the second relation's order when mergingPratik Naik2010-01-032-4/+10
| |
| * Reapply "Remove optional join_dependency argument as Relation always ↵Pratik Naik2010-01-031-2/+1
| | | | | | | | supplies it" - Now without syntax errors
| * Revert "Remove optional join_dependency argument as Relation always supplies it"Jeremy Kemper2010-01-021-1/+2
| | | | | | | | This reverts commit 8e57deed8b4efad6ea1c551f415b74596111f890.
| * Remove optional join_dependency argument as Relation always supplies itPratik Naik2010-01-031-2/+1
| |
| * Further simplify Relation#references_eager_loaded_tables?Pratik Naik2010-01-031-20/+3
| |
| * Cache Relation#to_sqlPratik Naik2010-01-031-2/+5
| |
| * Remove unused code from association.rb now that Relation takes care of ↵Pratik Naik2010-01-031-78/+0
| | | | | | | | checking the referenced tables
| * Make Relation#includes behave exactly like the existing :include optionPratik Naik2010-01-032-14/+32
| |
| * Add Relation#includes to be an equivalent of current finder option :includePratik Naik2010-01-035-8/+43
| |
| * Get rid of Model.construct_finder_arel_with_includes. Use ↵Pratik Naik2010-01-033-15/+10
| | | | | | | | construct_finder_arel instead
| * Simply methods for checking eager loaded tables references in the queryPratik Naik2010-01-031-7/+7
| |
| * Use activerecord.errors.format as in Rails 2.3.5.José Valim2010-01-021-0/+3
| |
| * Be sure to convert namespaced names to we have 'Parrots name' instead of ↵José Valim2010-01-021-0/+1
| | | | | | | | 'Parrots.name' in error messages.
| * Make nested attributes behave like in 2.3.5 and add a sanity test for it ↵José Valim2010-01-023-9/+25
| | | | | | | | with I18n.
| * Implement Relation#create and Relation#create!Pratik Naik2010-01-032-1/+37
| |
| * Implement Relation#newPratik Naik2010-01-032-1/+28
| |
| * Use arel predicates instead of strings wherever possible when merging relationsPratik Naik2010-01-021-11/+10
| |
| * Give higher preference to second relation's equality predicates when mergingPratik Naik2010-01-021-11/+27
| |
| * Remove the test which was testing a non-existing method, always failing on ↵Pratik Naik2010-01-021-6/+0
| | | | | | | | 1.9 and never even running on 1.8
| * Make sure not to spalt string argumentsPratik Naik2010-01-021-1/+1
| |
| * Use relations to build uniqueness conditionsPratik Naik2010-01-021-8/+9
| |
| * Fix join string for the WHERE clausePratik Naik2010-01-021-1/+1
| |
| * Rename Model.arel_table to Model.active_relationPratik Naik2010-01-027-29/+29
| |
| * Rename Model.engine to active_relation_engine. Cache arel_table and the ↵Pratik Naik2010-01-022-9/+14
| | | | | | | | method takes no arguments now
| * Use Arel::Table instead of ActiveRecord::Relation from HABTM and ↵Pratik Naik2010-01-012-4/+4
| | | | | | | | has_many#delete_records
| * Remove unncessary arguments passed to arel_tablePratik Naik2010-01-012-2/+3
| |
| * Use arel for building the STI type conditionPratik Naik2010-01-011-7/+7
| |
| * Merge commit 'josevalim/inheritance'Jeremy Kemper2009-12-317-48/+31
| |\
| | * Simplify repair_validations on AR and make it work with new callbacks.José Valim2010-01-017-48/+31
| | |
| * | Make sure association proxy does not pass quoted table name to sanitize_sqlPratik Naik2010-01-011-1/+1
| | |
| * | Handle Range with excluded endPratik Naik2010-01-011-1/+8
| | |
| * | Try using cached attribute before creating a new onePratik Naik2010-01-011-1/+1
| | |
| * | Use PredicateBuilder for sql hash sanitizationPratik Naik2010-01-013-26/+14
| | |
| * | Fix the method name for recusionPratik Naik2010-01-011-1/+1
| | |
| * | Move predicate building to a stand alone PredicateBuilder classPratik Naik2010-01-013-30/+41
| | |
| * | Some railties cleanup:Carl Lerche2009-12-311-2/+2
| | | | | | | | | | | | | | | | | | * Rename <framework>/rails.rb -> <framework>/railtie.rb * Rails::Plugin -> Rails::Railtie * Rails::Plugin::Vendored -> Rails::Plugin
| * | Rename rails.rb -> rails/all.rb and rails/core.rb -> rails.rbCarl Lerche2009-12-311-0/+1
| | |
| * | Use Arel::Attribute when building where conditions from hashPratik Naik2010-01-011-5/+36
| | |
| * | Add a /rails.rb for each framework for consistencyCarl Lerche2009-12-311-0/+1
| | |
| * | Use Arel::Attribute for pk conditionsPratik Naik2010-01-011-4/+4
| | |
| * | Add Relation#table to get the relevant Arel::TablePratik Naik2010-01-011-1/+10
| | |
| * | Add Relation#delete [Pratik Naik, Emilio Tagua]Pratik Naik2010-01-013-4/+8
| |/
| * Revert "Add config.action_controller.include behavior to plugins."Jeremy Kemper2009-12-301-1/+0
| | | | | | | | | | | | | | | | This reverts commit 7e8b7f46bfc086a36db996420fbee93348c5268e. Conflicts: railties/lib/rails/plugin.rb
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-26 02:53:37 +0000