pg_conn 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 240a2b6bb03ef6c0ffa37ae12c2610e185c69b873ccebda32a6ef0bfd0626b06
-  data.tar.gz: 6fcf77b84a14ddf55640a8b359b5843a5fa565b2db849d649df856626220dec6
+  metadata.gz: 599ccb65823ae32d0a3baf96ba0d636104c7994f2473d71eafa1927228f47302
+  data.tar.gz: b08bb15804c363fb25c03e102f35de6f64694220b9865e5a9d0525516cc6db24
 SHA512:
-  metadata.gz: 8d14ccc934203b706bc32b65f2678cd2db9f1ed32b7b0268ad32d22a76d7255d66c0b9d5e3f639fe6553fe174817304519926d9f5d66861f8d9c7999e32d798a
-  data.tar.gz: 4d21fe7896ec5fa5b9d02e675265c68a4a1460658ddaf0508627c0430032f69dfef3608cf65c90b4cb8d1e13951f4ce871b74370fa5fc93bf9971ac737dcceba
+  metadata.gz: 1dba080845fa70f52f4b0614392be42169822809a6a436da49f3c8a2453614c5b9586927ee5abfa5546933d43370d691458fb0677b350a0c40d1257acd42b79b
+  data.tar.gz: 8cd9e0b2481ba760dd250a7e68bda460ddf38564843929143ca3622904484866818b75bad0bc9c8a9fbbacd8bd9980eaa53b8670f4e68d9f0f04886fe24f573c

data/lib/pg_conn/role_methods.rb

@@ -52,7 +52,7 @@ module PgConn
       conn.exec stmt
     end
 
-    # Remove all privileges from the given role
+    # Remove all privileges from the given role. TODO #demote!, strip! ?
     def clean(rolename)
     end
 
@@ -60,12 +60,18 @@ module PgConn
     # 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!
-    def drop(*rolenames, cascade: false, silent: false)
+    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)
-      conn.exec "drop owned by #{rolenames_sql} cascade" if cascade
-      conn.exec "drop role #{rolenames_sql}"
+      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
     end
 

data/lib/pg_conn/version.rb

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

data/lib/pg_conn.rb

@@ -70,7 +70,7 @@ module PgConn
     # element defaults to nil if not found
     def err
       @err ||=
-        if error&.message =~ /.*?ERROR:\s*(.*?)\n(?:.*?(\s*LINE\s+(\d+):\s*).*?\n(?:(\s+)\^\n)?)?/
+        if error&.message =~ /.*?ERROR:\s*(.*?)\n(?:.*?(\s*LINE\s+(\d+): ).*?\n(?:(\s+)\^\n)?)?/
           [$1.capitalize, $3&.to_i, $4 && ($4.size - $2.size + 1)]
         else
           [nil, nil, nil]
@@ -520,6 +520,19 @@ module PgConn
       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
+    # 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
+        return false
+      end
+      return true
+    end
+
     # Execute SQL statement(s) without a transaction block and return the
     # number of affected records (if any). This used to call procedures that
     # may manipulate transactions. The +sql+ argument can be a SQL command or
@@ -660,7 +673,7 @@ 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.
+    # 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
     #
     # FIXME: Error message prints the last statement but what if another
@@ -683,6 +696,7 @@ module PgConn
           else
             stmts = arg.flatten.compact
             return nil if stmts.empty?
+#           stmts.unshift("set on_error_exit stop")
             last_stmt = stmts.last
             @pg_connection.exec(stmts.join(";\n"))
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_conn
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-21 00:00:00.000000000 Z
+date: 2024-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg