aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* adding a test to demonstrate how to use STI subclasses on the far rightAaron Patterson2013-09-273-0/+10
| | | | side of a hm:t association along with preloading.
* changelog entryArthur Neves2013-09-251-0/+6
|
* fix .find when inverse is setArthur Neves2013-09-252-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_callbacksRafael Mendonça França2013-09-254-2/+18
|\ | | | | Make sure inverse_of is visible on the has_many callbacks
| * update changelog for #12359Arthur Neves2013-09-251-1/+5
| |
| * Make sure inverse_of is visible on the has_many callbacksArthur Neves2013-09-253-1/+13
| |
* | Merge branch 'master' into preloadAaron Patterson2013-09-2518-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_12278Andrew White2013-09-243-3/+28
| |\ | | | | | | Closes #12278. AR::ConnectionAdapters::Column.string_to_time method respects string with timezone.
| | * ActiveRecord::ConnectionAdapters::Column.string_to_time method respects ↵kennyj2013-09-253-3/+28
| | | | | | | | | | | | string with timezone. Closes #12278.
| * | Add regression test to #12343Rafael Mendonça França2013-09-241-0/+5
| | |
| * | assign_attributes should return if argument is blank.wangjohn2013-09-241-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_nilRafael Mendonça França2013-09-244-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.wangjohn2013-06-254-6/+25
| | |
| * | Deprecate unused quoted_locking_column method.kennyj2013-09-243-0/+9
| | |
| * | Merge pull request #12315 from gaurish/superRafael Mendonça França2013-09-231-26/+28
| |\ \ | | | | | | | | TypeError: superclass mismatch for class PostgreSQLAdapter
| | * | We shouldn't override PostgreSQLAdapter's superclass inheritance while ↵Gaurish Sharma2013-09-231-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_optionsRafael Mendonça França2013-09-231-5/+16
| |\ \ \ | | | | | | | | | | Creating options for schema dumper.
| | * | | Creating options for schema dumper.wangjohn2013-08-221-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-dirtyRafael Mendonça França2013-09-233-13/+8
| | | | | | | | | | | | | | | | | | | | Make AM::Dirty less dirty to plugin into AR or other library
| * | | | Merge pull request #11382 from kennyj/fix_10751-2Rafael Mendonça França2013-09-223-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.kennyj2013-07-103-3/+12
| | | | | |
| | * | | | Fix typo.kennyj2013-07-101-1/+1
| | | | | |
| * | | | | Give the credits [ci skip]Rafael Mendonça França2013-09-221-0/+2
| | | | | |
| * | | | | Merge pull request #10500 from kennyj/fix_10450Rafael Mendonça França2013-09-223-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 ↵kennyj2013-05-083-3/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | UUID primary key.
| * | | | | | Merge pull request #12311 from kennyj/fix_typo_about_uuidRafael Mendonça França2013-09-211-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix typo. This test isn't executed even in the postgresql.
| | * | | | | | Fix typo. This test isn't executed in even postgresql.kennyj2013-09-221-1/+1
| | | |_|_|/ / | | |/| | | |
| * / | | | | Add back options argument in the ActiveRecord::Base.initialize methodRafael Mendonça França2013-09-211-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 methodAaron Patterson2013-09-251-4/+0
| | | | | |
* | | | | | extract association resetting to a methodAaron Patterson2013-09-251-9/+16
| | | | | |
* | | | | | hash insertion order doesn't matter anymore, so only loop over theAaron Patterson2013-09-251-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | owners once
* | | | | | always populate the preloaded records instance variable so we can removeAaron Patterson2013-09-252-10/+5
| | | | | | | | | | | | | | | | | | | | | | | | the @associated_records_by_owner ivar
* | | | | | keep preloaded records in a list rather than extract from a hashAaron Patterson2013-09-253-16/+21
| | | | | |
* | | | | | push slice loading to it's own method so we can remove the type castingAaron Patterson2013-09-242-24/+20
| | | | | | | | | | | | | | | | | | | | | | | | code
* | | | | | guarantee that `klass` is not nil inside the preloader objectsAaron Patterson2013-09-242-5/+12
| | | | | |
* | | | | | eliminate unused ivarAaron Patterson2013-09-241-1/+0
| | | | | |
* | | | | | all records have a preloaded, so eliminate that conditionalAaron Patterson2013-09-241-11/+7
| | | | | |
* | | | | | eliminate the `loaded?` conditionalAaron Patterson2013-09-243-12/+7
| | | | | |
* | | | | | push preloaded test up to the factory method so we can eliminateAaron Patterson2013-09-244-9/+21
| | | | | | | | | | | | | | | | | | | | | | | | conditionals from the individual preloaded classes
* | | | | | we can't sort by lhs since the middle records have difference classesAaron Patterson2013-09-232-20/+21
| | | | | | | | | | | | | | | | | | | | | | | | and possibly different rules for finding those objects
* | | | | | adding a test for sti on middle tables with sorting on RHSAaron Patterson2013-09-232-1/+19
| | | | | |
* | | | | | pass the preloader down so we only have to construct oneAaron Patterson2013-09-237-21/+21
| | | | | |
* | | | | | reuse the same preloader object for each associationAaron Patterson2013-09-231-2/+2
| | | | | |
* | | | | | remove state from the preloaderAaron Patterson2013-09-233-28/+18
| | | | | |
* | | | | | pass the scope all the way down to the constructorsAaron Patterson2013-09-231-10/+10
| | | | | |
* | | | | | only do the should_reset test onceAaron Patterson2013-09-231-6/+6
| | | | | |
* | | | | | fix variable names and speed up relation orderingAaron Patterson2013-09-232-16/+12
| | | | | |
* | | | | | hm:t preloading will respect order set on the RHS associationAaron Patterson2013-09-236-8/+68
| | | | | |
* | | | | | cache associated target records hashAaron Patterson2013-09-201-17/+11
| | | | | |
* | | | | | combine methods so we can reuse preloadersAaron Patterson2013-09-201-19/+18
| | | | | |