diff --git a/lib/administrate/search.rb b/lib/administrate/search.rb index 5619da249..975583f0d 100644 --- a/lib/administrate/search.rb +++ b/lib/administrate/search.rb @@ -137,15 +137,15 @@ def query_table_name(attr) else @scoped_resource.reflect_on_association(attr).klass.table_name end - ActiveRecord::Base.connection.quote_table_name(unquoted_table_name) + connection.quote_table_name(unquoted_table_name) else - ActiveRecord::Base.connection + connection .quote_table_name(@scoped_resource.table_name) end end def column_to_query(attr) - ActiveRecord::Base.connection.quote_column_name(attr) + connection.quote_column_name(attr) end def tables_to_join @@ -162,6 +162,14 @@ def term query.terms end + def connection + if @scoped_resource.respond_to?(:connection) + @scoped_resource.connection + else + ActiveRecord::Base + end + end + attr_reader :resolver, :query end end