From c6a62dc327c54baec87306f5c381e13cacc00a19 Mon Sep 17 00:00:00 2001 From: Ryuta Kamizono Date: Mon, 4 Jul 2016 06:18:37 +0900 Subject: Do not handle as an associated predicate if a table has the column If handled as an associated predicate even though a table has the column, will generate invalid SQL by valid column name treated as a table name. --- activerecord/lib/active_record/table_metadata.rb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'activerecord/lib/active_record/table_metadata.rb') diff --git a/activerecord/lib/active_record/table_metadata.rb b/activerecord/lib/active_record/table_metadata.rb index e8d6a144f9..0ca880e635 100644 --- a/activerecord/lib/active_record/table_metadata.rb +++ b/activerecord/lib/active_record/table_metadata.rb @@ -37,6 +37,10 @@ module ActiveRecord end end + def has_column?(column_name) + klass && klass.columns_hash.key?(column_name.to_s) + end + def associated_with?(association_name) klass && klass._reflect_on_association(association_name) end -- cgit v1.2.3