Replaces IOD::Identity with AR::Type::Value (afair#44)

This fix for a new method of building column types got lost during
merging.

Author: afair

Gemfile.lock

@@ -21,6 +21,7 @@ GEM
     concurrent-ruby (1.1.5)
     i18n (1.6.0)
       concurrent-ruby (~> 1.0)
+    irb (1.0.0)
     minitest (5.12.0)
     pg (1.1.4)
     rake (13.0.0)
@@ -33,6 +34,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  irb
   minitest
   pg
   postgresql_cursor!

Rakefile

@@ -11,7 +11,7 @@ end
 
 desc "Open and IRB Console with the gem and test-app loaded"
 task :console do
-  sh "bundle exec irb  -Ilib -I . -r postgresql_cursor -r test-app/app"
+  sh "bundle exec irb  -Ilib -I . -r pg -r postgresql_cursor -r test-app/app"
   #require 'irb'
   #ARGV.clear
   #IRB.start

lib/postgresql_cursor.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'postgresql_cursor/version'
+require 'active_support'
 
 ActiveSupport.on_load :active_record do
   require 'postgresql_cursor/cursor'

lib/postgresql_cursor/cursor.rb

@@ -232,14 +232,14 @@ def column_types
       fields.each_with_index do |fname, i|
         ftype = @result.ftype i
         fmod  = @result.fmod i
-        types[fname] = @connection.get_type_map.fetch(ftype, fmod) { |oid, mod|
+        types[fname] = @connection.get_type_map.fetch(ftype, fmod) do |oid, mod|
           warn "unknown OID: #{fname}(#{oid}) (#{sql})"
           if ::ActiveRecord::VERSION::MAJOR <= 4
-            ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::OID::Identity.new
+            ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::OID::Identity.new
           else
-            ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Identity.new
+            ::ActiveRecord::Type::Value.new
           end
-        }
+        end
       end
 
       @column_types = types

postgresql_cursor.gemspec

@@ -1,32 +1,44 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'postgresql_cursor/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "postgresql_cursor"
+  spec.name          = 'postgresql_cursor'
   spec.version       = PostgresqlCursor::VERSION
-  spec.authors       = ["Allen Fair"]
-  spec.email         = ["[email protected]"]
-  spec.summary       = "ActiveRecord PostgreSQL Adapter extension for using a cursor to return a large result set"
-  spec.description   = "PostgreSQL Cursor is an extension to the ActiveRecord PostgreSQLAdapter for very large result sets. It provides a cursor open/fetch/close interface to access data without loading all rows into memory, and instead loads the result rows in \"chunks\" (default of 1_000 rows), buffers them, and returns the rows one at a time."
-  spec.homepage      = "http://github.com/afair/postgresql_cursor"
-  spec.license       = "MIT"
+  spec.authors       = ['Allen Fair']
+  spec.email         = ['[email protected]']
+  spec.summary       = <<-SUMMARY
+  ActiveRecord PostgreSQL Adapter extension for using a cursor to return a
+  large result set
+  SUMMARY
+  spec.description = <<-DESCRIPTION
+  PostgreSQL Cursor is an extension to the ActiveRecord PostgreSQLAdapter for
+  very large result sets.  It provides a cursor open/fetch/close interface to
+  access data without loading all rows into memory, and instead loads the result
+  rows in 'chunks' (default of 1_000 rows), buffers them, and returns the rows
+  one at a time.
+  DESCRIPTION
+  spec.homepage      = 'http://github.com/afair/postgresql_cursor'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
+
+  # Remove this for jruby which should use 'activerecord-jdbcpostgresql-adapter'
+  # spec.add_dependency 'pg'
 
-  #spec.add_dependency "pg" # Remove this for jruby, which should specify 'activerecord-jdbcpostgresql-adapter'
-  spec.add_dependency "activerecord", ">= 3.1.0"
-  #spec.add_dependency "activerecord", "~> 3.1.0"
-  # Tests don't run on 4.0.0 since AR/AS have an older version of minitest as a run-time dependency(!) than our tests support
-  #spec.add_dependency "activerecord", "~> 4.0.0";# spec.add_dependency "minitest", "~> 4.2.0"
-  #spec.add_dependency "activerecord", "~> 4.1.0"
-  #spec.add_dependency "activerecord", "~> 5.0.0.beta2"
+  spec.add_dependency 'activerecord', '>= 3.1.0'
+  # spec.add_dependency 'activerecord', '~> 3.1.0'
+  # spec.add_dependency 'activerecord', '~> 4.1.0'
+  # spec.add_dependency 'activerecord', '~> 5.0.0'
+  # spec.add_dependency 'activerecord', '~> 6.0.0'
 
-  spec.add_development_dependency "pg"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "minitest"
+  spec.add_development_dependency 'irb'
+  spec.add_development_dependency 'minitest'
+  spec.add_development_dependency 'pg'
+  spec.add_development_dependency 'rake'
 end