pg_conn 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 599ccb65823ae32d0a3baf96ba0d636104c7994f2473d71eafa1927228f47302
-  data.tar.gz: b08bb15804c363fb25c03e102f35de6f64694220b9865e5a9d0525516cc6db24
+  metadata.gz: 17a782e74c71e670d14ed38e258f7b9c99ee1e832866dd9fa972774b1a21d08c
+  data.tar.gz: 226ad145da3b41360080a255bb90b65c4a4bbd2ac1fef8bdc2f2e43bed9feab6
 SHA512:
-  metadata.gz: 1dba080845fa70f52f4b0614392be42169822809a6a436da49f3c8a2453614c5b9586927ee5abfa5546933d43370d691458fb0677b350a0c40d1257acd42b79b
-  data.tar.gz: 8cd9e0b2481ba760dd250a7e68bda460ddf38564843929143ca3622904484866818b75bad0bc9c8a9fbbacd8bd9980eaa53b8670f4e68d9f0f04886fe24f573c
+  metadata.gz: c15ad10570d71104ac356f2f0da9a1e034cf400356357621300db3af872a73282a233c0a4258dc2bcc98ac2353143a768c1632f59439812965e4b00b41fc62be
+  data.tar.gz: eec1060c95e94fbb8f59fe56fb233d95dd4d111a6980947dbc8e609788f6b3652f01d9befe9d5af053b224fa1ff661b93fc53d77001ee14593fdfdea985104a4

data/lib/pg_conn/role_methods.rb

@@ -57,22 +57,26 @@ module PgConn
     end
 
     # Drop existing users. Return true if any role was dropped. Drop depending
-    # privileges and objects too if :cascade is true. Note that cascade only
-    # works if connected to the database where the privileges exist. The
-    # :silent option is used in tests - fix it somehow!
+    # privileges and objects too if :cascade is true. Returns true if the
+    # user(s) was deleted and false if :fail is true and one or more user
+    # counldn't be deleted
+    #
+    # Note that cascade only works if connected to the database where the
+    # privileges exist. 
+    #
+    # TODO The :silent option is used in tests - fix it somehow!
     def drop(*rolenames, cascade: false, fail: true, silent: false)
       rolenames = Array(rolenames).flatten.compact.select { |role| exist?(role) }
       return false if rolenames.empty?
       rolenames_sql = PgConn.sql_idents(rolenames)
-      begin
-        conn.exec("drop owned by #{rolenames_sql} cascade", fail: false, silent: silent) if cascade
-        conn.exec("drop role #{rolenames_sql}", fail: fail, silent: silent)
-      rescue PG::Error
-        raise if fail
-        conn.cancel_transaction
-        return false
-      end
-      true
+#     begin
+      conn.exec("drop owned by #{rolenames_sql} cascade", fail: false, silent: silent) if cascade
+      conn.exec("drop role #{rolenames_sql}", fail: fail, silent: silent) && true
+#     rescue PG::Error
+#       raise if fail
+#       conn.cancel_transaction
+#       return false
+#     end
     end
 
     # List users. TODO Use RE instead of database argument. Also doc this shit

data/lib/pg_conn/version.rb

@@ -1,3 +1,3 @@
 module PgConn
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

data/lib/pg_conn.rb

@@ -509,15 +509,23 @@ module PgConn
     # that span multiple lines. The empty array is a NOP but the empty string
     # is not.
     #
-    # #exec pass Postgres exceptions to the caller unless :fail is false. If
-    # fail is false #exec instead return nil but note that postgres doesn't
-    # ignore it so that if you're inside a transaction, the transaction will be
-    # in an error state and if you're also using subtransactions the whole
+    # #exec pass Postgres exceptions to the caller unless :fail is false in which case
+    # it returns nil. 
+    #
+    # Note that postgres crashes the whole transaction stack if any error is
+    # met so if you're inside a transaction, the transaction will be in an
+    # error state and if you're also using subtransactions the whole
     # transaction stack has collapsed
     #
     # TODO: Make sure the transaction stack is emptied on postgres errors
     def exec(sql, commit: true, fail: true, silent: false)
-      transaction(commit: commit) { execute(sql, fail: fail, silent: silent) }
+      begin
+        transaction(commit: commit) { execute(sql, fail: fail, silent: silent) }
+      rescue PG::Error
+        raise if fail
+        cancel_transaction
+        return nil
+      end
     end
 
     # Like #exec but returns true/false depending on if the command succeeded.
@@ -528,6 +536,7 @@ module PgConn
       begin
         exec(sql, commit: commit, fail: true, silent: silent)
       rescue PG::Error
+        cancel_transaction
         return false
       end
       return true
@@ -543,9 +552,14 @@ module PgConn
     # TODO: Handle postgres exceptions wrt transaction state and stack
     def execute(sql, fail: true, silent: false)
       if @pg_connection
-        pg_exec(sql, fail: fail, silent: silent)&.cmd_tuples
+        begin
+          pg_exec(sql, silent: silent)&.cmd_tuples
+        rescue PG::Error
+          raise if fail
+          return nil
+        end
       else
-        pg_exec(sql, fail: fail, silent: silent)
+        pg_exec(sql, silent: silent)
       end
     end
 
@@ -611,10 +625,16 @@ module PgConn
     end
 
     # Does a rollback and empties the stack. This should be called in response
-    # to PG::Error exceptions because then the whole transaction stack is
-    # invalid
+    # to PG::Error exceptions because the whole transaction stack is
+    # invalid and the server is in an invalid state
+    #
+    # It is not an error to call #cancel_transaction when no transaction is in
+    # progress
     def cancel_transaction
-      pg_exec("rollback")
+      begin
+        pg_exec("rollback")
+      rescue PG::Error
+      end
       @savepoints = nil
     end
 
@@ -631,7 +651,9 @@ module PgConn
       rescue PgConn::Rollback
         pop_transaction(commit: false)
         return nil
-      # FIXME: Rescue other postgres errors and wipe-out stack
+      rescue PG::Error
+        @savepoints = nil
+        raise
       end
       pop_transaction(commit: commit)
       result
@@ -640,7 +662,6 @@ module PgConn
   private
     # Wrapper around PG::Connection.new that switches to the postgres user
     # before connecting if the current user is the root user
-    #
     def make_connection(*args, **opts)
       if Process.euid == 0
         begin
@@ -673,8 +694,10 @@ module PgConn
     #
     # Execute statement(s) on the server. If the argument is an array of
     # commands, the commands are concatenated with ';' before being sent to the
-    # server. #pg_exec returns a PG::Result object or nil if +arg+ was empty.
-    # #exec pass Postgres exceptions to the caller unless :fail is false
+    # server. #pg_exec returns a PG::Result object or nil if +arg+ was empty
+    #
+    # Postgres errors are passed through and #error and #err set to the last
+    # statement's SQL errors or nil if it succeeded
     #
     # FIXME: Error message prints the last statement but what if another
     # statement failed?
@@ -684,7 +707,7 @@ module PgConn
     # though
     #
     # TODO: Fix silent by not handling exceptions
-    def pg_exec(arg, fail: true, silent: false)
+    def pg_exec(arg, silent: false)
       if @pg_connection
         @error = @err = nil
         begin
@@ -703,19 +726,16 @@ module PgConn
           
         rescue PG::Error => ex
           @error = ex
-          if fail
-            if !silent # FIXME Why do we handle this? 
-              $stderr.puts arg
-              $stderr.puts
-              $stderr.puts ex.message
-              $stderr.flush
-            end
-            raise
-          else
-            return nil
+          if !silent # FIXME Why do we handle this? 
+            $stderr.puts arg
+            $stderr.puts
+            $stderr.puts ex.message
+            $stderr.flush
           end
+          raise
         end
 
+      # For dump of SQL statements
       else # @pg_commands is defined
         if arg.is_a?(String)
           @pg_commands << arg if arg != ""

metadata

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