postgresql_cursor 0.6.7 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b7fec6ed634fe89f563d2fddc6316e3e484e61efa844069064bee889bd8e9a4
-  data.tar.gz: 79af8640eb56720e25612a4d60c768ab48ab58f77251bac68b42e32c0777c1e5
+  metadata.gz: 630053842ad4867acb96172ec30bbb0bf6a2df40f08afe67b19a794394a79dc4
+  data.tar.gz: dff4476a6f173f50148e1a18570d91f47b99e08b64dcfb18308f59d8d66bd79e
 SHA512:
-  metadata.gz: 31df773065443453d3be8d68917be53ff02f4f354cbb6348b5f1f64f16f7e91dc8eb2de18736fa52a05c5dbe36ef77dea9141e52f856721021cd26d672b02a14
-  data.tar.gz: e27721566058e269ef75cf6acfaa9b66d06fa50256fc7faff80316a69a55c37bdb46a0e85f31ea478332bca413535a5a302851d4e594efdd147a6812491ad07f
+  metadata.gz: fbb48e961a6cc76371639cd5190e48484c350290d14f34882e6ea8e90337b0b948c0abcab1427df85bbeed59979a1e7d1e223f1c4e77a0dd51b81034c0e94208
+  data.tar.gz: a7444b6c43a0da1ea29a658852c66f16e1f22b5eef8e93f1a7ca8c24ed7599bdf197c272584ea09dda17d1db498b5f5c8d9b2a4bd0c79169b16c878f9856df0e

data/README.md

@@ -88,6 +88,17 @@ Product.each_row.map {|r| r["id"].to_i } #=> [1, 2, 3, ...]
 Product.each_instance.map {|r| r.id }.each {|id| p id } #=> [1, 2, 3, ...]
 Product.each_instance.lazy.inject(0) {|sum,r| sum +  r.quantity } #=> 499500
 ```
+
+### PostgreSQLCursor and collection rendering
+       
+You can render cursor collection, using enumeration as collection attribute.
+
+```ruby
+render partial: "some_partial", collection: Product.each_instance
+render partial: "some_partial", collection: Product.each_row
+render partial: "some_partial", collection: Product.each_hash
+```
+
 ### Hashes vs. Instances
 
 The each_row method returns the Hash of strings for speed (as this allows you to process a lot of rows).

data/lib/postgresql_cursor/cursor.rb

@@ -71,6 +71,12 @@ module PostgreSQLCursor
       self
     end
 
+    # ActiveRecord call #size when rendering a collection
+    # Define it and return some dummy value
+    def size
+      -1
+    end
+
     # Public: Yields each row of the result set to the passed block
     #
     # Yields the row to the block. The row is a hash with symbolized keys.
@@ -229,16 +235,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.to_s, fmod) do |oid, mod|
-          # warn "unknown OID: #{fname}(#{oid}, #{mod}) (#{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.7"
+  VERSION = '0.6.9'
 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/helper.rb

@@ -12,7 +12,8 @@ ActiveRecord::Base.establish_connection(adapter: 'postgresql',
 class Product < ActiveRecord::Base
   has_many :prices
 
-  # create table records (id serial primary key);
+  # create table products (id serial primary key, data varchar);
+  # create table prices (id serial primary key, product_id integer references products(id));
   def self.generate(max=1_000)
     max.times do |i|
       connection.execute("insert into products values (#{i+1})")

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
@@ -225,4 +225,13 @@ class TestPostgresqlCursor < Minitest::Test
     cursor = Product.first.prices.each_instance
     refute cursor.instance_variable_get(:@type).loaded?
   end
+
+  def test_size
+    r = Product.each_instance
+    assert_equal -1, r.size
+    r = Product.each_hash
+    assert_equal -1, r.size
+    r = Product.each_row
+    assert_equal -1, r.size
+  end
 end

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.7
+  version: 0.6.9
 platform: ruby
 authors:
 - Allen Fair
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-10 00:00:00.000000000 Z
+date: 2024-06-03 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:
     - - ">="
@@ -149,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: ActiveRecord PostgreSQL Adapter extension for using a cursor to return a