postgresql_cursor 0.6.6 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8aed2634af7f5f9be7ea31ff6a9b0757eadead1df98b48326e02716453b1a2ff
-  data.tar.gz: a6187a116e1f4e3151d39d834c9b00f665594fd94e80182eccbceb23fbce73e5
+  metadata.gz: c85acb2e98683cf55a34048f3b4b20ee78b210741f22dcb634bd5c4a2fe53395
+  data.tar.gz: 2c9c6bef23d6a18d6e878b8bf0cd5f85ec94c4fe013238ca95fa1a95f9af8ada
 SHA512:
-  metadata.gz: 04fd5c71657bb4702af5d73efb7ae55c0f3e0e59b625d4331c0c202766faca9f2f3effcfc56bbb26e5aafc9cace30b719c2db7232413d600a3970b39d46393da
-  data.tar.gz: a3dff976f877302d6f0ffa8bfee195eb509c36c18ec3e8c4c81c07ec6bc57b0434d9fd9b63528b39da43ade976c61b47888d3a3451df9c1eedf24f8561e35aa0
+  metadata.gz: 707d3922478b915d36b503a9e3ef4973e2064d7e1b0388b2b31191e91e4bef1e118ac3d08eb8aaeae4a7b94e6c099c522116d7651aa23f0645f16541e8b68793
+  data.tar.gz: 7bda9582106b1d8472a7c09d3ce9db8e66a519f2f22f2903c9e29b5f9814083f81ffa3df3c2aa171b5e2f8445c2bf05f0fac5025176c77ef74ae7c7733c0dec6

data/lib/postgresql_cursor/cursor.rb

@@ -229,16 +229,14 @@ module PostgreSQLCursor
       types = {}
       fields = @result.fields
       fields.each_with_index do |fname, i|
-        ftype = @result.ftype i
-        fmod = @result.fmod i
-        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
-          else
-            ::ActiveRecord::Type::Value.new
-          end
-        end
+        ftype = @result.ftype(i)
+        fmod = @result.fmod(i)
+
+        # From @netrusov 2023-01-18. This is the same call used in the PostgreSQL Adapter
+        types[fname] = @connection.send(:get_oid_type, ftype, fmod, fname)
+
+        # # From @simi 2023-01-18 (Works as well, used old calling method)
+        # types[fname] = @connection.get_type_map.fetch(ftype)
       end
 
       @column_types = types

data/lib/postgresql_cursor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PostgresqlCursor
-  VERSION = "0.6.6"
+  VERSION = "0.6.8"
 end

data/postgresql_cursor.gemspec

@@ -27,18 +27,14 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  # Remove this for jruby which should use 'activerecord-jdbcpostgresql-adapter'
-  # spec.add_dependency 'pg'
-
-  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_dependency "activerecord", ">= 6.0"
+  # spec.add_development_dependency "activerecord", "~> 6.1"
+  # spec.add_development_dependency "activerecord", "~> 7.0"
 
+  # PG dependency held back for Jruby. See pg_jruby or jdbc-postgres-adapter gems.
+  spec.add_development_dependency "pg" unless RUBY_PLATFORM == "java"
   spec.add_development_dependency "irb"
   spec.add_development_dependency "minitest"
-  spec.add_development_dependency "pg"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "appraisal"
 end

data/test/test_postgresql_cursor.rb

@@ -150,7 +150,7 @@ class TestPostgresqlCursor < Minitest::Test
       Product.connection.execute("select kaboom")
     end
   rescue => e
-    assert_match(/PG::InFailedSqlTransaction/, e.message)
+    assert_match(/PG::(InFailedSqlTransaction|UndefinedColumn)/, e.message)
   end
 
   def test_batch_exception_in_failed_transaction
@@ -158,7 +158,7 @@ class TestPostgresqlCursor < Minitest::Test
       Product.connection.execute("select kaboom")
     end
   rescue => e
-    assert_match(/PG::InFailedSqlTransaction/, e.message)
+    assert_match(/PG::(InFailedSqlTransaction|UndefinedColumn)/, e.message)
   end
 
   def test_cursor

data/test-app/Gemfile

@@ -1,15 +1,8 @@
 # A sample Gemfile
 source "https://rubygems.org"
 
-gem 'activerecord', '~> 5.2.0'
-#gem 'activerecord', '~> 3.2.0'
-#gem 'activerecord', '~> 4.0.0'
-#gem 'activerecord', '~> 4.1.0'
-#gem 'activerecord', '4.1.2.rc1'
+gem "activerecord", "~> 7.0.4.1"
+# gem 'activerecord', '~> 6.1.7.1'
 
-# For testing against Edge Rails
-#gem 'activerecord', github: 'rails/rails', branch: 'master'
-#gem 'arel', github: 'rails/arel', branch: 'master'
-
-gem 'pg'
-gem 'postgresql_cursor', path:"../"
+gem "pg"
+gem "postgresql_cursor", path: "../"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postgresql_cursor
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.8
 platform: ruby
 authors:
 - Allen Fair
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-31 00:00:00.000000000 Z
+date: 2023-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,16 +16,16 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '6.0'
 - !ruby/object:Gem::Dependency
-  name: irb
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: irb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="