aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
Commit message (Collapse)AuthorAgeFilesLines
* Squashed commit of the following:Aaron Patterson2013-10-015-17/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 02d3b059608c30e98136fde78bc710928f080566 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Mon Sep 30 15:31:39 2013 -0700 habtm works in terms of hm:t commit 71ac336bbb41f5047a4ee307883a95eca7195742 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Mon Sep 30 15:27:07 2013 -0700 passing before_add callbacks commit d846a7bf9872a79c3aa8082917abe806278fa159 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Fri Sep 27 17:57:53 2013 -0700 reducing diff against master commit 96bd97de47d61a71c368ae367bc59a2dbec3c9ab Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Fri Sep 27 17:52:35 2013 -0700 fixing more tests commit 0620399fc231df87c5f08664db1c37e5c1fa5a05 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Fri Sep 27 17:32:52 2013 -0700 self-referential tables in hm:t are allowed to have the same pk commit 48eb90e27921d10b6ba3e400ab2c784ed75d5ec4 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Fri Sep 27 17:03:19 2013 -0700 translating more options commit 5cace7b2cb546fd6b096543bfc49c4b7197ad21a Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Fri Sep 27 17:01:02 2013 -0700 handling more hm:t cases commit 69985ca2cabff2c3f58f5d0a7eb12d7b414c1a01 Merge: d417ec8 3e0a60e Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Fri Sep 27 16:57:12 2013 -0700 Merge branch 'master' into rmhbtm * master: (21 commits) adding a test to demonstrate how to use STI subclasses on the far right side of a hm:t association along with preloading. Fixed grammatical typo in configuring.md guide. Getting Started Guide: Fix code container in Chapter 5.2 [ci-skip] Getting Started Guide: Update sentence in Chapter 5.8 [ci-skip] Add new line after create action on CommentsController code example Adds template dependencies rake task from cache_digests gem. [ci skip] Update scaffold output and change some words. [ci skip] escape unintended url in docs Getting Started Guide: post.rb -> Post [ci skip] Add missing periods and update link name and some wording. quote `false` reference in querying guide. Getting Started Guide: update link_to string argument to use single-quote mark, following document style [ci skip] Fix small typo in docs changelog entry fix .find when inverse is set update changelog for #12359 Make sure inverse_of is visible on the has_many callbacks Getting Started Guide: posts_controller -> PostsController [ci skip] [ci skip] Correct the explanation of the example for find_or_create_by when used with create_with in ActiveRecord Querying guide added "id: false" to HABTM join table example ... commit d417ec82e8f83c32124d1c1a19824d023cfdf015 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Wed Sep 25 16:49:08 2013 -0700 another case is passing commit 5c68280500962e4b2b6819dd863ebe8b398e5834 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Wed Sep 25 16:21:22 2013 -0700 this seems to work commit e458c5e55c04a2444e96aca1ff192be42bc4ce7f Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Wed Sep 25 16:13:07 2013 -0700 add another case commit fc6203b0d49c847b8efb1cc33d358897625f2115 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Wed Sep 25 15:51:45 2013 -0700 delete center records on habtm commit 9af5156098f6bc8f8ce8eb559a51137960b4938b Merge: 3a60b03 e2fd64f Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Wed Sep 25 11:33:13 2013 -0700 Merge branch 'master' into rmhbtm * master: (100 commits) remove initialize method extract association resetting to a method hash insertion order doesn't matter anymore, so only loop over the owners once always populate the preloaded records instance variable so we can remove the @associated_records_by_owner ivar keep preloaded records in a list rather than extract from a hash Getting Started Guide: Hello Rails! -> Hello, Rails! and wrap code tag push slice loading to it's own method so we can remove the type casting code Add CHANGELOG entry for #12344 Add regression test to #12343 Fix typo in number_to_human docs: you -> your guarantee that `klass` is not nil inside the preloader objects [Documentation] Add a missing validation to I18n docs Use the given name in html_options for the hidden field in collection_check_boxes eliminate unused ivar all records have a preloaded, so eliminate that conditional eliminate the `loaded?` conditional push preloaded test up to the factory method so we can eliminate conditionals from the individual preloaded classes assign_attributes should return if argument is blank. No need the else clause Use join to concat the both side of the AST ... commit 3a60b038a40532397b6c204dfb09d6d43a9336ac Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Wed Sep 18 17:50:11 2013 -0700 start with a clean slate commit f30d3631af11ea6144d3ae7a068a7c0072e93a82 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Wed Sep 18 17:30:59 2013 -0700 make sure the class name goes on the rhs belongs_to commit f7516b724014504ddb2e706fea1b5438dc5332c3 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Wed Sep 18 16:31:40 2013 -0700 remove unused variable commit 61ffc5b9854dc2fe83ee502b17ba8028270ff8a7 Merge: 6cf41cd 460eb83 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Wed Sep 18 16:25:17 2013 -0700 Merge branch 'master' into rmhbtm * master: support objects with blank string primary keys ActiveRecord::Base#<=> has been removed. Primary keys may not be in order, or even be numbers, so sorting by id doesn't make sense. Please use `sort_by` and specify the attribute you wish to sort with. For example, change: do what the superclass does in the case that objects do not match commit 6cf41cd98a82e6f4fe6d868ad323df3d72a9748f Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Wed Sep 18 15:06:28 2013 -0700 heating up habtm cache commit d7f6c3aa491f27ba71fdb2b9d0b9d1780664f4dc Merge: c68c904 56bfd8a Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Wed Sep 18 14:07:51 2013 -0700 Merge branch 'master' into rmhbtm * master: (58 commits) Fix an issue where router can't recognize downcased url encoding path. There's no need to do this Remove tzinfo dependency from Action Pack [ci skip] Improve readability of 4.3's NOTE in migration.md. Removes unused code related to DatabaseTasks. [ci skip] Consistency wording of 9.6 in form_helpers.md [ci skip] Update plugins.md Removing ActiveSupport::Concern, it's not needed Fixing comment typo in ActionController::Base Don't require using application_name before options Collapse where constraints to one where constraint Custom flash should be defined only for the class that defines it and it's subclasses. Fix typos: the indefinite articles(a -> an) Missing destroy command Update 3_2_release_notes.md Add CHANGELOG entry for #11698 Add CHANGELOG entry for #12149 Use the Rails binary when generating task Remove unnecessary loop "generates" applies to "collection radio" so it should be singular ... commit c68c904866ef9562c3bd9b54574206a416184414 Merge: 0f5d8e0 71cf717 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Wed Sep 11 17:45:53 2013 -0700 Merge branch 'master' into rmhbtm * master: these are not real developer objects, so counting them doesn't make sense. Let's load the object to ensure it's an array and count the array. Remove conditional adding a new method Fix inverted conditional Remove invalid comment Check if the SQL is not a prepared statement Whitespaces Revert "Add meta tag with charset information to application layout." Avoid empty transaction from setting has_one association on new record. Reduce Duration#inspect to a single series of transformations Relation#merge should not lose readonly(false) flag. Reduce allocations when extracting AR models Perf: avoid dupes add fallback logic for coders commit 0f5d8e0febd3128cf4121ff36f1764b9284d9f7d Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Wed Sep 11 11:43:29 2013 -0700 everything works with extensions commit d003c103b5908fb3a6427f39bddd1748ef2c2576 Merge: 5768c38 7e0cac1 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Wed Sep 11 11:23:59 2013 -0700 Merge branch 'master' into rmhbtm * master: fix deleting join models with no pk remove sentence err [ci skip] 'previous version of Rails' is gramatically incorrect Add meta tag with charset information to application layout. add a comment for sanity of other people to come commit 5768c38d53fd66a97814faaea8e07c70722b310f Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Tue Sep 10 15:11:05 2013 -0700 habtms with a scope seem to be working commit 5ee9108d95c544d4befd682a72139383d0780d68 Merge: d5478e6 e64b5da Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Tue Sep 10 11:55:48 2013 -0700 Merge branch 'master' into rmhbtm * master: ask the association for records rather than calling `send` commit d5478e64bbf80337ec35462368edabb373feeb74 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Tue Sep 10 11:54:39 2013 -0700 ask the association for records rather than calling `send` commit 93020bc1ad51363c3f400370f91c9494690dcea8 Merge: 11b3d5f d68419a Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Tue Sep 10 11:30:03 2013 -0700 Merge branch 'master' into rmhbtm * master: Use Ruby 2.0 caller_locations instead of caller if available Update Rails 3.2.x guide link [ci skip] Be sure to restore the default I18n.locale after changed its value in a test Fixes typo in Object#try! More unused associations in AR test models :scissors: [ci skip] change function def self.table_name to self.table_name Clean up unused associations in AR test model Reset ActionView::Base.logger instead of AC::Base.logger Refactor handling of action normalization Don't mutate the Base settings by merge!ing the given value Make AC standalone rendering work use assert_empty in activemodel conditional validation test cases Removed unused modules and classes Removed unnecessary require Remove helper fixtures not used in any test Back AV description in gemspec Fix order dependent test grab executable from rubygems Fixed API task file commit 11b3d5fa45b57fc4e7dddb09be583498b120b185 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Mon Sep 9 16:19:48 2013 -0700 change query count since we are using hm:t associations commit f59daebedab3ed13f31c99244ff71a4a5d6e554b Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Mon Sep 9 15:35:07 2013 -0700 delegate compute_type to a real AR class commit c84a40d2ed76e5843b994c5a2b9e29ced3816511 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Mon Sep 9 15:29:51 2013 -0700 define callbacks with the builder commit d08b1b6b3efc9ed8b0d5476892f048fbffb39e40 Merge: acebec1 0c5d0be Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Mon Sep 9 15:17:40 2013 -0700 Merge branch 'master' into rmhbtm * master: let the class cache object clean up user input make @bitsweat happy. :heart: commit acebec128e108ac2b4855e540d8764629670cb83 Merge: 2de68a4 e1cbd42 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Mon Sep 9 14:47:30 2013 -0700 Merge branch 'master' into rmhbtm * master: stop using deprecated api in the tests commit 2de68a464641f76067743957f889ac87dff395a0 Merge: 7504df9 1385ae1 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Mon Sep 9 14:34:37 2013 -0700 Merge branch 'master' into rmhbtm * master: Remove BasicRendering tests Remove remaining coupling with AV in MimeResponds Remove BasicRendering and remove template functionality from AbsC::Rendering Improves a sentence in guides/security [ci skip] Change link name of Rails i18n wiki. Typo in Changelog. Fix fixtures regression that required table names to map to classes only, not class names Use MiniTest::Unit::TestCase instead of Minitest::Test Use Ruby on Rails Coding Conventions for code examples in the guides commit 7504df92f21ed3d5da7c2760d760f026728ed04d Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Mon Sep 9 14:34:02 2013 -0700 fake class name should be a valid class name commit 6609620ea86dc0fb7c4bbfb0db950f6e3fc75b56 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Fri Sep 6 15:52:03 2013 -0700 move another habtm commit 2c95a36e2c3dfe92f2930f3cca44bc4452732a23 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Fri Sep 6 15:50:18 2013 -0700 use the habtm name to generate the rhs name on the join model commit bd963f720b1db19b0bec186bc33bef9203d8b011 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Fri Sep 6 15:47:29 2013 -0700 don't hardcode the name commit 461759e2caf66f23dca4eff988648bf769a2b533 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Fri Sep 6 15:45:27 2013 -0700 we do not need to specify the fk commit 9c223f01db6e36adbb7570e2aa1bcaec1d142c87 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Fri Sep 6 15:44:08 2013 -0700 just call the left side :left_side commit 5661622a82154eff877fe0993bfffad13dacad7a Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Fri Sep 6 15:40:36 2013 -0700 initial habtm implementation is working
* change the savepoint interface to allow passing the name.Yves Senn2013-09-301-0/+30
|
* fix `test_sqlite3_mem` test run.Yves Senn2013-09-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | marshalling between processes does not work with an in-memory db. This breaks the `test_sqlite3_mem` run (see stacktrace below). After that failure most tests start to fail randomly. ``` /Users/senny/Projects/rails/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb:512:in `table_structure': Could not find table 'posts' (ActiveRecord::StatementInvalid) from /Users/senny/Projects/rails/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb:399:in `columns' from /Users/senny/Projects/rails/activerecord/lib/active_record/connection_adapters/schema_cache.rb:93:in `block in prepare_default_proc' from /Users/senny/Projects/rails/activerecord/lib/active_record/connection_adapters/schema_cache.rb:44:in `yield' from /Users/senny/Projects/rails/activerecord/lib/active_record/connection_adapters/schema_cache.rb:44:in `columns' from /Users/senny/Projects/rails/activerecord/lib/active_record/model_schema.rb:208:in `columns' from /Users/senny/Projects/rails/activerecord/lib/active_record/model_schema.rb:249:in `column_defaults' from /Users/senny/Projects/rails/activerecord/lib/active_record/locking/optimistic.rb:171:in `column_defaults' from /Users/senny/Projects/rails/activerecord/lib/active_record/core.rb:167:in `initialize' from /Users/senny/Projects/rails/activerecord/lib/active_record/inheritance.rb:27:in `new' from /Users/senny/Projects/rails/activerecord/lib/active_record/inheritance.rb:27:in `new' from /Users/senny/Projects/rails/activerecord/test/cases/base_test.rb:1368:in `block in test_marshal_between_processes' from /Users/senny/Projects/rails/activerecord/test/cases/base_test.rb:1366:in `fork' from /Users/senny/Projects/rails/activerecord/test/cases/base_test.rb:1366:in `test_marshal_between_processes' from /Users/senny/Projects/rails/.bundle/gems/minitest-5.0.8/lib/minitest/test.rb:110:in `block (3 levels) in run' from /Users/senny/Projects/rails/.bundle/gems/minitest-5.0.8/lib/minitest/test.rb:208:in `capture_exceptions' from /Users/senny/Projects/rails/.bundle/gems/minitest-5.0.8/lib/minitest/test.rb:107:in `block (2 levels) in run' from /Users/senny/Projects/rails/.bundle/gems/minitest-5.0.8/lib/minitest/test.rb:260:in `time_it' from /Users/senny/Projects/rails/.bundle/gems/minitest-5.0.8/lib/minitest/test.rb:106:in `block in run' from /Users/senny/Projects/rails/.bundle/gems/minitest-5.0.8/lib/minitest.rb:296:in `on_signal' from /Users/senny/Projects/rails/.bundle/gems/minitest-5.0.8/lib/minitest/test.rb:280:in `with_info_handler' from /Users/senny/Projects/rails/.bundle/gems/minitest-5.0.8/lib/minitest/test.rb:105:in `run' from /Users/senny/Projects/rails/.bundle/gems/minitest-5.0.8/lib/minitest.rb:268:in `block (2 levels) in run' from /Users/senny/Projects/rails/.bundle/gems/minitest-5.0.8/lib/minitest.rb:267:in `each' from /Users/senny/Projects/rails/.bundle/gems/minitest-5.0.8/lib/minitest.rb:267:in `block in run' from /Users/senny/Projects/rails/.bundle/gems/minitest-5.0.8/lib/minitest.rb:296:in `on_signal' from /Users/senny/Projects/rails/.bundle/gems/minitest-5.0.8/lib/minitest.rb:285:in `with_info_handler' from /Users/senny/Projects/rails/.bundle/gems/minitest-5.0.8/lib/minitest.rb:266:in `run' from /Users/senny/Projects/rails/activesupport/lib/active_support/test_case.rb:31:in `block in __run' from /Users/senny/Projects/rails/activesupport/lib/active_support/test_case.rb:31:in `map' from /Users/senny/Projects/rails/activesupport/lib/active_support/test_case.rb:31:in `__run' from /Users/senny/Projects/rails/.bundle/gems/minitest-5.0.8/lib/minitest.rb:115:in `run' from /Users/senny/Projects/rails/.bundle/gems/minitest-5.0.8/lib/minitest.rb:46:in `block in autorun' ``` /cc @tenderlove
* Merge pull request #12383 from marclennox/masterRafael Mendonça França2013-09-291-0/+9
|\ | | | | Fixed issue #12327
| * Fixed issue #12327Marc Lennox2013-09-271-0/+9
| |
* | Removed where_values_hash from AR::NullRelationPaul Nikitochkin2013-09-282-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to build associated records for owners which has not been saved need to get where values to use as default attributes. But for new record owner uses `ActiveRecord::NullRelation` which override `where_values_hash` to return empty hash stub. `where_values_hash` is not used to invoke any sql query, but good to build others chains (even will be never executed) like: ```ruby post = Post.new admin_comment = post.admin_comments.build assert_equal 'Admin', admin_comment.author ``` Closes #11376, #11676, #11675
* | 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.
* fix .find when inverse is setArthur Neves2013-09-251-0/+12
| | | | .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-252-1/+12
|\ | | | | Make sure inverse_of is visible on the has_many callbacks
| * Make sure inverse_of is visible on the has_many callbacksArthur Neves2013-09-252-1/+12
| |
* | Merge branch 'master' into preloadAaron Patterson2013-09-258-32/+101
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-241-0/+10
| |\ | | | | | | Closes #12278. AR::ConnectionAdapters::Column.string_to_time method respects string with timezone.
| | * ActiveRecord::ConnectionAdapters::Column.string_to_time method respects ↵kennyj2013-09-251-0/+10
| | | | | | | | | | | | string with timezone. Closes #12278.
| * | Add regression test to #12343Rafael Mendonça França2013-09-241-0/+5
| |/
| * Merge pull request #9860 from wangjohn/update_attributes_throws_error_with_nilRafael Mendonça França2013-09-242-5/+12
| |\ | | | | | | | | | | | | | | | | | | 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-252-5/+12
| | |
| * | Deprecate unused quoted_locking_column method.kennyj2013-09-241-0/+4
| | |
| * | 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 #11382 from kennyj/fix_10751-2Rafael Mendonça França2013-09-221-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-101-0/+1
| | | | |
| | * | | Fix typo.kennyj2013-07-101-1/+1
| | | | |
| * | | | Merge pull request #10500 from kennyj/fix_10450Rafael Mendonça França2013-09-221-0/+40
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-081-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | UUID primary key.
| * | | | | Fix typo. This test isn't executed in even postgresql.kennyj2013-09-221-1/+1
| | |_|/ / | |/| | |
* | | | | push preloaded test up to the factory method so we can eliminateAaron Patterson2013-09-241-1/+0
| | | | | | | | | | | | | | | | | | | | conditionals from the individual preloaded classes
* | | | | we can't sort by lhs since the middle records have difference classesAaron Patterson2013-09-231-1/+2
| | | | | | | | | | | | | | | | | | | | 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
| | | | |
* | | | | hm:t preloading will respect order set on the RHS associationAaron Patterson2013-09-231-0/+15
|/ / / /
* | | | remove unused variableAaron Patterson2013-09-181-1/+0
| | | |
* | | | support objects with blank string primary keysAaron Patterson2013-09-181-0/+6
| | | |
* | | | ActiveRecord::Base#<=> has been removed. Primary keys may not be in order,Aaron Patterson2013-09-181-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | or even be numbers, so sorting by id doesn't make sense. Please use `sort_by` and specify the attribute you wish to sort with. For example, change: Post.all.to_a.sort to: Post.all.to_a.sort_by(&:id)
* | | | do what the superclass does in the case that objects do not matchAaron Patterson2013-09-181-0/+8
| | | |
* | | | Merge pull request #12011 from jetthoughts/11963_fix_join_with_association_scopeRafael Mendonça França2013-09-162-0/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Collapse where constraints to the Arel::Nodes::And node Conflicts: activerecord/CHANGELOG.md
| * | | | Collapse where constraints to one where constraintPaul Nikitochkin2013-09-132-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to remove duplication with joining arel where constraints with `AND`, all constraints on `build_arel` are collapsed into one head node: `Arel::Nodes::And` Closes: #11963
* | | | | Merge pull request #12129 from Empact/deprecate-array-bang-delegationRafael Mendonça França2013-09-123-144/+245
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deprecate the delegation of Array bang methods in ActiveRecord::Delegation Conflicts: activerecord/CHANGELOG.md activerecord/test/cases/relation_test.rb
| * | | | | Deprecate the delegation of Array bang methods in ActiveRecord::DelegationBen Woosley2013-09-041-0/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The primary means of returning results for Array bang methods is to modify the array in-place. When you call these methods on a relation, that array is created, modified, and then thrown away. Only the secondary return value is exposed to the caller. Removing this delegation is a straight-forward way to reduce user error by forcing callers to first explicitly call #to_a in order to expose the array to be acted on by the bang method.
| * | | | | Pull the RelationMutationTests from cases/relation_test to ↵Ben Woosley2013-09-032-135/+139
| | | | | | | | | | | | | | | | | | | | | | | | cases/relation/mutation_test.
* | | | | | Merge pull request #12137 from lann/fix_association_first_lastRafael Mendonça França2013-09-121-3/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make CollectionAssociation first/last with integer fetch with query Conflicts: activerecord/CHANGELOG.md
| * | | | | | Make CollectionAssociation first/last with integer fetch with queryLann Martin2013-09-091-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When first or last is called with an integer on an unloaded association, the entire collection is loaded. This differs surprisingly from the behavior of Relation#first/last, which translate the call into a limit query. For large collections this can make a big difference in performance. Change CollectionAssociation#fetch_first_or_last_using_find? to make this kind of call delegate to Relation.
* | | | | | | Merge pull request #12156 from rywall/from-copy-bindsRafael Mendonça França2013-09-121-0/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow Relation#from to accept other relations with bind values. Conflicts: activerecord/CHANGELOG.md
| * | | | | | | Allow Relation#from to accept other relations with bind values.Ryan Wallace2013-09-081-0/+7
| | | | | | | |
* | | | | | | | Remove unnecessary loopVipul A M2013-09-131-5/+2
| | | | | | | |
* | | | | | | | these are not real developer objects, so counting them doesn't makeAaron Patterson2013-09-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sense. Let's load the object to ensure it's an array and count the array.
* | | | | | | | Check if the SQL is not a prepared statementRafael Mendonça França2013-09-111-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the adapter is with prepared statement disabled and the binds array is not empty the connection adapter will try to set the binds values and will fail. Now we are checking if the adapter has the prepared statement disabled. Fixes #12023
* | | | | | | | Merge pull request #12188 from SamSaffron/masterAaron Patterson2013-09-111-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Perf: avoid dupes add fallback logic for coders
| * | | | | | | | Perf: avoid dupes add fallback logic for codersSam2013-09-111-1/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #12135 from dylanahsmith/avoid_empty_transactionRafael Mendonça França2013-09-111-0/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid empty transaction from setting has_one association on new record. Conflicts: activerecord/CHANGELOG.md
| * | | | | | | | | Avoid empty transaction from setting has_one association on new record.Dylan Thacker-Smith2013-09-111-0/+2
| | | | | | | | | |
* | | | | | | | | | Merge pull request #12194 from thedarkone/readonly-merger-fixRafael Mendonça França2013-09-111-0/+8
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Relation#merge should not lose readonly(false) flag.