pg_conn 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 515c790d7c2850a3d679f3b56601a8cd7311eeeb7c8875f23e7e24a9b1d3389a
-  data.tar.gz: '08b7e60560b80649d613e7469c7d544b136c5cff789d9f107eeb83a56e4449ff'
+  metadata.gz: 240a2b6bb03ef6c0ffa37ae12c2610e185c69b873ccebda32a6ef0bfd0626b06
+  data.tar.gz: 6fcf77b84a14ddf55640a8b359b5843a5fa565b2db849d649df856626220dec6
 SHA512:
-  metadata.gz: aee7f2323e2bd7cb4893780210161c7839dd985e33dec5d1c93b6318c4f3c03494ef2108031fe0aff0e83352c94bb6c5a421830ac7e8972cd23d830159a61f08
-  data.tar.gz: c4ad3b31c34a19ce3c697ab9cdb318f9aee9752c7eb3bc598588da48923d488908b26c324fd29cf6381d60d08e249920a99671324b84434776fbdedeb85ad5f1
+  metadata.gz: 8d14ccc934203b706bc32b65f2678cd2db9f1ed32b7b0268ad32d22a76d7255d66c0b9d5e3f639fe6553fe174817304519926d9f5d66861f8d9c7999e32d798a
+  data.tar.gz: 4d21fe7896ec5fa5b9d02e675265c68a4a1460658ddaf0508627c0430032f69dfef3608cf65c90b4cb8d1e13951f4ce871b74370fa5fc93bf9971ac737dcceba

data/lib/pg_conn/version.rb

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

data/lib/pg_conn.rb

@@ -64,20 +64,31 @@ module PgConn
     attr_reader :timestamp
 
     # PG::Error object if the last statement failed; otherwise nil
-    attr_reader :err
+    attr_reader :error
+
+    # Tuple of error message, lineno, and charno of the error object where each
+    # element defaults to nil if not found
+    def err
+      @err ||=
+        if error&.message =~ /.*?ERROR:\s*(.*?)\n(?:.*?(\s*LINE\s+(\d+):\s*).*?\n(?:(\s+)\^\n)?)?/
+          [$1.capitalize, $3&.to_i, $4 && ($4.size - $2.size + 1)]
+        else
+          [nil, nil, nil]
+        end
+    end
 
     # Last error message. The error message is the first line of the PG error
     # message that may contain additional info. It doesn't contain a
     # terminating newline
-    def errmsg = err&.message =~ /^ERROR:\s*(.*?)\n/m && $1.capitalize
+    def errmsg = err[0]
 
-    # The one-based line number of the last PG::Error or nil if absent in the
+    # The one-based line number of the last error or nil if absent in the
     # Postgres error message
-    def errline = err&.message =~ /\n\s*LINE\s+(\d+):/m && $1.to_i
+    def errline = err[1]
 
     # The one-based character number of the error in the last PG::Error or nil
     # if absent in the Postgres error message
-    def errchar = err&.message =~ /\n(\s*LINE\s+\d+: ).*?\n(\s+)\^\n/m && ($2.size - $1.size + 1)
+    def errchar = err[2]
 
     # :call-seq:
     #     initialize(dbname = nil, user = nil, field_name_class: Symbol)
@@ -662,7 +673,7 @@ module PgConn
     # TODO: Fix silent by not handling exceptions
     def pg_exec(arg, fail: true, silent: false)
       if @pg_connection
-        @err = nil
+        @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)
@@ -677,7 +688,7 @@ module PgConn
           end
           
         rescue PG::Error => ex
-          @err = ex
+          @error = ex
           if fail
             if !silent # FIXME Why do we handle this? 
               $stderr.puts arg

metadata

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