Fully qualify column names in queries

FortySource · Sep 19, 2014 · 943fa9d · 943fa9d
1 parent fbf4f42
commit 943fa9d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/lib/forty_facets/filter/belongs_to_chain_filter_definition.rb b/lib/forty_facets/filter/belongs_to_chain_filter_definition.rb
@@ -37,7 +37,14 @@ def build_scope
       end
 
       def facet
-        my_column = association.association_foreign_key
+        current_association = nil
+        current_class = filter_definition.search.root_class
+        filter_definition.model_field.reverse.drop(1).reverse.each do |field|
+          current_association = current_class.reflect_on_association(field)
+          current_class = current_association.klass
+        end
+
+        my_column = "#{current_class.table_name}.#{association.association_foreign_key}"
         counts = without.result.reorder('').joins(joins).select("#{my_column} AS foreign_id, count(#{my_column}) AS occurrences").group(my_column)
         entities_by_id = klass.find(counts.map(&:foreign_id)).group_by(&:id)
 

diff --git a/lib/forty_facets/filter/belongs_to_filter_definition.rb b/lib/forty_facets/filter/belongs_to_filter_definition.rb
@@ -20,7 +20,7 @@ def build_scope
       end
 
       def facet
-        my_column = association.association_foreign_key
+        my_column = "#{filter_definition.search.root_class.table_name}.#{association.association_foreign_key}"
         counts = without.result.reorder('').select("#{my_column} as foreign_id, count(#{my_column}) as occurrences").group(my_column)
         entities_by_id = klass.find(counts.map(&:foreign_id)).group_by(&:id)