pg_conn 0.13.5 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e52454dd0c67763cbc1ea40cf63f17f7dfbf81eaf7b90aecf60f3874ac12ffd1
-  data.tar.gz: bf895b59d9d6ed78f407b2260e5156e700c6dba66bde36c68e470e8311c20593
+  metadata.gz: ca254f7c17749713f46f07448221683e5975c570407aff61ee440f82a37466ca
+  data.tar.gz: 86486e52477bbf36009d69f9322061077b5860582e4fc7ced67e2d88bad5ee0b
 SHA512:
-  metadata.gz: 69d9cc2e6a70fec98890b53381c294a51d6476c5e888f2d7eb4ed7b73268d216fa89423830c255a9b8ce9677a1bf3553eec1a793395801150d464863d3fe5d7b
-  data.tar.gz: 6939ecd7182397e23fcf2eb901627dc479a97c5aa6a80f0a90eacc6a3665763407236da8ae54f747c8ad3060f815796ca3588fdcc128bce448c0ceabc3fb805b
+  metadata.gz: b0981561372e9039eda5c8eb85948c63559e1875f4764dfaa3b32d52fa501b62522b2acde9a58036aa6978bb9b454cb66bec788e9d141dbc50b3ce5e14ee9941
+  data.tar.gz: 70a3927ceec9d61962002e301c817479e043878ec122ed1d265c9ed9372fb0abc744eaaf266e983b6352179f42e983752c030a12e878699c24b37fde8c6c663e

data/lib/pg_conn/version.rb

@@ -1,3 +1,3 @@
 module PgConn
-  VERSION = "0.13.5"
+  VERSION = "0.15.0"
 end

data/lib/pg_conn.rb

@@ -175,6 +175,9 @@ module PgConn
           end
 
       if @pg_connection && !using_existing_connection
+        # Set a dummy notice processor to avoid warnings on stderr
+        @pg_connection.set_notice_processor { |message| ; } # Intentionally a nop
+
         # Auto-convert to ruby types
         type_map = PG::BasicTypeMapForResults.new(@pg_connection) 
 
@@ -677,7 +680,9 @@ module PgConn
 
     def rollback() raise Rollback end
 
-    # True if a transaction is in progress
+    # True if a transaction is in progress. Note that this requires all
+    # transactions to be started using PgConn's transaction methods;
+    # transactions started using raw SQL are not registered
     def transaction?() !@savepoints.nil? end
 
     # Returns number of transaction or savepoint levels
@@ -695,18 +700,21 @@ module PgConn
       end
     end
 
-    def pop_transaction(commit: true)
-      transaction? or raise Error, "No transaction in progress"
-      if savepoint = @savepoints.pop
-        if !commit
-          pg_exec("rollback to savepoint #{savepoint}")
-          pg_exec("release savepoint #{savepoint}")
+    def pop_transaction(commit: true, fail: true)
+      if transaction?
+        if savepoint = @savepoints.pop
+          if !commit
+            pg_exec("rollback to savepoint #{savepoint}")
+            pg_exec("release savepoint #{savepoint}")
+          else
+            pg_exec("release savepoint #{savepoint}")
+          end
         else
-          pg_exec("release savepoint #{savepoint}")
+          @savepoints = nil
+          pg_exec(commit ? "commit" : "rollback")
         end
       else
-        @savepoints = nil
-        pg_exec(commit ? "commit" : "rollback")
+        fail and raise Error, "No transaction in progress"
       end
     end
 
@@ -715,7 +723,7 @@ module PgConn
     # invalid and the server is in an invalid state
     #
     # It is not an error to call #cancel_transaction when no transaction is in
-    # progress
+    # progress, the method always succeeds
     def cancel_transaction
       begin
         pg_exec("rollback")
@@ -724,25 +732,34 @@ module PgConn
       @savepoints = nil
     end
 
-    # Execute block within a transaction and return the result of the block.
-    # The transaction can be rolled back by raising a PgConn::Rollback
-    # exception in which case #transaction returns nil. Note that the
-    # transaction timestamp is set to the start of the first transaction even
-    # if transactions are nested
+    # Start a transaction. If called with a block, the block is executed within
+    # a transaction that is auto-committed if the commit option is true (the
+    # default). #transaction returns the result of the block or nil if no block
+    # was given
+    #
+    # The transaction can be rolled back inside the block by raising a
+    # PgConn::Rollback exception in which case #transaction returns nil. Note
+    # that the transaction timestamp is set to the start of the first
+    # transaction even if transactions are nested
     def transaction(commit: true, &block)
-      result = nil
-      begin
+      if block_given?
+        result = nil
+        begin
+          push_transaction
+          result = yield
+        rescue PgConn::Rollback
+          pop_transaction(commit: false)
+          return nil
+        rescue PG::Error
+          @savepoints = nil
+          raise
+        end
+        pop_transaction(commit: commit)
+        result
+      else
         push_transaction
-        result = yield
-      rescue PgConn::Rollback
-        pop_transaction(commit: false)
-        return nil
-      rescue PG::Error
-        @savepoints = nil
-        raise
+        nil
       end
-      pop_transaction(commit: commit)
-      result
     end
 
   private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_conn
 version: !ruby/object:Gem::Version
-  version: 0.13.5
+  version: 0.15.0
 platform: ruby
 authors:
 - Claus Rasmussen