pg_conn 0.14.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d29017a92f97bb843ada8a10d00ab0a130e0e572e9775f21ddacb9f6d9ca4e66
-  data.tar.gz: e56a31694ec01c3ef15ae35b1f5a28304dad179a918c69a687e08fb267f1b30e
+  metadata.gz: 5ebb0df0000ecb59d313c906b608bdd267aaef84edcb4be633650601c453768b
+  data.tar.gz: 96d5e1db6d3644fef73dbb69f50acd7deec6dc79404641615d034586d1fddcf0
 SHA512:
-  metadata.gz: a920f75a6d118bdc44e5442adbe38e6ecbc6872ac010f3c29390a25db4e95605541d4bc1dd67a0f7ac1332611119d983211aaff1acda885aca07ed1a464705a7
-  data.tar.gz: 4339f922abbdeb6db692a8906a5c5fea4aa21a645be69df90a39473cc2453c9f79c684b8b2e69996a343cc368dcaeaecc960154dbcc78003ec230bd3605363ad
+  metadata.gz: 1cba9680627ce4ba4c5b8aa3df5505ab407e6096c26560799680a340640cef3b6a107319c58c1230ee130f1811d569367f8819d81f1be957069703b03d0bbb8b
+  data.tar.gz: 4c578bd594f740f9b07d288a1ae37de9d54cee7009da5f4d493a58ed324821cd4258ebce916ddfd68527e773c4396cd866da8054d4558d31c95962c6fd9ce9d1

data/lib/pg_conn/version.rb

@@ -1,3 +1,3 @@
 module PgConn
-  VERSION = "0.14.0"
+  VERSION = "0.15.1"
 end

data/lib/pg_conn.rb

@@ -67,7 +67,10 @@ module PgConn
     # #exec or #transaction block
     attr_reader :timestamp
 
-    # PG::Error object if the last statement failed; otherwise nil
+    # PG::Error object of the first failed statement in the transaction;
+    # otherwise nil. It is cleared at the beginning of a transaction so be sure
+    # to save it before you run any cleanup code that may initiate new
+    # transactions
     attr_reader :error
 
     # Tuple of error message, lineno, and charno of the error object where each
@@ -607,24 +610,17 @@ module PgConn
     #
     # TODO: Make sure the transaction stack is emptied on postgres errors
     def exec(sql, commit: true, fail: true, silent: false)
-      begin
-        transaction(commit: commit) { execute(sql, fail: fail, silent: silent) }
-      rescue PG::Error
-        raise if fail
-        cancel_transaction
-        return nil
-      end
+      transaction(commit: commit) { execute(sql, fail: fail, silent: silent) }
     end
 
     # Like #exec but returns true/false depending on if the command succeeded.
-    # There is not corresponding #exeucte? method because any failure rolls
+    # There is not a corresponding #execute? method because any failure rolls
     # back the whole transaction stack. TODO: Check which exceptions that
     # should be captured
     def exec?(sql, commit: true, silent: true) 
       begin
         exec(sql, commit: commit, fail: true, silent: silent)
       rescue PG::Error
-        cancel_transaction
         return false
       end
       return true
@@ -643,6 +639,7 @@ module PgConn
         begin
           pg_exec(sql, silent: silent)&.cmd_tuples
         rescue PG::Error
+          cancel_transaction
           raise if fail
           return nil
         end
@@ -672,7 +669,7 @@ module PgConn
 
     def commit()
       if transaction?
-        pop_transaction
+        pop_transaction(fail: false)
       else
         pg_exec("commit")
       end
@@ -680,11 +677,18 @@ module PgConn
 
     def rollback() raise Rollback end
 
-    # 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
+    # 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
 
+    # True if a database transaction is in progress
+    def database_transaction?
+      pg_exec("select transaction_timestamp() != statement_timestamp()", fail: false)
+    end
+
     # Returns number of transaction or savepoint levels
     def transactions() @savepoints ? 1 + @savepoints.size : 0 end
 
@@ -696,22 +700,26 @@ module PgConn
       else
         @savepoints = []
         pg_exec("begin")
+        @error = @err = nil
         @timestamp = pg_exec("select current_timestamp").values[0][0] if @pg_connection
       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, exception: 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
 
@@ -725,8 +733,10 @@ module PgConn
       begin
         pg_exec("rollback")
       rescue PG::Error
+        ;
       end
       @savepoints = nil
+      true
     end
 
     # Start a transaction. If called with a block, the block is executed within
@@ -745,13 +755,14 @@ module PgConn
           push_transaction
           result = yield
         rescue PgConn::Rollback
-          pop_transaction(commit: false)
+          pop_transaction(commit: false, fail: false)
           return nil
         rescue PG::Error
+          cancel_transaction
           @savepoints = nil
           raise
         end
-        pop_transaction(commit: commit)
+        pop_transaction(commit: commit, fail: false)
         result
       else
         push_transaction
@@ -809,7 +820,6 @@ module PgConn
     # TODO: Fix silent by not handling exceptions
     def pg_exec(arg, silent: false)
       if @pg_connection
-        @error = @err = nil
         begin
           last_stmt = nil # To make the current SQL statement visible to the rescue clause. FIXME Not used?
           if arg.is_a?(String)
@@ -823,9 +833,11 @@ module PgConn
             last_stmt = stmts.last
             @pg_connection.exec(stmts.join(";\n"))
           end
-          
         rescue PG::Error => ex
-          @error = ex
+          if @error.nil?
+            @error = ex
+            @err = nil
+          end
           if !silent # FIXME Why do we handle this? 
             $stderr.puts arg
             $stderr.puts

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_conn
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.1
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-11 00:00:00.000000000 Z
+date: 2024-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg