pg_conn 0.55.0 → 0.56.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7a478850b588c635e78fd50cac46e52665ece96fc538eb467eb2bf88fe6d6d7
-  data.tar.gz: 8882d70f0289f8b3cdec8c9e3135513788eb09416a0ceb5ad763849f71324d95
+  metadata.gz: 071d157c556ff70c14231ebf8dc42e86acb85fdda7cf1c99ec1e3188f7d2c339
+  data.tar.gz: 23ac40bccd0bfc8e535414ff104d998aa257a879ae52164b5aedf6c421bbb4a8
 SHA512:
-  metadata.gz: 5c3709874689cbfadf194fde8e4dd1d956ab0456ab205fd70064b680aa5dcebc161e11e5f3441237f502bf2c4df7cafa5a9a9b6608df42cd21ddc75848062c64
-  data.tar.gz: b791c4afaefddc8286abf836abdbb6e92657bb5139bc377be032f174a6d2888dc774c8f8fd3c8643c6ca9f98f920d3f747d3163380c2fa85569a373ac30e45f0
+  metadata.gz: 7f8b56cc58d3e721b5bd2cf3efd88d4b478d6900e3654a311f5b0f99ab85c341ddcd406ac694c2d307c0a93e789fcfb0f458934e58cd6810267cee5e68fc5a6a
+  data.tar.gz: 32d1e368f8a02e3bd33a15cdb1d29b7dc55f8d3a96ccda39eef51ff737112945bcba3320a03b74b5045423f075e3fecdef89131b8338a1fd5104f5d1ba2696af

data/lib/pg_conn/version.rb

@@ -1,3 +1,3 @@
 module PgConn
-  VERSION = "0.55.0"
+  VERSION = "0.56.0"
 end

data/lib/pg_conn.rb

@@ -206,8 +206,8 @@ module PgConn
     def logger() = @logger
 
     # Controls error messages. It can be assigned true, false, nil, or a Proc
-    # object that recieves the message. True causes the message to be printed
-    # to standard error, false ignores it, and nil resets the state to the
+    # object that recieves the message. True causes the message to be ignored,
+    # false prints it to standard error, and nil resets the state to the
     # default given when the connection was initialized. #silent? returns true
     # if #silent is false or a Proc object and should be used instead #silent
     # to check the state because #silent returns truish when output is
@@ -1066,6 +1066,66 @@ module PgConn
       end
     end
 
+    # Execute SQL og pgsql file. The file must be pure SQL or pgsql statements,
+    # not psql meta commands. Any output from the file is ignored
+    def sqlexec(file, **opts)
+      source = IO.read(file) or error "Can't read #{file}"
+      exec(source, **opts)
+    end
+
+    # Execute file using psql(1) so that special psql meta commands (eg. \gset)
+    # can be used. Return the output from the SQL file. The file is executed
+    # with ON_ERROR_STOP on
+    def psqlexec(file, fail: true, silent: self.silent)
+      begin
+        output, errors, status = Open3.capture3 %(
+            psql -U #{username} -d #{database} --no-psqlrc -c '\\set ON_ERROR_STOP on' -f #{file}
+        )
+
+        status.success? or raise PG::Error.new(errors)
+
+        output
+
+      rescue PG::Error => ex
+        if @error.nil?
+          @error = ex
+          @err = nil
+        end
+
+        # Process message
+        if !silent
+          $stderr.puts errors
+        end
+
+#       puts "-------------------"
+#       puts "ERRORS"
+#       puts errors
+#       puts "OUTPUT"
+#       puts output
+#       puts "EXCEPTION"
+#       puts ex.message
+#       puts "-------------------"
+#
+#       if @error.message =~ /^\S* (ERROR.*)/
+#         puts "BING #{silent}"
+#         message = $1
+#         puts "MESSAGE: #{message}"
+#         saved_silent = self.silent
+#         self.silent = silent
+#         message_processor(message, file)
+#         self.silent = saved_silent
+#       elsif !silent
+#         puts "BANG"
+#         $stderr.puts errors
+#       else
+#         puts "NOTHING"
+#       end
+
+        raise if fail
+        nil
+      end
+    end
+
     # Execute block with the given set of global or local options and reset
     # them afterwards
     #
@@ -1542,11 +1602,12 @@ module PgConn
             @err = nil
           end
 
-          # Process message before resetting silent state
+          # Process message
           message_processor(@error.message, arg)
-          self.silent = saved_silent
 
           raise
+        ensure
+          self.silent = saved_silent
         end
 
       # For dump of SQL statements

metadata

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