Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Silence some trivial warnings: shadowed local vars, indentation mismatches | Jeremy Kemper | 2009-12-28 | 10 | -206/+201 |
| | |||||
* | Move ActiveRecord callbacks implementation to ActiveModel and make use of it. | José Valim | 2009-12-28 | 4 | -54/+167 |
| | | | | Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local> | ||||
* | Merge branch 'master' of github.com:rails/rails | Yehuda Katz | 2009-12-28 | 75 | -1126/+1652 |
|\ | |||||
| * | Oops. Remove debug information inside a test from the previous commit | Pratik Naik | 2009-12-29 | 1 | -2/+0 |
| | | |||||
| * | Migrate all the calculation methods to Relation | Pratik Naik | 2009-12-29 | 8 | -178/+213 |
| | | |||||
| * | Don't publicize with_scope for tests since it may shadow public misuse | Jeremy Kemper | 2009-12-28 | 10 | -117/+112 |
| | | |||||
| * | Fix uniqueness validation: with_exclusive_scope is not public | Jeremy Kemper | 2009-12-28 | 1 | -1/+1 |
| | | |||||
| * | Fix pg test | Jeremy Kemper | 2009-12-28 | 1 | -1/+2 |
| | | |||||
| * | Merge commit 'Fingertips/master' | Jeremy Kemper | 2009-12-28 | 17 | -75/+479 |
| |\ | |||||
| | * | Refactored previous changes to nested attributes. | Eloy Duran | 2009-12-28 | 4 | -47/+48 |
| | | | |||||
| | * | Add an :update_only option to accepts_nested_attributes_for for to-one ↵ | Michael Siebert | 2009-12-28 | 2 | -3/+54 |
| | | | | | | | | | | | | | | | | | | associations. [#2563 state:resolved] Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com> | ||||
| | * | Make sure to not add autosave callbacks multiple times. [#3575 state:resolved] | Eloy Duran | 2009-12-28 | 4 | -17/+65 |
| | | | | | | | | | | | | This makes sure that, in a HABTM association, only one join record is craeted. | ||||
| | * | Make polymorphic_inverse_of in Reflection throw an ↵ | Murray Steele | 2009-12-28 | 4 | -10/+24 |
| | | | | | | | | | | | | | | | | | | InverseOfAssociationNotFoundError if the supplied class doesn't have the appropriate association. [#3520 state:resolved] Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com> | ||||
| | * | Provide a slightly more robust we_can_set_the_inverse_on_this? method for ↵ | Murray Steele | 2009-12-28 | 2 | -3/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | polymorphic belongs_to associations. [#3520 state:resolved] Also add a new test for polymorphic belongs_to that test direct accessor assignment, not just .replace assignment. Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com> | ||||
| | * | Add inverse polymorphic association support. [#3520 state:resolved] | George Ogata | 2009-12-28 | 9 | -32/+139 |
| | | | | | | | | | | | | Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com> | ||||
| | * | Add more tests for the various ways we can assign objects to associations. ↵ | Murray Steele | 2009-12-28 | 2 | -13/+160 |
| | | | | | | | | | | | | | | | | | | | | | | | | [#3513 state:resolved] Get rid of a duplicate set_inverse_instance call if you use new_record(true) (e.g. you want to replace the existing instance). Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com> | ||||
| | * | Set inverse for #replace on a has_one association. [#3513 state:resolved] | George Ogata | 2009-12-28 | 2 | -0/+16 |
| | | | | | | | | | | | | Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com> | ||||
| * | | rake smoke: toplevel task to quickly smoke-test all projects | Jeremy Kemper | 2009-12-28 | 1 | -1/+8 |
| | | | |||||
| * | | Add ruby-debug to Gemfile for Ruby < 1.9 | Pratik Naik | 2009-12-29 | 1 | -0/+1 |
| | | | |||||
| * | | Use present rather than any | Jeremy Kemper | 2009-12-28 | 1 | -2/+2 |
| | | | |||||
| * | | Fix copy/pasted test class name | Jeremy Kemper | 2009-12-28 | 1 | -97/+99 |
| | | | |||||
| * | | Fix ruby version test | Jeremy Kemper | 2009-12-28 | 1 | -40/+9 |
| | | | |||||
| * | | Merge commit 'josevalim/validations' | Jeremy Kemper | 2009-12-28 | 34 | -547/+555 |
| |\ \ | |||||
| | * | | No need to use ValidationsRepairHelper hack on ActiveModel anymore, ↵ | José Valim | 2009-12-23 | 17 | -206/+124 |
| | | | | | | | | | | | | | | | | Model.reset_callbacks(:validate) is enough. However, tests in ActiveRecord are still coupled, so moved ValidationsRepairHelper back there. | ||||
| | * | | Small clean up in Naming and TTranslation tests. | José Valim | 2009-12-23 | 6 | -47/+48 |
| | | | | |||||
| | * | | ActiveRecord::Validations are now built on top of Validator as well. | José Valim | 2009-12-23 | 5 | -71/+96 |
| | | | | |||||
| | * | | validates_each uses a BlockValidator. | José Valim | 2009-12-23 | 5 | -41/+49 |
| | | | | |||||
| | * | | Added check_validity! to EachValidator and refactor existing ones. | José Valim | 2009-12-23 | 5 | -74/+90 |
| | | | | |||||
| | * | | Move validations in ActiveModel to validators, however all validatity checks ↵ | José Valim | 2009-12-23 | 12 | -157/+200 |
| | | | | | | | | | | | | | | | | are still in the class method. | ||||
| | * | | Validator is simply sent to validate method. However, the API needs to ↵ | José Valim | 2009-12-22 | 3 | -15/+12 |
| | | | | | | | | | | | | | | | | change, so validate accepts a record. | ||||
| * | | | Add Model.having and Relation#having | Pratik Naik | 2009-12-29 | 6 | -18/+25 |
| | |/ | |/| | |||||
| * | | Move Relation calculation methods to a separate module | Pratik Naik | 2009-12-28 | 3 | -45/+54 |
| | | | |||||
| * | | Add Relation#count | Pratik Naik | 2009-12-28 | 3 | -0/+82 |
| | | | |||||
| * | | Remove the todo note for arel#lock | Pratik Naik | 2009-12-28 | 1 | -1/+0 |
| | | | |||||
| * | | Add Model.readonly and association_collection#readonly finder method | Pratik Naik | 2009-12-28 | 5 | -19/+25 |
| | | | |||||
| * | | Remove locking related unused code | Pratik Naik | 2009-12-28 | 3 | -26/+0 |
| | | | |||||
| * | | Raise ArgumentError when trying to merge relations of different classes | Pratik Naik | 2009-12-28 | 2 | -0/+7 |
| | | | |||||
| * | | Relation#readonly(false) should toggle the readonly flag | Pratik Naik | 2009-12-28 | 2 | -5/+10 |
| | | | |||||
| * | | Remove unused construct_finder_sql | Pratik Naik | 2009-12-28 | 2 | -18/+14 |
| | | | |||||
| * | | Fix a typo in CHANGELOG | Pratik Naik | 2009-12-28 | 1 | -1/+1 |
| | | | |||||
| * | | Add Model.lock and relation#lock now that arel has locking | Pratik Naik | 2009-12-28 | 4 | -2/+23 |
| | | | |||||
* | | | Merge branch 'master' of github.com:rails/rails | Yehuda Katz | 2009-12-27 | 6 | -4/+35 |
|\| | | |||||
| * | | Added Object#presence that returns the object if it's #present? otherwise ↵ | David Heinemeier Hansson | 2009-12-27 | 3 | -4/+29 |
| | | | | | | | | | | | | returns nil [DHH/Colin Kelley] | ||||
| * | | Added default .gitignore (this is just recognizing Git market share, don't ↵ | David Heinemeier Hansson | 2009-12-27 | 3 | -0/+6 |
| | | | | | | | | | | | | throw a hissy if you use another SCM) [DHH] | ||||
* | | | Update rack submodule | Yehuda Katz | 2009-12-27 | 1 | -0/+0 |
|/ / | |||||
* | | Fixes some problems with getting a new app working | Yehuda Katz | 2009-12-27 | 2 | -0/+2 |
| | | |||||
* | | String#exclude? core extension: inverse of #include? | Jeremy Kemper | 2009-12-27 | 3 | -1/+15 |
| | | |||||
* | | Ruby 1.9: string is not enumerable, so #exclude? is not available | Jeremy Kemper | 2009-12-27 | 1 | -5/+3 |
| | | |||||
* | | Typo | Jeremy Kemper | 2009-12-27 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' of github.com:rails/rails | David Heinemeier Hansson | 2009-12-27 | 2 | -2/+4 |
|\ \ |