pg_conn 0.23.0 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7de75668042e3abdc5b983e0b9a3f6c909ff69aeed2f22c632d1c693f3baac0
-  data.tar.gz: 90cecbdd79e6478d7f6bd1bc3ae042917bc2683771c89de61aab6c05fa2e5279
+  metadata.gz: eb9303d38e0364b374379d8d0549d461decf393d1a20c5a97da42b1c0b0d7e17
+  data.tar.gz: 53512feaaff24b3b6e8b7366a0c860dac0d38f8880698570cfa16cffbb7a46b2
 SHA512:
-  metadata.gz: 76b775138260668bf75e5bc31e220561f665dffc901349a9ec875e7ec594dee2750e0d979bde80e9045e38e44a3894fe55c2be37faefbe7f35173812cea2a22a
-  data.tar.gz: f0e2e9169cd734814cce4e8b73f7ec017cf3fd9a2622290c4acbf06620ddb3b943957ab5dab527ee0e29a9d71ad4efb511f4f219543ca86301d9fd5c4f5838ad
+  metadata.gz: b9efb0689c559425bee8bebb5d984c72222e8bd2377803cc8c1415d5b253ada2f0913dc70b17ef12c0f9677b26e1db60accb5bdb66de41220f7001a2628c013c
+  data.tar.gz: fcd4f4e04157e2cdf10226f1a4545ab8fd66ce960cf14c732e0eceda9450e3c94b211277da303e8338aff7fbfbb3eb09bcd6b5946e979aa383f5f3b803ac86d7

data/TODO

@@ -1,4 +1,20 @@
 TODO
+
+  o Instrumentation of connection object
+
+      # Augment conn object exec method to emit duration of the query
+      conn.define_singleton_method(:original_exec, conn.method(:exec))
+      conn.define_singleton_method(:exec) do |*args|
+        t0 = Time.now
+        r = original_exec(*args)
+        t1 = Time.now
+        @duration = ((t1 - t0) * 1000).round()
+        r
+      end
+      conn.define_singleton_method(:duration) do
+        @duration
+      end
+
   o Use :elem_type everywhere
   o Use 'drop ... cascade' everywhere
   o db.context(schema: app_portal, transaction: true) { ... }
@@ -19,7 +35,6 @@ TODO
 
       server.call :sp_nic_update_comtext, str_id, str_comtext, site.current_user.id
 
-
   o Have a 'with' method that combines multiple brachet-methods:
 
       conn.with(schema: public, transation: true) { ... }
@@ -34,9 +49,8 @@ TODO
                   struct  # exists
                   structs
 
-
   o Make rdbms, role, schema, and session methods part of a PgModel file that
-    monkey patch PgConn objects to include a #model method that returns the 
+    monkey patch PgConn objects to include a #model method that returns the
     top-level rdbms object
 
   o #group method
@@ -67,8 +81,6 @@ TODO
       end
     end
 
-
-
   o Use enumerators
   o Use SQL parameters. Optionally with a different syntax:
       $var - Value that gets single-quoted
@@ -93,7 +105,7 @@ TODO
       #   grant(role, to_role)
       #   grant(privilege, subject, to_role)
       def grant(role, to_role)
-        # 
+        #
         conn.exec "grant #{role} to #{to_role}"
       end
   o Allow a :type argument to all query methods that can be used to specify the

data/lib/pg_conn/version.rb

@@ -1,3 +1,3 @@
 module PgConn
-  VERSION = "0.23.0"
+  VERSION = "0.25.0"
 end

data/lib/pg_conn.rb

@@ -220,6 +220,13 @@ module PgConn
       @savepoints = nil # Stack of savepoint names. Nil if no transaction in progress
     end
 
+    # Reset connection but keep noise level (TODO: How about the other
+    # per-session settings in #initialize? Are they cleared by #reset too?)
+    def reset
+      @pg_connection.reset
+      @pg_connection.exec "set client_min_messages to warning;" # Silence warnings
+    end
+
     # Close the database connection. TODO: Rename 'close'
     def terminate()
       @pg_connection.close if @pg_connection && !@pg_connection.finished?
@@ -261,7 +268,7 @@ module PgConn
     # of values
     #
     # The :elem_type option can be a postgres type name (String or Symbol) or
-    # an array of type names. They are used as the required explicit element
+    # an array of type names. It is used as the required explicit element
     # type when the argument is an empty array. The element types shoud be in
     # the same order as the array arguments. Nested arrays is not supported
     #
@@ -579,14 +586,16 @@ module PgConn
       h
     end
 
-    # Return the value of calling the given function (which can be a String or
-    # a Symbol and can contain the schema of the function). It dynamically
+    # Return the value of calling the given postgres function. It dynamically
     # detects the structure of the result and return a value or an array of
     # values if the result contained only one column (like #value or #values),
     # a tuple if the record has multiple columns (like #tuple), and an array of
     # of tuples if the result contained more than one record with multiple
-    # columns (like #tuples). If the :proc option is true the "function" is
-    # assumed to be a procedure
+    # columns (like #tuples).
+    #
+    # The name argument can be a String or a Symbol that may contain the schema
+    # of the function.  If the :proc option is true the "function" is assumed
+    # to be a procedure
     #
     def call(name, *args, elem_type: nil, proc: false) # :proc may interfere with hashes
       args_seq = quote_values(args, elem_type: elem_type)
@@ -621,7 +630,10 @@ module PgConn
     #
     # There is no variant that takes a single tuple because it would then be
     # impossible to have array or hash field values
-    def insert(*args)
+    def insert(*args, upsert: nil, **opts)
+      # Add options to args except the special :upsert option
+      args << opts if !opts.empty?
+
       # Add schema (=nil) if absent
       args.unshift nil if args.size == 2 || (args.size == 3 && args[1].is_a?(Array))
 
@@ -656,17 +668,33 @@ module PgConn
         fields ||= data.keys
         tuples = [fields.map { |field| data[field] }]
       else
-        raise ArgumentError
+        raise ArgumentError, "Illegal argument '#{data.inspect}'"
       end
 
+      # On-conflict clause
+      upsert_sql =
+          case upsert
+            when true; "on conflict do nothing"
+            when String; "on conlict #{upsert}"
+            when false, nil; ""
+          else
+            raise ArgumentError, "Illegal value for :upsert option: #{upsert.inspect}"
+          end
+
       # Execute SQL statement using either :value or :values depending on data arity
       self.send method, %(
         insert into #{table} (#{quote_identifiers(fields)})
           values #{quote_tuples(tuples)}
+          #{upsert_sql}
           returning id
       )
     end
 
+    # Use upsert. Currently on 'on conflict do nothing' is supported
+    def upsert(*args)
+      insert(*args, upsert: true)
+    end
+
     # Update record(s)
     def update(schema = nil, table, expr, hash)
       table = [schema, table].compact.join(".")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_conn
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.25.0
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-24 00:00:00.000000000 Z
+date: 2024-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg