pg_conn 0.35.1 → 0.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c834402fcec956ffcb288fa201d7a6bade6b435002ae4758e1d86ea54f5a656
-  data.tar.gz: 20fafcbbe4c9f93ab426c6012e91f073e5224ab84d23948da894f4a64b5ef7c9
+  metadata.gz: 3d6940809a3f62bfad5cd2a94566a76bcd1944ad5b6ded6df2be159a010b2169
+  data.tar.gz: 6f213cb288ba5a85205fd5054fb498e6200b0319eee8c2bbc8c60515705410f7
 SHA512:
-  metadata.gz: 1da57a0c7f8daffdaac879899d3bd7d9723a6512e038afda6996329717d9b0246f7b646161ee1f0a82e00d828a12b9328f212ef98b47132914e4c66dc9f1e888
-  data.tar.gz: 4fd13dd8b4130ebb417379dd3ec62a3476f7d721a7617d14ae2f5b88a0c1f13812dbd440931bc14c02c3db702f9ff181a8b4ab3116a08527293ae6b632c9cd0b
+  metadata.gz: a90dab6c75eb2cfd7a99b39676a4aa0dc167462e37e9229d96ed30517b4ff0c691f6b4389ceb6d26c3f2562d7ce4e7dd2be17d054f1e61369989fb9f8c3db8e1
+  data.tar.gz: f91893227ef9697eb236051728d509727b2d20b5d9efd7c6f848cf2e887b1abc0e5c8a48da291914372049ab25aee6580b9b74fd422d269c3e7813928032dd23

data/lib/pg_conn/version.rb

@@ -1,3 +1,3 @@
 module PgConn
-  VERSION = "0.35.1"
+  VERSION = "0.36.0"
 end

data/lib/pg_conn.rb

@@ -40,13 +40,13 @@ module PgConn
   #
   def self.quote_identifier(s)
     s = s.to_s if s.is_a?(Symbol)
-    escape_identifier(s).gsub(/\./, '"."').sub(/"\*"/, "*")
+    Literal.new escape_identifier(s).gsub(/\./, '"."').sub(/"\*"/, "*")
   end
 
   # Quote identifiers and concatenate them using ',' as separator
-  def self.quote_identifiers(idents) = idents.map { |ident| quote_identifier(ident) }.join(", ")
+  def self.quote_identifiers(idents) = Literal.new idents.map { |ident| quote_identifier(ident) }.join(", ")
 
-  # Quote the value as a string. Emit 'null' if value is nil
+  # Quote the value as a string. Returns a Literal object
   #
   # The value can be of any type but is converted to a string using #to_s
   # before quoting. This works by default for the regular types Integer,
@@ -55,7 +55,7 @@ module PgConn
   #
   # Hashes are quoted as a literal JSON expression converted into the given
   # :json_type. If :json_type is nil, it is the application's responsibility to
-  # cast them to either 'json' or 'jsonb'
+  # cast the value to either 'json' or 'jsonb'
   #
   # Note that a tuple value (an array) must be quoted using #quote_tuple
   # because #quote_value would quote the tuple as an array value instead of a
@@ -67,30 +67,31 @@ module PgConn
   # is guaranteed to be non-empty. Nested arrays are not supported
   #
   def self.quote_value(value, elem_type: nil, json_type: nil)
-    case value
-      when Literal; value
-      when String; escape_literal(value)
-      when Integer, Float; value.to_s
-      when true, false; value.to_s
-      when nil; 'null'
-      when Date, DateTime; "'#{value}'"
-      when Time; "'#{value.strftime("%FT%T%:z")}'"
-      when Array
-        if value.empty?
-          elem_type or raise Error, "Empty array without elem_type"
-          "array[]::#{elem_type}[]"
+    Literal.new \
+        case value
+          when Literal; value
+          when String; escape_literal(value)
+          when Integer, Float; value.to_s
+          when true, false; value.to_s
+          when nil; 'null'
+          when Date, DateTime; "'#{value}'"
+          when Time; "'#{value.strftime("%FT%T%:z")}'"
+          when Array
+            if value.empty?
+              elem_type or raise Error, "Empty array without elem_type"
+              "array[]::#{elem_type}[]"
+            else
+              "array[#{value.map { |elem| quote_value(elem) }.join(', ')}]"
+            end
+          when Hash; ["'#{value.to_json}'", json_type].compact.join('::')
         else
-          "array[#{value.map { |elem| quote_value(elem) }.join(', ')}]"
+          escape_literal(value.to_s)
         end
-      when Hash; ["'#{value.to_json}'", json_type].compact.join('::')
-    else
-      escape_literal(value.to_s)
-    end
   end
 
   # Quote values and concatenate them using ',' as separator
   def self.quote_values(values, **opts)
-    values.map { |value| quote_value(value, **opts) }.join(", ")
+    Literal.new values.map { |value| quote_value(value, **opts) }.join(", ")
   end
 
   # Quote an array of values as a tuple. The element types should be in the
@@ -101,7 +102,7 @@ module PgConn
   # Note that it is :elem_types (plural) and not :elem_type
   def self.quote_tuple(tuple, elem_types: nil, **opts)
     elem_types = Array(elem_types)
-    tuple.map { |value|
+    Literal.new tuple.map { |value|
       elem_type = value.is_a?(Array) ? elem_types&.shift : nil
       quote_value(value, **opts, elem_type: elem_type)
     }.join(", ")
@@ -109,7 +110,7 @@ module PgConn
 
   # Quote an array of tuples
   def self.quote_tuples(tuples, **opts)
-    tuples.map { |tuple| "(#{quote_tuple(tuple, **opts)})" }.join(", ")
+    Literal.new tuples.map { |tuple| "(#{quote_tuple(tuple, **opts)})" }.join(", ")
   end
 
   # Used to mark strings as literals that should not be quoted. This is the
@@ -429,8 +430,7 @@ module PgConn
       end
     end
 
-    # Mark argument as already being quoted. TODO: Make this the default in all
-    # quote methods
+    # Mark string argument as already being quoted
     def literal(arg) Literal.new(arg) end
 
     # Connection member method variations of the PgConn quote class methods
@@ -1155,17 +1155,16 @@ module PgConn
     end
 
     # Common implementation for #quote_record and #quote_records that avoids
-    # querying the database multiple times or duplication the code. The :array
-    # flag is true when called via #quote_records
+    # querying the database multiple times or duplication the code
     #
     # @data can be a Hash, Array, or OpenStruct. Hash keys must be symbols or
     # strings, they belong to the same namespace so :k and "k" refer to the
-    # same value
+    # same value. The :array flag is true when called via #quote_records
     #
     # Note that #quote_record_impl queries the database for information about
     # the type. TODO Cache this information?
-    def quote_record_impl(
-        datas, schema_name = nil, type, elem_types: nil, array: nil, **opts)
+    #
+    def quote_record_impl(datas, schema_name = nil, type, elem_types: nil, array: nil, **opts)
       datas = [datas] if !array
 
       pg_type = [schema_name, type].compact.join('.')
@@ -1192,10 +1191,9 @@ module PgConn
       }
 
       if array
-    #   papg_type(table, where_clause, fields...)
-        "array[#{literals.join(', ')}]::#{pg_type}[]"
+        Literal.new "array[#{literals.join(', ')}]::#{pg_type}[]"
       else
-        literals.first
+        Literal.new literals.first
       end
     end
 
@@ -1235,7 +1233,7 @@ module PgConn
     end
 
     STDOUT_PRODUCER = lambda { |msg| $stdout.puts msg }
-    STDERR_PRODUCER = lambda { |msg| $stderr.puts msg }
+    STDERR_PRODUCER = lambda { |msg| $stderr.puts msg; $stderr.flush }
     ERROR_PRODUCER = lambda { |msg, stmt| $stderr.puts stmt, nil, msg; $stderr.flush }
 
     # Map from message level to default producer. Note that we rely on the key

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_conn
 version: !ruby/object:Gem::Version
-  version: 0.35.1
+  version: 0.36.0
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-03-18 00:00:00.000000000 Z
+date: 2025-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg