postgresql_cursor 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f60d787898c546a7c79c8ff6ca3aee03a54793e9a4e3c0798fc39ad6d6ae7a0
-  data.tar.gz: c175f5708bd1f0b1ba06c005254e7fb513d5ea72f9a7b373f16a42d969cb45eb
+  metadata.gz: e5f4a26d515960d1540480268329773c23a4e99453216b5bcd54aba599b27938
+  data.tar.gz: 0fa28ed9b5f9e5a981dda5783135c20c120657edc2ef7077bcfee7eeafc8128e
 SHA512:
-  metadata.gz: 547822d06073ffc68611179e93332d4840f250fe130d4448a0563986e6e41f9e30f26e3894ba326c4981ad51a44bff77bb326f4e4700f3267f80e6fc4e0008d5
-  data.tar.gz: 2479ab683e1a598ad18ef5a287106dda78113ab6e745c9ff3bd4eed982c5af9f0a2ad7d1b933b73328229bf39208aa0d25ed513607b06b417742091e7a4c7df6
+  metadata.gz: 26ad2f87253cda10a5ebec49b7ed80e44be294460b0a6dea4128a3b6c36e6ad70583921ae1c8cfc89acb00a81e6f744bb0e44c3929adcd97ad360759d2758f8e
+  data.tar.gz: 2667b5fee47be190f4cd58f068db030fc7ab34087b1ad56449d2b6722e2205baceae18142ae4692241b1c92cc9382076446283b5807fa9234e70af7799489dba

data/README.md

@@ -67,6 +67,7 @@ All these methods take an options hash to control things more:
                       This library uses 1.0 (Optimize for 100% of the result set)
                       Do not override this value unless you understand it.
     with_hold:boolean Keep the cursor "open" even after a commit.
+    cursor_name:string Give your cursor a name.
 
 Notes:
 

data/lib/postgresql_cursor.rb

@@ -1,12 +1,16 @@
+# frozen_string_literal: true
+
 require 'postgresql_cursor/version'
-require 'postgresql_cursor/cursor'
-require 'postgresql_cursor/active_record/relation/cursor_iterators'
-require 'postgresql_cursor/active_record/sql_cursor'
-require 'postgresql_cursor/active_record/connection_adapters/postgresql_type_map'
 
-# ActiveRecord 4.x
-require 'active_record'
-require 'active_record/connection_adapters/postgresql_adapter'
-ActiveRecord::Base.extend(PostgreSQLCursor::ActiveRecord::SqlCursor)
-ActiveRecord::Relation.send(:include, PostgreSQLCursor::ActiveRecord::Relation::CursorIterators)
-ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.send(:include, PostgreSQLCursor::ActiveRecord::ConnectionAdapters::PostgreSQLTypeMap)
+ActiveSupport.on_load :active_record do
+  require 'postgresql_cursor/cursor'
+  require 'postgresql_cursor/active_record/relation/cursor_iterators'
+  require 'postgresql_cursor/active_record/sql_cursor'
+  require 'postgresql_cursor/active_record/connection_adapters/postgresql_type_map'
+
+  # ActiveRecord 4.x
+  require 'active_record/connection_adapters/postgresql_adapter'
+  ActiveRecord::Base.extend(PostgreSQLCursor::ActiveRecord::SqlCursor)
+  ActiveRecord::Relation.send(:include, PostgreSQLCursor::ActiveRecord::Relation::CursorIterators)
+  ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.send(:include, PostgreSQLCursor::ActiveRecord::ConnectionAdapters::PostgreSQLTypeMap)
+end

data/lib/postgresql_cursor/active_record/relation/cursor_iterators.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Defines extension to ActiveRecord/AREL to use this library
 module PostgreSQLCursor
   module ActiveRecord
@@ -12,6 +14,7 @@ module PostgreSQLCursor
         #   block_size: 1..n      - The number of rows to fetch per db block fetch
         #   while: value          - Exits loop when block does not return this value.
         #   until: value          - Exits loop when block returns this value.
+        #   cursor_name: string   - Allows you to name your cursor.
         #
         # Example:
         #   Post.where(user_id:123).each_row { |hash| Post.process(hash) }

data/lib/postgresql_cursor/cursor.rb

@@ -1,4 +1,4 @@
-require 'active_record/connection_adapters/postgresql/oid'
+# frozen_string_literal: true
 
 ################################################################################
 # PostgreSQLCursor: library class provides postgresql cursor for large result
@@ -12,6 +12,7 @@ require 'active_record/connection_adapters/postgresql/oid'
 #   while: value          - Exits loop when block does not return this value.
 #   until: value          - Exits loop when block returns this value.
 #   with_hold: boolean    - Allows the query to remain open across commit points.
+#   cursor_name: string   - Allows you to name your cursor.
 #
 # Exmaples:
 #   PostgreSQLCursor::Cursor.new("select ...").each { |hash| ... }
@@ -20,13 +21,6 @@ require 'active_record/connection_adapters/postgresql/oid'
 #   ActiveRecordModel.each_instance_by_sql("select ...") { |model| ... }
 #
 
-
-if ::ActiveRecord::VERSION::MAJOR <= 4
-  OID = ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::OID
-else
-  OID = ActiveRecord::ConnectionAdapters::PostgreSQL::OID
-end
-
 module PostgreSQLCursor
   class Cursor
     include Enumerable
@@ -240,7 +234,11 @@ module PostgreSQLCursor
         fmod  = @result.fmod i
         types[fname] = @connection.get_type_map.fetch(ftype, fmod) { |oid, mod|
           warn "unknown OID: #{fname}(#{oid}) (#{sql})"
-          OID::Identity.new
+          if ::ActiveRecord::VERSION::MAJOR <= 4
+            ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::OID::Identity.new
+          else
+            ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Identity.new
+          end
         }
       end
 
@@ -250,9 +248,9 @@ module PostgreSQLCursor
     # Public: Opens (actually, "declares") the cursor. Call this before fetching
     def open
       set_cursor_tuple_fraction
-      @cursor = SecureRandom.uuid.gsub("-","")
+      @cursor = @options[:cursor_name] || ("cursor_" + SecureRandom.uuid.gsub("-",""))
       hold = @options[:with_hold] ? 'with hold ' : ''
-      @result = @connection.execute("declare cursor_#{@cursor} no scroll cursor #{hold}for #{@sql}")
+      @result = @connection.execute("declare #{@cursor} no scroll cursor #{hold}for #{@sql}")
       @block = []
     end
 
@@ -270,7 +268,7 @@ module PostgreSQLCursor
     # Private: Fetches the next block of rows into @block
     def fetch_block(block_size=nil)
       block_size ||= @block_size ||= @options.fetch(:block_size) { 1000 }
-      @result = @connection.execute("fetch #{block_size} from cursor_#{@cursor}")
+      @result = @connection.execute("fetch #{block_size} from #{@cursor}")
 
       if @iterate == :each_array
         @block = @result.each_row.collect {|row| row }
@@ -281,7 +279,7 @@ module PostgreSQLCursor
 
     # Public: Closes the cursor
     def close
-      @connection.execute("close cursor_#{@cursor}")
+      @connection.execute("close #{@cursor}")
     end
 
     # Private: Open transaction unless with_hold option, specified

data/lib/postgresql_cursor/version.rb

@@ -1,3 +1,3 @@
 module PostgresqlCursor
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postgresql_cursor
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Allen Fair
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-08 00:00:00.000000000 Z
+date: 2019-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -115,8 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: ActiveRecord PostgreSQL Adapter extension for using a cursor to return a