postgresql_cursor 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bd16d1710bfc6796d8410b99d01b17c085118df
-  data.tar.gz: 4ad5f707f0c96ddbf85fb57ed2935d7c6e2e1da6
+  metadata.gz: df0425fd30e37c9d61b270416c9892375b0abe69
+  data.tar.gz: f59a3b1291c6476a16b08b084118be22b76020f5
 SHA512:
-  metadata.gz: 69547256fbc79ab776b41a05729ead0eb05bc0c6cc94fb2da60a19922376e4ddbd3fa686f76f3ed0bd2e98e35e16a072828fdae0f29f687fc4e14ff0364bd8be
-  data.tar.gz: 90e5cda34d77577766143c53b26300696791298ac2c9f20ba09d204e9be443ccafa3c0bbbf70619679e829abaf2734ef271f59991352739dfcab54c63e6050f1
+  metadata.gz: d5decdc3d118f14eac9d93d46c34bb3b11f51f784bf5ea5a6825aaffe9f85ae23d9094992ef938f363d003435014ef7d771d5d5db835cac22e811248cc881a38
+  data.tar.gz: 59f0e52d29bccd10d3b9e693d4c40e2920672eefcd3f103309b4f8a4c96d8aa055c9326c03dba11a21b2bb29a05896454d6c37730054c5f85f17c24c1bff23cf

data/README.md

@@ -144,13 +144,13 @@ ActiveRecord is designed and optimized for web performance. In a web transaction
 around 20 rows is returned to the user. When you do this
 
 ```ruby
-Product.find_each { |product| product.process }
+Product.where("id>0").each { |product| product.process }
 ```
 
 The database returns all matching result set rows to ActiveRecord, which instantiates each row with
 the data returned. This function returns an array of all these rows to the caller.
 
-Asyncronous, Background, or Offline processing may require processing a large amount of data.
+Asynchronous, Background, or Offline processing may require processing a large amount of data.
 When there is a very large number of rows, this requires a lot more memory to hold the data. Ruby
 does not return that memory after processing the array, and the causes your process to "bloat". If you
 don't have enough memory, it will cause an exception.

data/lib/postgresql_cursor/cursor.rb

@@ -21,7 +21,6 @@ module PostgreSQLCursor
   class Cursor
     include Enumerable
     attr_reader :sql, :options, :connection, :count, :result
-    @@cursor_seq = 0
 
     # Public: Start a new PostgreSQL cursor query
     # sql     - The SQL statement with interpolated values
@@ -50,6 +49,8 @@ module PostgreSQLCursor
     def iterate_type(type=nil)
       if type.nil? || type == Hash
         @iterate = :each_row
+      elsif type == Array
+        @iterate = :each_array
       else
         @iterate = :each_instance
         @type    = type
@@ -66,6 +67,8 @@ module PostgreSQLCursor
     def each(&block)
       if @iterate == :each_row
         self.each_row(&block)
+      elsif @iterate == :each_array
+        self.each_array(&block)
       else
         self.each_instance(@type, &block)
       end
@@ -78,6 +81,19 @@ module PostgreSQLCursor
       end
     end
 
+    def each_array(&block)
+      old_iterate = @iterate
+      @iterate = :each_array
+      begin
+        rv = self.each_tuple do |row|
+          block.call(row)
+        end
+      ensure
+        @iterate = old_iterate
+      end
+      rv
+    end
+
     def each_instance(klass=nil, &block)
       klass ||= @type
       self.each_tuple do |row|
@@ -117,7 +133,7 @@ module PostgreSQLCursor
       has_do_while  = @options.has_key?(:while)
       @count        = 0
       @column_types = nil
-      @connection.transaction do
+      with_optional_transaction do
         begin
           open
           while (row = fetch) do
@@ -161,7 +177,8 @@ module PostgreSQLCursor
     # Public: Opens (actually, "declares") the cursor. Call this before fetching
     def open
       set_cursor_tuple_fraction
-      @cursor = @@cursor_seq += 1
+      #@cursor = Digest::MD5.hexdigest(@sql)
+      @cursor = SecureRandom.uuid.gsub("-","")
       hold = @options[:with_hold] ? 'with hold ' : ''
       @result = @connection.execute("declare cursor_#{@cursor} cursor #{hold}for #{@sql}")
       @block = []
@@ -182,7 +199,12 @@ module PostgreSQLCursor
     def fetch_block(block_size=nil)
       block_size ||= @block_size ||= @options.fetch(:block_size) { 1000 }
       @result = @connection.execute("fetch #{block_size} from cursor_#{@cursor}")
-      @block = @result.collect {|row| row } # Make our own
+
+      if @iterate == :each_array
+        @block = @result.each_row.collect {|row| row }
+      else
+        @block = @result.collect {|row| row }
+      end
     end
 
     # Public: Closes the cursor
@@ -190,6 +212,15 @@ module PostgreSQLCursor
       @connection.execute("close cursor_#{@cursor}")
     end
 
+    # Private: Open transaction unless with_hold option, specified
+    def with_optional_transaction
+      if @options[:with_hold]
+        yield
+      else
+        @connection.transaction { yield }
+      end
+    end
+
     # Private: Sets the PostgreSQL cursor_tuple_fraction value = 1.0 to assume all rows will be fetched
     # 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.

data/lib/postgresql_cursor/version.rb

@@ -1,3 +1,3 @@
 module PostgresqlCursor
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/test/test_postgresql_cursor.rb

@@ -31,6 +31,14 @@ class TestPostgresqlCursor < Minitest::Test
     assert_equal 1000, n
   end
 
+  def test_each_array
+    c = PostgreSQLCursor::Cursor.new("select * from products where id = 1")
+    c.each_array do |ary|
+      assert_equal Array, ary.class
+      assert_equal 1, ary[0].to_i
+    end
+  end
+
   def test_relation
     nn = 0
     Product.where("id>0").each_row {|r| nn += 1 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postgresql_cursor
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Allen Fair
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord