Merge pull request afair#53 from afair/revert-48-fix-enum-parsing

Revert "FIX afair#40: Handle enum attributes while instantiating rows"
ukolovda · Jan 17, 2020 · 4bec7fa · 4bec7fa
2 parents 7e8dd76 + 829873f
commit 4bec7fa
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/lib/postgresql_cursor/cursor.rb b/lib/postgresql_cursor/cursor.rb
@@ -110,7 +110,12 @@ def each_array(&block)
     def each_instance(klass=nil, &block)
       klass ||= @type
       self.each_tuple do |row|
-        klass.send(:instantiate, row)
+        if ::ActiveRecord::VERSION::MAJOR < 4
+          model = klass.send(:instantiate,row)
+        else
+          @column_types ||= column_types
+          model = klass.send(:instantiate, row, @column_types)
+        end
         block.call(model)
       end
     end
@@ -139,7 +144,12 @@ def each_instance_batch(klass=nil, &block)
       klass ||= @type
       self.each_batch do |batch|
         models = batch.map do |row|
-          klass.send(:instantiate, row)
+          if ::ActiveRecord::VERSION::MAJOR < 4
+            model = klass.send(:instantiate, row)
+          else
+            @column_types ||= column_types
+            model = klass.send(:instantiate, row, @column_types)
+          end
         end
         block.call(models)
       end