Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Call Inflector#demodulize on the class name when eagerly including an…

… STI model. Closes #5077 [info@loobmedia.com]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4342 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit be3a4849a909545de444ef6d4f5751eea8a3ba1f 1 parent 6ef5b74
@technoweenie technoweenie authored
View
2  activerecord/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Call Inflector#demodulize on the class name when eagerly including an STI model. Closes #5077 [info@loobmedia.com]
+
* Preserve MySQL boolean column defaults when changing a column in a migration. Closes #5015. [pdcawley@bofh.org.uk]
* PostgreSQL: migrations support :limit with :integer columns by mapping limit < 4 to smallint, > 4 to bigint, and anything else to integer. #2900 [keegan@thebasement.org]
View
2  activerecord/lib/active_record/associations.rb
@@ -1515,7 +1515,7 @@ def association_join
join << %(AND %s.%s = %s ) % [
aliased_table_name,
reflection.active_record.connection.quote_column_name(reflection.active_record.inheritance_column),
- klass.quote(klass.name)] unless klass.descends_from_active_record?
+ klass.quote(klass.name.demodulize)] unless klass.descends_from_active_record?
join << "AND #{interpolate_sql(sanitize_sql(reflection.options[:conditions]))} " if reflection.options[:conditions]
join
end
View
7 activerecord/test/modules_test.rb
@@ -25,4 +25,11 @@ def test_associations_spanning_cross_modules
assert_kind_of MyApplication::Billing::Nested::Firm, account.nested_qualified_billing_firm
assert_kind_of MyApplication::Billing::Nested::Firm, account.nested_unqualified_billing_firm
end
+
+ def test_find_account_and_include_company
+ account = MyApplication::Billing::Account.find(1, :include => :firm)
+ assert_kind_of MyApplication::Business::Firm, account.instance_variable_get('@firm')
+ assert_kind_of MyApplication::Business::Firm, account.firm
+ end
+
end
Please sign in to comment.
Something went wrong with that request. Please try again.