Merge pull request #134 from rainerborene/rails4.1

Use schema cache to look up predicate columns
DavyJonesLocker · Jul 21, 2014 · 57bded6 · 57bded6
2 parents 091dc7e + bcceeea
commit 57bded6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/lib/postgres_ext/active_record/relation/predicate_builder.rb b/lib/postgres_ext/active_record/relation/predicate_builder.rb
@@ -8,7 +8,7 @@ def self.build(attribute, value)
       case value
       when Array
         engine = attribute.relation.engine
-        column = engine.connection.columns(attribute.relation.name).detect{ |col| col.name.to_s == attribute.name.to_s }
+        column = engine.connection.schema_cache.columns(attribute.relation.name).detect{ |col| col.name.to_s == attribute.name.to_s }
         if column && column.array
           attribute.eq(value)
         else

diff --git a/lib/postgres_ext/arel/visitors/to_sql.rb b/lib/postgres_ext/arel/visitors/to_sql.rb
@@ -4,7 +4,7 @@ module Arel
   module Visitors
     class ToSql
       def visit_Array o, a
-        column = a.relation.engine.connection.columns(a.relation.name).find { |col| col.name == a.name.to_s } if a
+        column = a.relation.engine.connection.schema_cache.columns(a.relation.name).find { |col| col.name == a.name.to_s } if a
         if column && column.respond_to?(:array) && column.array
           quoted o, a
         else

diff --git a/lib/postgres_ext/arel/visitors/visitor.rb b/lib/postgres_ext/arel/visitors/visitor.rb
@@ -1,4 +1,5 @@
 require 'arel/visitors/visitor'
+
 module Arel
   module Visitors
     class Visitor