pg_conn 0.47.0 → 0.49.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f44c95a305b34572b5be9025a51b3cff362f08aaf3aa434c4e5b91d0676fb058
-  data.tar.gz: b8ef0db1095940087e8d08113f76cde7f245ca12a5c56fde5dd9863b85527fe6
+  metadata.gz: c017287998b7b7c473e0532c44ff8f209d322158c6ef79b97a462270cc1d10ef
+  data.tar.gz: 6939299127cda711bf3fd1c0c349737c9f943c026abc13885bb9e699ce6607b0
 SHA512:
-  metadata.gz: 80dd909eb3bdb1cdd8100a138c3707dd4a8e23ec975754eb24862464bd8a8013adbd95e455a9b2dd179298740c1bfbbf6b8ad44c33b07e79c95c2c4b81732b41
-  data.tar.gz: 5224dbafd555d6d05b62f9006aa4a731f9a9e6d434d7c4b8fd39a2a70e99e8ef2db97ef3db3fa5fe3e39c7ecccf032633f134b6845c5e5db58a8077ce9b6a2f2
+  metadata.gz: 01d12b622790f3310a94d1c5191d811a9fb481d488b55f6e00018fe704ec6a9916b67ad5998c15977bc21d29792be96b82f81bcfc90c06100f7af2b1df967d71
+  data.tar.gz: 80e0c6c6e7825c949c5f23d3c98e8bc49ddf0653bba13bf666b0816d0e2656b788ea37af52d9009914a961cb197035dbd4643a9ad65fd9c9ccf76b9c46088f63

data/lib/pg_conn/schema_methods.rb

@@ -116,6 +116,11 @@ module PgConn
       conn.tuples column_list_type_query(schema, relation)
     end
 
+    # Return type of the given column or nil if not found
+    def list_column_type(schema, relation = nil, column)
+      conn.tuples(column_list_type_query(schema, relation, column)).first&.last
+    end
+
     def exist_function(schema, function, signature)
       raise NotImplementedError
     end
@@ -203,7 +208,7 @@ module PgConn
     end
 
     def column_list_query(schema, relation)
-      relation_clause = relation ? "relname = '#{relation}'" : nil
+      relation_expr = relation ? "relname = '#{relation}'" : nil
       [
           %(
             select  '#{schema}' || '.' || c.relname || '.' || a.attname
@@ -212,12 +217,13 @@ module PgConn
             where   relnamespace::regnamespace::text = '#{schema}'
             and     a.attnum > 0
           ),
-          relation_clause
+          relation_expr
       ].compact.join(" and ")
     end
 
-    def column_list_type_query(schema, relation)
-      relation_clause = relation ? "relname = '#{relation}'" : nil
+    def column_list_type_query(schema, relation, column = nil)
+      column_expr = column && "a.attname = '#{column}'"
+      relation_expr = relation ? "relname = '#{relation}'" : nil
       [
           %(
             select  '#{schema}' || '.' || c.relname || '.' || a.attname as "column",
@@ -227,7 +233,8 @@ module PgConn
             where   relnamespace::regnamespace::text = '#{schema}'
             and     a.attnum > 0
           ),
-          relation_clause
+          column_expr,
+          relation_expr
       ].compact.join(" and ")
     end
   end

data/lib/pg_conn/version.rb

@@ -1,3 +1,3 @@
 module PgConn
-  VERSION = "0.47.0"
+  VERSION = "0.49.0"
 end

data/lib/pg_conn.rb

@@ -53,6 +53,10 @@ module PgConn
   # true/false, Time/Date/DateTime, and arrays. Other types may require
   # special handling
   #
+  # Arrays are quoted using the Array constructor (Array[...]) so the quoted
+  # string can't be used in 'VALUE in (LIST)' constructs, use #quote_values
+  # instead
+  #
   # 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 the value to either 'json' or 'jsonb'
@@ -94,6 +98,12 @@ module PgConn
     Literal.new values.map { |value| quote_value(value, **opts) }.join(", ")
   end
 
+  # Quote array as a row - '(value, value, ...)'
+  def self.quote_row(row, **opts) = quote_list(row, **opts)
+
+  # Quote values as a list of rows - '(value, value), (value, value), ...'
+  def self.quote_rows(rows, **opts) = rows.map { quote_list(_1, **opts) }.join(', ')
+
   # Quote an array of values as a tuple. The element types should be in the
   # same order as the array arguments. #quote_tuples is same as #quote_values
   # except the values may have different types (this makes no difference
@@ -113,7 +123,7 @@ module PgConn
     Literal.new tuples.map { |tuple| "(#{quote_tuple(tuple, **opts)})" }.join(", ")
   end
 
-  # Quote array elements as a comma separated list of values and enclosed en
+  # Quote array elements as a comma separated list of values and enclosed in
   # parenthesis. Eg. [1, 2] => "(1, 2)"
   def self.quote_list(array, **opts) = quote_tuples([array], **opts)
 
@@ -471,6 +481,8 @@ module PgConn
     def quote_identifiers(idents) = PgConn.quote_identifiers(idents)
     def quote_value(value, **opts) = PgConn.quote_value(value, json_type: self.default_json_type, **opts)
     def quote_values(values, **opts) = PgConn.quote_values(values, json_type: self.default_json_type, **opts)
+    def quote_row(row, **opts) = PgConn.quote_row(row, json_type: self.default_json_type, **opts)
+    def quote_rows(rows, **opts) = PgConn.quote_rows(rows, json_type: self.default_json_type, **opts)
     def quote_tuple(tuple, **opts) = PgConn.quote_tuple(tuple, json_type: self.default_json_type, **opts)
     def quote_tuples(tuples, **opts) = PgConn.quote_tuples(tuples, json_type: self.default_json_type, **opts)
 
@@ -645,7 +657,7 @@ module PgConn
 
     # Return a hash from column name (a Symbol) to field value. It is an error if
     # the query returns more than one record. It blows up if a column name is
-    # not a valid ruby symbol
+    # not a valid ruby symbol (eg. contains blanks)
     def record(*query)
       r = pg_exec(parse_query *query)
       check_1r(r)
@@ -755,7 +767,7 @@ module PgConn
       r.each_row { |row|
         key_value = row.delete_at(key_index)
         key_value = key_value.to_sym if symbol
-        !h.key?(key_value) or raise Error, "Duplicate key: #{key_value}"
+        !h.key?(key_value) or raise Error, "Duplicate key: #{key_value.inspect}"
         h[key_value] = (one ? row.first : row)
       }
       h
@@ -846,7 +858,7 @@ module PgConn
     # TODO
     #   insert(table, [fields], field-name-map, object|objects)
     #   field-name-map:
-    #     { database-column-name: object-method-name } # calls method on orbejt
+    #     { database-column-name: object-method-name } # calls method on object
     #
     def insert(*args, upsert: nil, **opts)
       # Normalize arguments

metadata

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