postgresql_cursor 0.6.3 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5f4a26d515960d1540480268329773c23a4e99453216b5bcd54aba599b27938
-  data.tar.gz: 0fa28ed9b5f9e5a981dda5783135c20c120657edc2ef7077bcfee7eeafc8128e
+  metadata.gz: 79f076e2bf123498e0df89e2933531efae406a754cf14d049be33f973fc791c0
+  data.tar.gz: 260e4db366a8ccacb370d04c894b643c8363ed666e46fae77c81ec2b79d09b1e
 SHA512:
-  metadata.gz: 26ad2f87253cda10a5ebec49b7ed80e44be294460b0a6dea4128a3b6c36e6ad70583921ae1c8cfc89acb00a81e6f744bb0e44c3929adcd97ad360759d2758f8e
-  data.tar.gz: 2667b5fee47be190f4cd58f068db030fc7ab34087b1ad56449d2b6722e2205baceae18142ae4692241b1c92cc9382076446283b5807fa9234e70af7799489dba
+  metadata.gz: 18720db87b3218629b6658a7fec653f56775eed3cea0af4cae6d0422a93b7f2dfa338c47752f5be84f46a1b72dbee4c0ec677ee7e6057894ad85c31937fef02b
+  data.tar.gz: 48aff84018a7924fff8c1eefbef1240b5adec9f43c12d29fd744b8af80ef283edae66249f5546d7c81741fed93d70838ac494031518a2814c4f44e43f5ff3944

data/.gitignore

@@ -15,6 +15,7 @@ tmtags
 
 ## IntelliJ/Rubymine
 .idea
+*.iml
 
 ## PROJECT::GENERAL
 coverage
@@ -22,4 +23,4 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
-Gemfile.lock
+Gemfile.lock

data/.travis.yml

@@ -0,0 +1,27 @@
+language: ruby
+rvm:
+  - 2.6.5
+  - 2.7.1
+before_install:
+  - sudo apt-get update
+  - sudo apt-get --yes remove postgresql\*
+  - sudo apt-get install -y postgresql-12 postgresql-client-12
+  - sudo cp /etc/postgresql/{9.6,12}/main/pg_hba.conf
+  - sudo service postgresql restart 12
+gemfile:
+  - gemfiles/activerecord_4.gemfile
+  - gemfiles/activerecord_5.gemfile
+  - gemfiles/activerecord_6.gemfile
+matrix:
+  exclude:
+    - rvm: 2.7.1
+      gemfile: gemfiles/activerecord_4.gemfile
+services:
+  - postgresql
+before_script:
+  - psql -c 'create database postgresql_cursor_test;' -U postgres
+  - psql -c 'CREATE ROLE travis SUPERUSER LOGIN CREATEDB;' -U postgres
+  - psql -c 'create table products ( id serial primary key, data varchar);' -U postgres -d postgresql_cursor_test
+  - psql -c 'create table prices ( id serial primary key, data varchar, product_id integer);' -U postgres -d postgresql_cursor_test
+addons:
+  postgresql: '12.3'

data/Appraisals

@@ -0,0 +1,12 @@
+appraise "activerecord-4" do
+  gem "activerecord", "4.2.11.1"
+  gem "pg", "~> 0.15"
+end
+
+appraise "activerecord-5" do
+  gem "activerecord", "5.2.3"
+end
+
+appraise "activerecord-6" do
+  gem "activerecord", "6.0.0"
+end

data/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
@@ -21,4 +21,5 @@ desc "Setup testing database and table"
 task :setup do
   sh %q(createdb postgresql_cursor_test)
   sh %Q<echo "create table products ( id serial primary key, data varchar);" | psql postgresql_cursor_test>
+  sh %Q<echo "create table prices ( id serial primary key, data varchar, product_id integer);" | psql postgresql_cursor_test>
 end

data/gemfiles/activerecord_4.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "4.2.11.1"
+gem "pg", "~> 0.15"
+
+gemspec path: "../"

data/gemfiles/activerecord_5.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "5.2.3"
+
+gemspec path: "../"

data/gemfiles/activerecord_6.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "6.0.0"
+
+gemspec path: "../"

data/lib/postgresql_cursor/cursor.rb

@@ -41,29 +41,32 @@ module PostgreSQLCursor
     #   PostgreSQLCursor::Cursor.new("select ....")
     #
     # Returns the cursor object when called with new.
-    def initialize(sql, options={})
-      @sql        = sql
-      @options    = options
+    def initialize(sql, options = {})
+      @sql = sql
+      @options = options
       @connection = @options.fetch(:connection) { ::ActiveRecord::Base.connection }
-      @count      = 0
-      @iterate    = options[:instances] ? :each_instance : :each_row
-      @batched    = false
+      @count = 0
+      @iterate = options[:instances] ? :each_instance : :each_row
+      @batched = false
     end
 
-    # Specify the type to instantiate, or reset to return a Hash
-    def iterate_type(type=nil)
-      if type.nil? || type == Hash
+    # Specify the type to instantiate, or reset to return a Hash.
+    #
+    # Explicitly check for type class to prevent calling equality
+    # operator on active record relation, which will load it.
+    def iterate_type(type = nil)
+      if type.nil? || (type.instance_of?(Class) && type == Hash)
         @iterate = :each_row
-      elsif type == Array
+      elsif type.instance_of?(Class) && type == Array
         @iterate = :each_array
       else
         @iterate = :each_instance
-        @type    = type
+        @type = type
       end
       self
     end
 
-    def iterate_batched(batched=true)
+    def iterate_batched(batched = true)
       @batched = batched
       self
     end
@@ -76,16 +79,16 @@ module PostgreSQLCursor
     # Returns the count of rows processed
     def each(&block)
       if @iterate == :each_row
-        @batched ? self.each_row_batch(&block) : self.each_row(&block)
+        @batched ? each_row_batch(&block) : each_row(&block)
       elsif @iterate == :each_array
-        @batched ? self.each_array_batch(&block) : self.each_array(&block)
+        @batched ? each_array_batch(&block) : each_array(&block)
       else
-        @batched ? self.each_instance_batch(@type, &block) : self.each_instance(@type, &block)
+        @batched ? each_instance_batch(@type, &block) : each_instance(@type, &block)
       end
     end
 
     def each_row(&block)
-      self.each_tuple do |row|
+      each_tuple do |row|
         row = row.symbolize_keys if @options[:symbolize_keys]
         block.call(row)
       end
@@ -95,7 +98,7 @@ module PostgreSQLCursor
       old_iterate = @iterate
       @iterate = :each_array
       begin
-        rv = self.each_tuple do |row|
+        rv = each_tuple do |row|
           block.call(row)
         end
       ensure
@@ -104,11 +107,11 @@ module PostgreSQLCursor
       rv
     end
 
-    def each_instance(klass=nil, &block)
+    def each_instance(klass = nil, &block)
       klass ||= @type
-      self.each_tuple do |row|
+      each_tuple do |row|
         if ::ActiveRecord::VERSION::MAJOR < 4
-          model = klass.send(:instantiate,row)
+          model = klass.send(:instantiate, row)
         else
           @column_types ||= column_types
           model = klass.send(:instantiate, row, @column_types)
@@ -118,7 +121,7 @@ module PostgreSQLCursor
     end
 
     def each_row_batch(&block)
-      self.each_batch do |batch|
+      each_batch do |batch|
         batch.map!(&:symbolize_keys) if @options[:symbolize_keys]
         block.call(batch)
       end
@@ -128,7 +131,7 @@ module PostgreSQLCursor
       old_iterate = @iterate
       @iterate = :each_array
       begin
-        rv = self.each_batch do |batch|
+        rv = each_batch do |batch|
           block.call(batch)
         end
       ensure
@@ -137,15 +140,15 @@ module PostgreSQLCursor
       rv
     end
 
-    def each_instance_batch(klass=nil, &block)
+    def each_instance_batch(klass = nil, &block)
       klass ||= @type
-      self.each_batch do |batch|
+      each_batch do |batch|
         models = batch.map do |row|
           if ::ActiveRecord::VERSION::MAJOR < 4
-            model = klass.send(:instantiate, row)
+            klass.send(:instantiate, row)
           else
             @column_types ||= column_types
-            model = klass.send(:instantiate, row, @column_types)
+            klass.send(:instantiate, row, @column_types)
           end
         end
         block.call(models)
@@ -160,11 +163,11 @@ module PostgreSQLCursor
       options = cols.last.is_a?(Hash) ? cols.pop : {}
       @options.merge!(options)
       @options[:symbolize_keys] = true
-      self.iterate_type(options[:class]) if options[:class]
-      cols    = cols.map {|c| c.to_sym }
-      result  = []
+      iterate_type(options[:class]) if options[:class]
+      cols = cols.map { |c| c.to_sym }
+      result = []
 
-      self.each() do |row|
+      each do |row|
         row = row.symbolize_keys if row.is_a?(Hash)
         result << cols.map { |c| row[c] }
       end
@@ -173,48 +176,44 @@ module PostgreSQLCursor
       result
     end
 
-    def each_tuple(&block) #:nodoc:
-      has_do_until  = @options.has_key?(:until)
-      has_do_while  = @options.has_key?(:while)
-      @count        = 0
+    def each_tuple(&block) # :nodoc:
+      has_do_until = @options.has_key?(:until)
+      has_do_while = @options.has_key?(:while)
+      @count = 0
       @column_types = nil
       with_optional_transaction do
-        begin
-          open
-          while (row = fetch) do
-            break if row.size==0
-            @count += 1
-            rc = block.call(row)
-            break if has_do_until && rc == @options[:until]
-            break if has_do_while && rc != @options[:while]
-          end
-        rescue Exception => e
-          raise e
-        ensure
-          close if @block
+        open
+        while (row = fetch)
+          break if row.size == 0
+          @count += 1
+          rc = block.call(row)
+          break if has_do_until && rc == @options[:until]
+          break if has_do_while && rc != @options[:while]
         end
+      rescue => e
+        raise e
+      ensure
+        close if @block && connection.active?
       end
       @count
     end
 
-    def each_batch(&block) #:nodoc:
+    def each_batch(&block) # :nodoc:
       has_do_until = @options.key?(:until)
       has_do_while = @options.key?(:while)
       @count = 0
       @column_types = nil
       with_optional_transaction do
-        begin
-          open
-          while (batch = fetch_block)
-            break if batch.empty?
-            @count += 1
-            rc = block.call(batch)
-            break if has_do_until && rc == @options[:until]
-            break if has_do_while && rc != @options[:while]
-          end
-        ensure
-          close if @block
+        open
+        while (batch = fetch_block)
+          break if batch.empty?
+          @count += 1
+          rc = block.call(batch)
+          break if has_do_until && rc == @options[:until]
+          break if has_do_while && rc != @options[:while]
         end
+      ensure
+        close if @block && connection.active?
       end
       @count
     end
@@ -231,15 +230,15 @@ module PostgreSQLCursor
       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) { |oid, mod|
+        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
+            ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::OID::Identity.new
           else
-            ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Identity.new
+            ::ActiveRecord::Type::Value.new
           end
-        }
+        end
       end
 
       @column_types = types
@@ -248,8 +247,8 @@ module PostgreSQLCursor
     # Public: Opens (actually, "declares") the cursor. Call this before fetching
     def open
       set_cursor_tuple_fraction
-      @cursor = @options[:cursor_name] || ("cursor_" + SecureRandom.uuid.gsub("-",""))
-      hold = @options[:with_hold] ? 'with hold ' : ''
+      @cursor = @options[:cursor_name] || ("cursor_" + SecureRandom.uuid.delete("-"))
+      hold = @options[:with_hold] ? "with hold " : ""
       @result = @connection.execute("declare #{@cursor} no scroll cursor #{hold}for #{@sql}")
       @block = []
     end
@@ -257,23 +256,23 @@ module PostgreSQLCursor
     # Public: Returns the next row from the cursor, or empty hash if end of results
     #
     # Returns a row as a hash of {'colname'=>value,...}
-    def fetch(options={})
+    def fetch(options = {})
       open unless @block
-      fetch_block if @block.size==0
+      fetch_block if @block.size == 0
       row = @block.shift
       row = row.symbolize_keys if row && options[:symbolize_keys]
       row
     end
 
     # Private: Fetches the next block of rows into @block
-    def fetch_block(block_size=nil)
-      block_size ||= @block_size ||= @options.fetch(:block_size) { 1000 }
+    def fetch_block(block_size = nil)
+      block_size ||= @block_size ||= @options.fetch(:block_size, 1000)
       @result = @connection.execute("fetch #{block_size} from #{@cursor}")
 
-      if @iterate == :each_array
-        @block = @result.each_row.collect {|row| row }
+      @block = if @iterate == :each_array
+        @result.each_row.collect { |row| row }
       else
-        @block = @result.collect {|row| row }
+        @result.collect { |row| row }
       end
     end
 
@@ -295,8 +294,8 @@ module PostgreSQLCursor
     # This is a value between 0.1 and 1.0 (PostgreSQL defaults to 0.1, this library defaults to 1.0)
     # used to determine the expected fraction (percent) of result rows returned the the caller.
     # This value determines the access path by the query planner.
-    def set_cursor_tuple_fraction(frac=1.0)
-      @cursor_tuple_fraction ||= @options.fetch(:fraction) { 1.0 }
+    def set_cursor_tuple_fraction(frac = 1.0)
+      @cursor_tuple_fraction ||= @options.fetch(:fraction, 1.0)
       return @cursor_tuple_fraction if frac == @cursor_tuple_fraction
       @cursor_tuple_fraction = frac
       @result = @connection.execute("set cursor_tuple_fraction to  #{frac}")

data/lib/postgresql_cursor/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PostgresqlCursor
-  VERSION = "0.6.3"
+  VERSION = "0.6.5"
 end

data/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'

data/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'
+require "postgresql_cursor/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = "postgresql_cursor"
-  spec.version       = PostgresqlCursor::VERSION
-  spec.authors       = ["Allen Fair"]
-  spec.email         = ["allen.fair@gmail.com"]
-  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.name = "postgresql_cursor"
+  spec.version = PostgresqlCursor::VERSION
+  spec.authors = ["Allen Fair"]
+  spec.email = ["allen.fair@gmail.com"]
+  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.files = `git ls-files -z`.split("\x0")
+  spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  #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"
+  # Remove this for jruby which should use 'activerecord-jdbcpostgresql-adapter'
+  # spec.add_dependency 'pg'
+
+  spec.add_dependency "activerecord", ">= 7.0.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 "irb"
+  spec.add_development_dependency "minitest"
   spec.add_development_dependency "pg"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "minitest"
+  spec.add_development_dependency "appraisal"
 end

data/test/helper.rb

@@ -10,6 +10,8 @@ ActiveRecord::Base.establish_connection(adapter: 'postgresql',
   username: ENV['TEST_USER']     || ENV['USER'] || 'postgresql_cursor')
 
 class Product < ActiveRecord::Base
+  has_many :prices
+
   # create table records (id serial primary key);
   def self.generate(max=1_000)
     max.times do |i|
@@ -18,5 +20,9 @@ class Product < ActiveRecord::Base
   end
 end
 
+class Price < ActiveRecord::Base
+  belongs_to :product
+end
+
 Product.destroy_all
 Product.generate(1000)

data/test/test_postgresql_cursor.rb

@@ -3,16 +3,15 @@
 #     rake setup
 # or create the database manually if your environment doesn't permit
 ################################################################################
-require_relative 'helper'
-require 'minitest/autorun'
-require 'minitest/pride'
+require_relative "helper"
+require "minitest/autorun"
+require "minitest/pride"
 
 class TestPostgresqlCursor < Minitest::Test
-
   def test_each
     c = PostgreSQLCursor::Cursor.new("select * from products order by 1")
     nn = 0
-    n = c.each { nn += 1}
+    n = c.each { nn += 1 }
     assert_equal nn, n
   end
 
@@ -29,22 +28,22 @@ class TestPostgresqlCursor < Minitest::Test
   end
 
   def test_each_while_until
-    c = PostgreSQLCursor::Cursor.new("select * from products order by 1", until:true)
-    n = c.each { |r| r['id'].to_i > 100 }
+    c = PostgreSQLCursor::Cursor.new("select * from products order by 1", until: true)
+    n = c.each { |r| r["id"].to_i > 100 }
     assert_equal 101, n
 
-    c = PostgreSQLCursor::Cursor.new("select * from products order by 1", while:true)
-    n = c.each { |r| r['id'].to_i < 100 }
+    c = PostgreSQLCursor::Cursor.new("select * from products order by 1", while: true)
+    n = c.each { |r| r["id"].to_i < 100 }
     assert_equal 100, n
   end
 
   def test_each_batch_while_until
     c = PostgreSQLCursor::Cursor.new("select * from products order by id asc", until: true, block_size: 50)
-    n = c.each_batch { |b| b.last['id'].to_i > 100 }
+    n = c.each_batch { |b| b.last["id"].to_i > 100 }
     assert_equal 3, n
 
     c = PostgreSQLCursor::Cursor.new("select * from products order by id asc", while: true, block_size: 50)
-    n = c.each_batch { |b| b.last['id'].to_i < 100 }
+    n = c.each_batch { |b| b.last["id"].to_i < 100 }
     assert_equal 2, n
   end
 
@@ -68,20 +67,26 @@ class TestPostgresqlCursor < Minitest::Test
 
   def test_relation
     nn = 0
-    Product.where("id>0").each_row {|r| nn += 1 }
+    Product.where("id>0").each_row { |r| nn += 1 }
     assert_equal 1000, nn
   end
 
   def test_relation_batch
     nn = 0
     row = nil
-    Product.where("id>0").each_row_batch(block_size: 100) { |b| row = b.last; nn += 1 }
+    Product.where("id>0").each_row_batch(block_size: 100) { |b|
+      row = b.last
+      nn += 1
+    }
     assert_equal 10, nn
     assert_equal Hash, row.class
 
     nn = 0
     row = nil
-    Product.where("id>0").each_instance_batch(block_size: 100) { |b| row = b.last; nn += 1 }
+    Product.where("id>0").each_instance_batch(block_size: 100) { |b|
+      row = b.last
+      nn += 1
+    }
     assert_equal 10, nn
     assert_equal Product, row.class
   end
@@ -89,12 +94,18 @@ class TestPostgresqlCursor < Minitest::Test
   def test_activerecord
     nn = 0
     row = nil
-    Product.each_row_by_sql("select * from products") {|r| row = r; nn += 1 }
+    Product.each_row_by_sql("select * from products") { |r|
+      row = r
+      nn += 1
+    }
     assert_equal 1000, nn
     assert_equal Hash, row.class
 
     nn = 0
-    Product.each_instance_by_sql("select * from products") {|r| row = r; nn += 1 }
+    Product.each_instance_by_sql("select * from products") { |r|
+      row = r
+      nn += 1
+    }
     assert_equal 1000, nn
     assert_equal Product, row.class
   end
@@ -102,32 +113,52 @@ class TestPostgresqlCursor < Minitest::Test
   def test_activerecord_batch
     nn = 0
     row = nil
-    Product.each_row_batch_by_sql("select * from products", block_size: 100) { |b| row = b.last; nn += 1 }
+    Product.each_row_batch_by_sql("select * from products", block_size: 100) { |b|
+      row = b.last
+      nn += 1
+    }
     assert_equal 10, nn
     assert_equal Hash, row.class
 
     nn = 0
-    Product.each_instance_batch_by_sql("select * from products", block_size: 100) { |b| row = b.last; nn += 1 }
+    Product.each_instance_batch_by_sql("select * from products", block_size: 100) { |b|
+      row = b.last
+      nn += 1
+    }
     assert_equal 10, nn
     assert_equal Product, row.class
   end
 
   def test_exception
-    begin
-      Product.each_row_by_sql("select * from products") do |r|
-        raise "Oops"
-      end
-    rescue Exception => e
-      assert_equal e.message, 'Oops'
+    Product.each_row_by_sql("select * from products") do |r|
+      raise "Oops"
     end
+  rescue => e
+    assert_equal e.message, "Oops"
   end
 
   def test_batch_exception
     Product.each_row_batch_by_sql("select * from products") do |r|
-      raise 'Oops'
+      raise "Oops"
+    end
+  rescue => e
+    assert_equal e.message, "Oops"
+  end
+
+  def test_exception_in_failed_transaction
+    Product.each_row_by_sql("select * from products") do |r|
+      Product.connection.execute("select kaboom")
+    end
+  rescue => e
+    assert_match(/PG::InFailedSqlTransaction/, e.message)
+  end
+
+  def test_batch_exception_in_failed_transaction
+    Product.each_row_batch_by_sql("select * from products") do |r|
+      Product.connection.execute("select kaboom")
     end
   rescue => e
-    assert_equal e.message, 'Oops'
+    assert_match(/PG::InFailedSqlTransaction/, e.message)
   end
 
   def test_cursor
@@ -144,11 +175,11 @@ class TestPostgresqlCursor < Minitest::Test
   def test_batched_cursor
     cursor = Product.all.each_row_batch(block_size: 100)
     assert cursor.respond_to?(:each)
-    b = cursor.map { |batch| batch.map { |r| r['id'] } }
+    b = cursor.map { |batch| batch.map { |r| r["id"] } }
     assert_equal 10, b.size
     cursor = Product.each_row_batch_by_sql("select * from products", block_size: 100)
     assert cursor.respond_to?(:each)
-    b = cursor.map { |batch| batch.map { |r| r['id'] } }
+    b = cursor.map { |batch| batch.map { |r| r["id"] } }
     assert_equal 10, b.size
   end
 
@@ -162,9 +193,9 @@ class TestPostgresqlCursor < Minitest::Test
 
   def test_with_hold
     items = 0
-    Product.where("id < 4") .each_instance(with_hold: true, block_size:1) do |row|
+    Product.where("id < 4").each_instance(with_hold: true, block_size: 1) do |row|
       Product.transaction do
-        row.update(data:Time.now.to_f.to_s)
+        row.update(data: Time.now.to_f.to_s)
         items += 1
       end
     end
@@ -173,22 +204,25 @@ class TestPostgresqlCursor < Minitest::Test
 
   def test_fetch_symbolize_keys
     Product.transaction do
-      #cursor = PostgreSQLCursor::Cursor.new("select * from products order by 1")
+      # cursor = PostgreSQLCursor::Cursor.new("select * from products order by 1")
       cursor = Product.all.each_row
       r = cursor.fetch
       assert r.has_key?("id")
-      r = cursor.fetch(symbolize_keys:true)
+      r = cursor.fetch(symbolize_keys: true)
       assert r.has_key?(:id)
       cursor.close
     end
   end
 
   def test_bad_sql
-    begin
-      ActiveRecord::Base.each_row_by_sql('select * from bad_table') { }
-      raise "Did Not Raise Expected Exception"
-    rescue Exception => e
-      assert_match(/bad_table/, e.message)
-    end
+    ActiveRecord::Base.each_row_by_sql("select * from bad_table") {}
+    raise "Did Not Raise Expected Exception"
+  rescue => e
+    assert_match(/bad_table/, e.message)
+  end
+
+  def test_relation_association_is_not_loaded
+    cursor = Product.first.prices.each_instance
+    refute cursor.instance_variable_get(:@type).loaded?
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postgresql_cursor
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.5
 platform: ruby
 authors:
 - Allen Fair
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-30 00:00:00.000000000 Z
+date: 2022-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 7.0.0
+- !ruby/object:Gem::Dependency
+  name: irb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -66,10 +94,12 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-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: |2
+    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.
 email:
 - allen.fair@gmail.com
 executables: []
@@ -78,11 +108,15 @@ extra_rdoc_files: []
 files:
 - ".document"
 - ".gitignore"
+- ".travis.yml"
+- Appraisals
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
+- gemfiles/activerecord_4.gemfile
+- gemfiles/activerecord_5.gemfile
+- gemfiles/activerecord_6.gemfile
 - lib/postgresql_cursor.rb
 - lib/postgresql_cursor/active_record/connection_adapters/postgresql_type_map.rb
 - lib/postgresql_cursor/active_record/relation/cursor_iterators.rb
@@ -100,7 +134,7 @@ homepage: http://github.com/afair/postgresql_cursor
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -115,11 +149,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: ActiveRecord PostgreSQL Adapter extension for using a cursor to return a
   large result set
-test_files:
-- test/helper.rb
-- test/test_postgresql_cursor.rb
+test_files: []

data/Gemfile.lock

@@ -1,42 +0,0 @@
-PATH
-  remote: .
-  specs:
-    postgresql_cursor (0.6.3)
-      activerecord (>= 3.1.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (6.0.0)
-      activesupport (= 6.0.0)
-    activerecord (6.0.0)
-      activemodel (= 6.0.0)
-      activesupport (= 6.0.0)
-    activesupport (6.0.0)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.1, >= 2.1.8)
-    concurrent-ruby (1.1.5)
-    i18n (1.6.0)
-      concurrent-ruby (~> 1.0)
-    minitest (5.12.0)
-    pg (1.1.4)
-    rake (13.0.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    zeitwerk (2.1.10)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  minitest
-  pg
-  postgresql_cursor!
-  rake
-
-BUNDLED WITH
-   1.17.3