pg_conn 0.48.0 → 0.50.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac85240194097f71a6470b24774539bb3bbffbdb557aa759cc1b8bf8b1a895d3
-  data.tar.gz: 440bbbbc3ef6e0d70fd8139880c15c00b214c40074d0c666e35d589a5bc9ccc0
+  metadata.gz: 7d4a247037db05fc559956f4fd4e293c4dc2fe76c57be33aed61aed6e73918d0
+  data.tar.gz: af4650f527a0866ea9b0d09e63de11ab8b666bc01e3eb2d178e6283e8ecbac9a
 SHA512:
-  metadata.gz: 6e9828f025e235f6bf464d8485898540f13e13d1a55564fdd558f93e4ccc125a494627138fc483e3d3eff27044da3b993baf8df84ede598357f13907020e8ce4
-  data.tar.gz: 3630906909fffe1b9d8310a51777307abf587726c24a577ff5777735696927f537de077c0b3ddfdc7e31fd35cd8216a2c37b4c082bdbf34ad683ab21e310dfe1
+  metadata.gz: c26a178586d36c17b2a14d1cd1090896abf9f576c574f3616d8555bcc82ce5b434e436145c0944b0729e044df2ecb22e7923a9206443fc14625c2d8628b5c367
+  data.tar.gz: 42404a7aeec08776c601fcd29fcb1b97f7ffeddb377b1940913082bc237ed3ae4ac1b75a44997e9ae140553420d78f54f76f3ae4dfc2272457ee62910b4aa031

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.48.0"
+  VERSION = "0.50.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'
@@ -653,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)
@@ -727,10 +731,10 @@ module PgConn
     # of the record. If the :key_column option is defined it will be used
     # instead of id as the key. It is an error if the id field value is not
     # unique
-    def set(query, key_column: :id)
+    def set(*query, key_column: :id)
       key_column = key_column.to_sym
       keys = {}
-      r = pg_exec(query)
+      r = pg_exec(parse_query *query)
       begin
         r.fnumber(key_column.to_s) # Check that key column exists
       rescue ArgumentError
@@ -750,8 +754,12 @@ module PgConn
     # If there is only one remaining field then that value is used instead of a
     # tuple. The optional +key+ argument sets the mapping field and the
     # +symbol+ option convert key to Symbol objects when true
+    #
+    # The query is a single-argument query expression (either a full SQL query
+    # string or the name of a table/view). TODO: Make key an option so we can
+    # use full query expressions
     def map(query, key = nil, symbol: false) # TODO Swap arguments
-      r = pg_exec(query)
+      r = pg_exec(parse_query query)
       begin
         key = (key || r.fname(0)).to_s
         key_index = r.fnumber(key.to_s)
@@ -763,7 +771,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
@@ -775,7 +783,7 @@ module PgConn
     # array of values if there is only one value field
     #
     def multimap(query, key = nil, symbol: false)
-      r = pg_exec(query)
+      r = pg_exec(parse_query query)
       begin
         key = (key || r.fname(0)).to_s
         key_index = r.fnumber(key.to_s)
@@ -854,7 +862,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.48.0
+  version: 0.50.0
 platform: ruby
 authors:
 - Claus Rasmussen