Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | changelog entry | Arthur Neves | 2013-09-25 | 1 | -0/+6 | |
| | | ||||||
* | | fix .find when inverse is set | Arthur Neves | 2013-09-25 | 2 | -5/+16 | |
| | | | | | | | | .find([1]) should return an Array of entries, even when a invese object is in memory already | |||||
* | | Merge pull request #12359 from arthurnn/inverse_on_callbacks | Rafael Mendonça França | 2013-09-25 | 4 | -2/+18 | |
|\ \ | | | | | | | Make sure inverse_of is visible on the has_many callbacks | |||||
| * | | update changelog for #12359 | Arthur Neves | 2013-09-25 | 1 | -1/+5 | |
| | | | ||||||
| * | | Make sure inverse_of is visible on the has_many callbacks | Arthur Neves | 2013-09-25 | 3 | -1/+13 | |
| | | | ||||||
* | | | Merge branch 'master' into preload | Aaron Patterson | 2013-09-25 | 18 | -61/+195 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (62 commits) Getting Started Guide: Hello Rails! -> Hello, Rails! and wrap code tag Add CHANGELOG entry for #12344 Add regression test to #12343 Fix typo in number_to_human docs: you -> your [Documentation] Add a missing validation to I18n docs Use the given name in html_options for the hidden field in collection_check_boxes assign_attributes should return if argument is blank. No need the else clause Use join to concat the both side of the AST Add a CHANGELOG entry about Web Console inclusion added column type to example in section 2.3 Include web-console in new projects Gemfile ActiveRecord::ConnectionAdapters::Column.string_to_time method respects string with timezone. Closes #12278. add test_scoped_root_as_name Getting Started Guide: update RubyGems Guides link [ci skip] Deprecate unused quoted_locking_column method. Update references to wycats/thor to erikhuda/thor. bcrypt-ruby v3.1.2 supports Ruby 2.0 on Windows Fix the model name in the association basics guides We shouldn't override PostgreSQLAdapter's superclass inheritance while monkeypatching ... | |||||
| * | | Merge pull request #12290 from kennyj/fix_12278 | Andrew White | 2013-09-24 | 3 | -3/+28 | |
| |\ \ | | | | | | | | | Closes #12278. AR::ConnectionAdapters::Column.string_to_time method respects string with timezone. | |||||
| | * | | ActiveRecord::ConnectionAdapters::Column.string_to_time method respects ↵ | kennyj | 2013-09-25 | 3 | -3/+28 | |
| | | | | | | | | | | | | | | | | string with timezone. Closes #12278. | |||||
| * | | | Add regression test to #12343 | Rafael Mendonça França | 2013-09-24 | 1 | -0/+5 | |
| | | | | ||||||
| * | | | assign_attributes should return if argument is blank. | wangjohn | 2013-09-24 | 1 | -0/+1 | |
| |/ / | | | | | | | | | | | | | | | | If you are passed an empty hash, then assign_attributes doesn't need to do any work and can just return early. This should fix the failing Agile Web Development tests. | |||||
| * | | Merge pull request #9860 from wangjohn/update_attributes_throws_error_with_nil | Rafael Mendonça França | 2013-09-24 | 4 | -6/+25 | |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Raising an error when nil is passed to update_attributes. Conflicts: activerecord/CHANGELOG.md | |||||
| | * | | Raising an error when nil or non-hash is passed to update_attributes. | wangjohn | 2013-06-25 | 4 | -6/+25 | |
| | | | | ||||||
| * | | | Deprecate unused quoted_locking_column method. | kennyj | 2013-09-24 | 3 | -0/+9 | |
| | | | | ||||||
| * | | | Merge pull request #12315 from gaurish/super | Rafael Mendonça França | 2013-09-23 | 1 | -26/+28 | |
| |\ \ \ | | | | | | | | | | | TypeError: superclass mismatch for class PostgreSQLAdapter | |||||
| | * | | | We shouldn't override PostgreSQLAdapter's superclass inheritance while ↵ | Gaurish Sharma | 2013-09-23 | 1 | -26/+28 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | monkeypatching Changing Inheritance section leads to following error on JRuby TypeError: superclass mismatch for class PostgreSQLAdapter After this change, Jruby: The above error no longer appear. Tests are still failing but they do run. Progress! MRI: No change, all green(tested by running take test_test_postgresql) Thanks to Aditya Sanghi(@asanghi) for help | |||||
| * | | | | Merge pull request #11987 from wangjohn/schema_dumper_options | Rafael Mendonça França | 2013-09-23 | 1 | -5/+16 | |
| |\ \ \ \ | | | | | | | | | | | | | Creating options for schema dumper. | |||||
| | * | | | | Creating options for schema dumper. | wangjohn | 2013-08-22 | 1 | -5/+16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These options make it easier to change the config from ActiveRecord::Base to use something else inside of the SchemaDumper. | |||||
| * | | | | | Merge pull request #10816 from bogdan/less-dirty-dirty | Rafael Mendonça França | 2013-09-23 | 3 | -13/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Make AM::Dirty less dirty to plugin into AR or other library | |||||
| * | | | | | Merge pull request #11382 from kennyj/fix_10751-2 | Rafael Mendonça França | 2013-09-22 | 3 | -3/+13 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dump UUID default functions to schema.rb [2nd version]. Fixes #10751. Conflicts: activerecord/CHANGELOG.md | |||||
| | * | | | | | Migration dump UUID default functions to schema.rb. Fixes #10751. | kennyj | 2013-07-10 | 3 | -3/+12 | |
| | | | | | | | ||||||
| | * | | | | | Fix typo. | kennyj | 2013-07-10 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | Give the credits [ci skip] | Rafael Mendonça França | 2013-09-22 | 1 | -0/+2 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #10500 from kennyj/fix_10450 | Rafael Mendonça França | 2013-09-22 | 3 | -3/+50 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed a bug in when using has_many association with :inverse_of option and UUID primary key. Conflicts: activerecord/CHANGELOG.md | |||||
| | * | | | | | | Fixed a bug in when using has_many association with :inverse_of option and ↵ | kennyj | 2013-05-08 | 3 | -3/+48 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UUID primary key. | |||||
| * | | | | | | | Merge pull request #12311 from kennyj/fix_typo_about_uuid | Rafael Mendonça França | 2013-09-21 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix typo. This test isn't executed even in the postgresql. | |||||
| | * | | | | | | | Fix typo. This test isn't executed in even postgresql. | kennyj | 2013-09-22 | 1 | -1/+1 | |
| | | |_|_|/ / / | | |/| | | | | | ||||||
| * / | | | | | | Add back options argument in the ActiveRecord::Base.initialize method | Rafael Mendonça França | 2013-09-21 | 1 | -2/+10 | |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will make easier to hook protected_attributes gem in our code without making that gem fragile to change in Rails code base. Closes #12243 | |||||
* | | | | | | | remove initialize method | Aaron Patterson | 2013-09-25 | 1 | -4/+0 | |
| | | | | | | | ||||||
* | | | | | | | extract association resetting to a method | Aaron Patterson | 2013-09-25 | 1 | -9/+16 | |
| | | | | | | | ||||||
* | | | | | | | hash insertion order doesn't matter anymore, so only loop over the | Aaron Patterson | 2013-09-25 | 1 | -4/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | owners once | |||||
* | | | | | | | always populate the preloaded records instance variable so we can remove | Aaron Patterson | 2013-09-25 | 2 | -10/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | the @associated_records_by_owner ivar | |||||
* | | | | | | | keep preloaded records in a list rather than extract from a hash | Aaron Patterson | 2013-09-25 | 3 | -16/+21 | |
| | | | | | | | ||||||
* | | | | | | | push slice loading to it's own method so we can remove the type casting | Aaron Patterson | 2013-09-24 | 2 | -24/+20 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | code | |||||
* | | | | | | | guarantee that `klass` is not nil inside the preloader objects | Aaron Patterson | 2013-09-24 | 2 | -5/+12 | |
| | | | | | | | ||||||
* | | | | | | | eliminate unused ivar | Aaron Patterson | 2013-09-24 | 1 | -1/+0 | |
| | | | | | | | ||||||
* | | | | | | | all records have a preloaded, so eliminate that conditional | Aaron Patterson | 2013-09-24 | 1 | -11/+7 | |
| | | | | | | | ||||||
* | | | | | | | eliminate the `loaded?` conditional | Aaron Patterson | 2013-09-24 | 3 | -12/+7 | |
| | | | | | | | ||||||
* | | | | | | | push preloaded test up to the factory method so we can eliminate | Aaron Patterson | 2013-09-24 | 4 | -9/+21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | conditionals from the individual preloaded classes | |||||
* | | | | | | | we can't sort by lhs since the middle records have difference classes | Aaron Patterson | 2013-09-23 | 2 | -20/+21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | and possibly different rules for finding those objects | |||||
* | | | | | | | adding a test for sti on middle tables with sorting on RHS | Aaron Patterson | 2013-09-23 | 2 | -1/+19 | |
| | | | | | | | ||||||
* | | | | | | | pass the preloader down so we only have to construct one | Aaron Patterson | 2013-09-23 | 7 | -21/+21 | |
| | | | | | | | ||||||
* | | | | | | | reuse the same preloader object for each association | Aaron Patterson | 2013-09-23 | 1 | -2/+2 | |
| | | | | | | | ||||||
* | | | | | | | remove state from the preloader | Aaron Patterson | 2013-09-23 | 3 | -28/+18 | |
| | | | | | | | ||||||
* | | | | | | | pass the scope all the way down to the constructors | Aaron Patterson | 2013-09-23 | 1 | -10/+10 | |
| | | | | | | | ||||||
* | | | | | | | only do the should_reset test once | Aaron Patterson | 2013-09-23 | 1 | -6/+6 | |
| | | | | | | | ||||||
* | | | | | | | fix variable names and speed up relation ordering | Aaron Patterson | 2013-09-23 | 2 | -16/+12 | |
| | | | | | | | ||||||
* | | | | | | | hm:t preloading will respect order set on the RHS association | Aaron Patterson | 2013-09-23 | 6 | -8/+68 | |
| | | | | | | | ||||||
* | | | | | | | cache associated target records hash | Aaron Patterson | 2013-09-20 | 1 | -17/+11 | |
| | | | | | | | ||||||
* | | | | | | | combine methods so we can reuse preloaders | Aaron Patterson | 2013-09-20 | 1 | -19/+18 | |
| | | | | | | | ||||||
* | | | | | | | return a list rather than hash | Aaron Patterson | 2013-09-20 | 1 | -7/+13 | |
| | | | | | | |