Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Remove connection method definition, since it's called just once." | Jeremy Kemper | 2010-01-07 | 1 | -1/+5 |
| | | | | | | Restore the connection method which was added so it can be overridden. This reverts commit e428c75d2b67c6a7bd5f5e7e1719cdece84d497f. | ||||
* | Merge remote branch 'eloy/master' | José Valim | 2010-01-07 | 4 | -62/+67 |
|\ | |||||
| * | Raise a RecordNotFound if an ID in nested attributes is given but doesn't ↵ | Eloy Duran | 2010-01-07 | 1 | -0/+11 |
| | | | | | | | | return a record. [#2415 state:resolved] | ||||
| * | Moved the validation logic to the association reflection and refactored ↵ | Eloy Duran | 2010-01-07 | 2 | -23/+29 |
| | | | | | | | | autosave_association.rb a bit. | ||||
| * | Remove deprecated '_delete' option from NestedAttributes. | Eloy Duran | 2010-01-07 | 1 | -13/+2 |
| | | |||||
| * | Removed unnecessary call to #try and cleaned up a bit more. | Eloy Duran | 2010-01-07 | 1 | -6/+4 |
| | | |||||
| * | Don't use strings for callbacks, as these will be evaled. Rather use ↵ | Eloy Duran | 2010-01-07 | 1 | -2/+2 |
| | | | | | | | | | | | | symbols, which uses a direct method dispatch. Patch by Comron Sattari. [#3429 state:resolved] | ||||
| * | Cleanup some code in nested_attributes.rb, autosave_association.rb, and ↵ | Eloy Duran | 2010-01-07 | 4 | -14/+9 |
| | | | | | | | | | | | | associations.rb with AssociationReflection#collection_association? Also cache the result value. | ||||
| * | Add AssociationReflection#collection_association? which returns true if it's ↵ | Eloy Duran | 2010-01-07 | 1 | -1/+8 |
| | | | | | | | | for a has_many or has_and_belongs_to_many association. | ||||
| * | Refactored nested attributes a bit around :reject_if => :all_blank. | Eloy Duran | 2010-01-07 | 1 | -5/+4 |
| | | |||||
* | | Allow to specify default attributes names translation in I18n yml files. | José Valim | 2010-01-07 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | For example, you could easily specify :created_at and :updated_at translations as: en: attributes: created_at: "Created at" updated_at: "Updated at" This configuration is built on ActiveModel, so it means those translations are shared between different ORMs as well (but always as a fallback). | ||||
* | | Add a deprecation message to activerecord.errors. | José Valim | 2010-01-07 | 1 | -0/+11 |
| | | |||||
* | | Errors messages are now moved from :activerecord.errors to simply :errors on ↵ | José Valim | 2010-01-07 | 2 | -32/+9 |
|/ | | | | I18n yml files. | ||||
* | Ensure before_validation and after_validation accepts :on as option. | José Valim | 2010-01-06 | 1 | -2/+20 |
| | |||||
* | Restore require of 'active_record/fixtures' for Rake tasks that use them | Jeffrey Hardy | 2010-01-06 | 1 | -0/+4 |
| | |||||
* | Use better defaults for fixtures: transactional=true, instantiated=false | Jeffrey Hardy | 2010-01-06 | 1 | -2/+2 |
| | | | | | These reflect the settings that were previously included in the default test_helper.rb, removed in d7d9173. | ||||
* | Update db:migrate error message to reflect the removal of config.frameworks | Jeffrey Hardy | 2010-01-06 | 1 | -1/+1 |
| | |||||
* | Autoload AR test case | Joshua Peek | 2010-01-04 | 2 | -4/+4 |
| | |||||
* | Autoload AS test case | Joshua Peek | 2010-01-04 | 2 | -3/+0 |
| | |||||
* | Merge | David Heinemeier Hansson | 2010-01-03 | 12 | -139/+172 |
|\ | |||||
| * | Merge branch 'master' of git://github.com/rails/rails | José Valim | 2010-01-04 | 4 | -10/+32 |
| |\ | |||||
| | * | Add Relation#create_with to explictily specify create scope | Pratik Naik | 2010-01-04 | 3 | -7/+23 |
| | | | |||||
| | * | Ensure using proper engine for Arel::Table | Pratik Naik | 2010-01-04 | 2 | -3/+9 |
| | | | |||||
| * | | Use underscore in notification namespaces. | José Valim | 2010-01-04 | 2 | -2/+2 |
| | | | |||||
| * | | Use namespaces in notifications. | José Valim | 2010-01-03 | 2 | -2/+2 |
| |/ | |||||
| * | Relation#merge and Relation#except should respect locks | Pratik Naik | 2010-01-03 | 1 | -1/+3 |
| | | |||||
| * | Relation#merge and Relation#except should respect havings | Pratik Naik | 2010-01-03 | 1 | -1/+3 |
| | | |||||
| * | Add Relation#except | Pratik Naik | 2010-01-03 | 1 | -0/+22 |
| | | |||||
| * | Rename a variable name for consistency | Pratik Naik | 2010-01-03 | 3 | -7/+7 |
| | | |||||
| * | Move Relation#spawn and Relation#merge to a separate module | Pratik Naik | 2010-01-03 | 3 | -46/+51 |
| | | |||||
| * | Give preference to the second relation's order when merging | Pratik Naik | 2010-01-03 | 1 | -3/+10 |
| | | |||||
| * | Reapply "Remove optional join_dependency argument as Relation always ↵ | Pratik Naik | 2010-01-03 | 1 | -2/+1 |
| | | | | | | | | supplies it" - Now without syntax errors | ||||
| * | Revert "Remove optional join_dependency argument as Relation always supplies it" | Jeremy Kemper | 2010-01-02 | 1 | -1/+2 |
| | | | | | | | | This reverts commit 8e57deed8b4efad6ea1c551f415b74596111f890. | ||||
| * | Remove optional join_dependency argument as Relation always supplies it | Pratik Naik | 2010-01-03 | 1 | -2/+1 |
| | | |||||
| * | Further simplify Relation#references_eager_loaded_tables? | Pratik Naik | 2010-01-03 | 1 | -20/+3 |
| | | |||||
| * | Cache Relation#to_sql | Pratik Naik | 2010-01-03 | 1 | -2/+5 |
| | | |||||
| * | Remove unused code from association.rb now that Relation takes care of ↵ | Pratik Naik | 2010-01-03 | 1 | -78/+0 |
| | | | | | | | | checking the referenced tables | ||||
| * | Make Relation#includes behave exactly like the existing :include option | Pratik Naik | 2010-01-03 | 2 | -14/+32 |
| | | |||||
| * | Add Relation#includes to be an equivalent of current finder option :include | Pratik Naik | 2010-01-03 | 4 | -7/+19 |
| | | |||||
| * | Get rid of Model.construct_finder_arel_with_includes. Use ↵ | Pratik Naik | 2010-01-03 | 3 | -15/+10 |
| | | | | | | | | construct_finder_arel instead | ||||
| * | Simply methods for checking eager loaded tables references in the query | Pratik Naik | 2010-01-03 | 1 | -7/+7 |
| | | |||||
| * | Use activerecord.errors.format as in Rails 2.3.5. | José Valim | 2010-01-02 | 1 | -0/+3 |
| | | |||||
| * | Make nested attributes behave like in 2.3.5 and add a sanity test for it ↵ | José Valim | 2010-01-02 | 1 | -1/+1 |
| | | | | | | | | with I18n. | ||||
| * | Implement Relation#create and Relation#create! | Pratik Naik | 2010-01-03 | 1 | -1/+13 |
| | | |||||
| * | Implement Relation#new | Pratik Naik | 2010-01-03 | 1 | -1/+12 |
| | | |||||
| * | Use arel predicates instead of strings wherever possible when merging relations | Pratik Naik | 2010-01-02 | 1 | -11/+10 |
| | | |||||
| * | Give higher preference to second relation's equality predicates when merging | Pratik Naik | 2010-01-02 | 1 | -11/+27 |
| | | |||||
* | | Changed ActiveRecord::Base.store_full_sti_class to be true by default ↵ | David Heinemeier Hansson | 2010-01-03 | 1 | -1/+1 |
|/ | | | | reflecting the previously announced Rails 3 default [DHH] | ||||
* | Make sure not to spalt string arguments | Pratik Naik | 2010-01-02 | 1 | -1/+1 |
| | |||||
* | Use relations to build uniqueness conditions | Pratik Naik | 2010-01-02 | 1 | -8/+9 |
| |