diff options
| author | Andrew White <andyw@pixeltrix.co.uk> | 2012-06-21 20:47:12 +0100 |
|---|---|---|
| committer | Andrew White <andyw@pixeltrix.co.uk> | 2012-06-22 06:27:11 +0100 |
| commit | 46492949b8c09f99db78b9f7a02d039e7bc6a702 (patch) | |
| tree | be43fa8f56c715fa830c9d6ffb39bebdeed671bd /activerecord/test/fixtures/reserved_words | |
| parent | 4bbd35f7a6c495959ffa2d08a88302f34b9a2531 (diff) | |
| download | rails-46492949b8c09f99db78b9f7a02d039e7bc6a702.tar.gz rails-46492949b8c09f99db78b9f7a02d039e7bc6a702.tar.bz2 rails-46492949b8c09f99db78b9f7a02d039e7bc6a702.zip | |
Improve the derivation of HABTM assocation join table names
Improve the derivation of HABTM join table name to take account of nesting.
It now takes the table names of the two models, sorts them lexically and
then joins them, stripping any common prefix from the second table name.
Some examples:
Top level models
(Category <=> Product)
Old: categories_products
New: categories_products
Top level models with a global table_name_prefix
(Category <=> Product)
Old: site_categories_products
New: site_categories_products
Nested models in a module without a table_name_prefix method
(Admin::Category <=> Admin::Product)
Old: categories_products
New: categories_products
Nested models in a module with a table_name_prefix method
(Admin::Category <=> Admin::Product)
Old: categories_products
New: admin_categories_products
Nested models in a parent model
(Catalog::Category <=> Catalog::Product)
Old: categories_products
New: catalog_categories_products
Nested models in different parent models
(Catalog::Category <=> Content::Page)
Old: categories_pages
New: catalog_categories_content_pages
Also as part of this commit the validity checks for HABTM assocations have
been moved to ActiveRecord::Reflection One side effect of this is to move when
the exceptions are raised from the point of declaration to when the association
is built. This is consistant with other association validity checks.
Diffstat (limited to 'activerecord/test/fixtures/reserved_words')
| -rw-r--r-- | activerecord/test/fixtures/reserved_words/distinct_select.yml (renamed from activerecord/test/fixtures/reserved_words/distincts_selects.yml) | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/test/fixtures/reserved_words/distincts_selects.yml b/activerecord/test/fixtures/reserved_words/distinct_select.yml index 90e8c95fef..d96779ade4 100644 --- a/activerecord/test/fixtures/reserved_words/distincts_selects.yml +++ b/activerecord/test/fixtures/reserved_words/distinct_select.yml @@ -1,11 +1,11 @@ -distincts_selects1: +distinct_select1: distinct_id: 1 select_id: 1 -distincts_selects2: +distinct_select2: distinct_id: 1 select_id: 2 -distincts_selects3: +distinct_select3: distinct_id: 2 select_id: 3 |