Commit Graph

10362 Commits

Author SHA1 Message Date
Aaron Patterson
cb0aa02e74 preheat habtm column cache 2013-10-02 17:22:28 -07:00
Aaron Patterson
da06ae88ab add missing require 2013-10-02 17:04:02 -07:00
Aaron Patterson
e1467333a1 remove some duplicate code 2013-10-02 16:42:42 -07:00
Aaron Patterson
244446fcc5 add a note to the changelog 2013-10-02 16:06:59 -07:00
Aaron Patterson
5864b9a894 remove HABTM associations 2013-10-02 16:03:45 -07:00
Aaron Patterson
957d7ae037 remove HABTM special cases from reflections 2013-10-02 15:59:13 -07:00
Aaron Patterson
a03ea3ff97 remove the HABTM preloader 2013-10-02 15:57:13 -07:00
Aaron Patterson
88c0093778 remove HABTM special cases from associations classes 2013-10-02 15:53:56 -07:00
Aaron Patterson
99185f0004 remove HABTM special cases from the fixtures 2013-10-02 15:51:29 -07:00
Aaron Patterson
8e4afa4eb1 repurpose the HABTM builder class 2013-10-02 15:49:36 -07:00
Aaron Patterson
dca2fb3680 goodbye has_and_belongs_to_many1, we will miss you! 2013-10-02 15:43:50 -07:00
Aaron Patterson
d3089adb1a keep track of the left and right reflections and expose those 2013-10-02 15:43:22 -07:00
Aaron Patterson
7963c5d841 have the builder create the middle reflection 2013-10-02 15:40:11 -07:00
Aaron Patterson
0af978d334 call the class method to define the callbacks 2013-10-02 15:31:26 -07:00
Aaron Patterson
7a38eae007 Merge branch 'master' into habtm
* master:
  we can define callbacks without a builder instance
  push methods that don't depend on the instance to the class
  get the name from the reflection
  cache the name and options on the stack
  decouple belongs_to callback definition from the builder instance.
  add_before_destroy_callbacks doesn't depend on the instance, so push it to the class.
  valid_options doesn't depend on the instance, so push it to the class
  use the information on the reflection to determine whether callbacks should be added
  Running all isolated test for actionview
  association builder is no longer needed for counter cache, so remove it
  push constructable? on to the reflection
  Adds the Rails maintenance policy to the Guides
  name is on the reflection, so just use the reflection
  decouple define_callback from the instance
  Added activemodel as a explicit dependency
  unify `Fixes` notes in AR changelog. [ci skip].
  improving `reload` doc wording. #12418 [ci skip]
  Update AR reload doc for the case of manually set primary key attribute [ci skip]
2013-10-02 15:28:59 -07:00
Aaron Patterson
b86a4965b8 we can define callbacks without a builder instance 2013-10-02 15:28:50 -07:00
Aaron Patterson
73ee85f39d push methods that don't depend on the instance to the class 2013-10-02 15:28:50 -07:00
Aaron Patterson
07d522b1be get the name from the reflection 2013-10-02 15:28:50 -07:00
Aaron Patterson
32bacb1ce8 cache the name and options on the stack 2013-10-02 15:28:50 -07:00
Aaron Patterson
ea11af9568 decouple belongs_to callback definition from the builder instance.
All the information is on the reflection, so just get it there.
2013-10-02 15:28:50 -07:00
Aaron Patterson
743f1a9094 add_before_destroy_callbacks doesn't depend on the instance, so push it
to the class.
2013-10-02 15:28:49 -07:00
Aaron Patterson
22f05afb2d valid_options doesn't depend on the instance, so push it to the class 2013-10-02 15:28:49 -07:00
Aaron Patterson
a88a5d7370 use the information on the reflection to determine whether callbacks should be added 2013-10-02 15:28:49 -07:00
Aaron Patterson
438e172a45 association builder is no longer needed for counter cache, so remove it 2013-10-02 14:55:29 -07:00
Aaron Patterson
75beb6c7c3 push constructable? on to the reflection 2013-10-02 14:52:59 -07:00
Aaron Patterson
5d8b7760ee name is on the reflection, so just use the reflection 2013-10-02 14:38:05 -07:00
Aaron Patterson
c2b3371838 decouple define_callback from the instance 2013-10-02 14:34:57 -07:00
Aaron Patterson
0091808a08 move habtm translation to a builder class 2013-10-02 14:12:03 -07:00
Aaron Patterson
14e9e57fdb get the left and right association names from the join model 2013-10-02 11:47:02 -07:00
Aaron Patterson
d15165196c define the join model without using closures on the methods 2013-10-02 11:22:59 -07:00
Yves Senn
dfe40cdcab unify Fixes notes in AR changelog. [ci skip]. 2013-10-02 15:36:20 +02:00
Yves Senn
3b0d34ca17 improving reload doc wording. #12418 [ci skip] 2013-10-02 10:18:02 +02:00
Anatoli Makarevich
7f1e8759c3 Update AR reload doc for the case of manually set primary key attribute [ci skip] 2013-10-02 08:14:58 +04:00
Aaron Patterson
636a909985 decouple the HABTM builder 2013-10-01 16:15:04 -07:00
Aaron Patterson
c00173b325 only pass options to the habtm builder 2013-10-01 15:42:28 -07:00
Aaron Patterson
ad7b5efb55 Squashed commit of the following:
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
      ✂️ [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. ❤️

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
2013-10-01 15:40:40 -07:00
Yves Senn
78fcc5fd1a extract adapter savepoint implementations into abstract/savepoints.rb. 2013-09-30 15:46:04 +02:00
Yves Senn
032998ad74 change the savepoint interface to allow passing the name. 2013-09-30 15:29:40 +02:00
Yves Senn
12720c77f5 Make .next_migration_number reusable for third party AR generators. 2013-09-30 15:03:55 +02:00
Yves Senn
93899335ae fix test_sqlite3_mem test run.
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
2013-09-30 09:08:07 +02:00
Rafael Mendonça França
414d1eaf6c Merge pull request #12383 from marclennox/master
Fixed issue #12327
2013-09-29 06:36:43 -07:00
Rafael Mendonça França
f90a5888ba Merge pull request #12398 from thedarkone/thread-safety-stuff
Thread safety fixes
2013-09-28 17:16:25 -07:00
Rafael Mendonça França
8771a565d3 Merge pull request #11496 from jetthoughts/11376_has_many_assoc_respect_scope_on_build
Removed where_values_hash from AR::NullRelation
2013-09-28 17:12:13 -07:00
Rafael Mendonça França
c2ee6a079e Merge pull request #12396 from arthurnn/cleanup_logsubs
Cleanup identitymap logger from LogSubscriber
2013-09-28 16:40:45 -07:00
Vijay Dev
33434f69c4 Merge branch 'master' of github.com:rails/docrails 2013-09-28 23:28:16 +05:30
thedarkone
28572f59f8 Use TS::Cache instead of Mutex + Hash.
TS::Cache#compute_if_absent guarantees that only a single thread will get to execute the provided block for a given key.
2013-09-28 19:19:07 +02:00
Arthur Neves
260f965890 Cleanup identitymap logger from LogSubscriber
Also renaming ivar @odd_or_even to @odd
2013-09-28 12:00:19 -04:00
Paul Nikitochkin
8fb0de2cae Removed where_values_hash from AR::NullRelation
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
2013-09-28 11:21:34 +03:00
Aaron Patterson
3e0a60e4e2 adding a test to demonstrate how to use STI subclasses on the far right
side of a hm:t association along with preloading.
2013-09-27 16:56:49 -07:00
Marc Lennox
747ccb0f7c Fixed issue #12327 2013-09-27 14:26:17 -04:00