Merge pull request #48 from adwyze/fix-enum-parsing

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