pg_conn 0.59.0 → 0.59.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27b96a8da5a5f1910e4ab2f84a6d78d81de21771dff4a425ea7e9ac239409ea0
-  data.tar.gz: 24a733484ea400d8f91543538a1792d2e133cdfb5af0d46e2ffb232cea3cb6ce
+  metadata.gz: 8dd70cb7a067886566b8ae751bb319115450ed3ebc82d3420c74c7f77e5f72ce
+  data.tar.gz: 53393a8ef217ed7502b78d5d7f2f1cb092cc5adbe8e7da30f1cac901a262d31c
 SHA512:
-  metadata.gz: e03a1bd04679bfef0249fa79b4d040c0125604222bc0e598f3c1dbd80ba46e652d63284ca8663a7d324ecded894b7b5f7d0f913ff52e5e3f9631f4ac3a21997d
-  data.tar.gz: 4c56396c12d531ee5a59e8f275fc3b8abc32cf53e761c148012ba380081b124fab9b33e6dceeb10f48c922f52454eb6206f4f61ab799e27342f8bb42a1e43f26
+  metadata.gz: e09cbbffebf131810a76a0470e85ad130148f556756ca3a6885ebd87cd181b7f354a5a8601f4428d77f1a1ba2fca47c58f7ba5fb9c5d3ac53ea159c5f4207ea2
+  data.tar.gz: 95a2986bcc458774f532adf6c2a28dff576d0ea7596c8c58fd3bf03aa86f218d2911536848ac3c0e5bac6e528ebd8ec6b47a9c3a17f96173a91ba0140fc1c9fc

data/lib/pg_conn/schema_methods.rb

@@ -36,7 +36,7 @@ module PgConn
     end
 
     # Hollow out a schema by dropping all tables and views (but still not
-    # functions and procedures TODO)
+    # functions and procedures TODO). TODO: Swap names with #clean!
     def empty!(schema, exclude: [])
       self.list_tables(schema, exclude: exclude).each { |table|
         conn.execute "drop table if exists #{schema}.#{table} cascade"
@@ -46,11 +46,13 @@ module PgConn
       }
     end
 
-    # Empty all tables in the given schema
-    def clean!(schema, exclude: [])
+    # Empty all tables in the given schema(s)
+    def clean!(*schemas, exclude: [])
       conn.session.triggers(false) {
-        self.list_tables(schema, exclude: exclude).each { |table|
-          conn.execute "delete from #{schema}.#{table}"
+        schemas.flatten.each { |schema|
+          self.list_tables(schema, exclude: exclude).each { |table|
+            conn.execute "delete from #{schema}.#{table}"
+          }
         }
       }
     end

data/lib/pg_conn/version.rb

@@ -1,3 +1,3 @@
 module PgConn
-  VERSION = "0.59.0"
+  VERSION = "0.59.2"
 end

data/lib/pg_conn.rb

@@ -96,7 +96,7 @@ module PgConn
 
   # Simple shorthand for ::quote_value
   def self.quote(value, elem_type: nil, json_type: nil)
-    quote_value(value, elem_type: nil, json_type: nil)
+    quote_value(value, elem_type: elem_type, json_type: json_type)
   end
 
   # Quote values and concatenate them using ',' as separator
@@ -885,9 +885,7 @@ module PgConn
     #     { database-column-name: object-method-name } # calls method on object
     #
     def insert(*args, upsert: nil, **opts)
-      # Normalize arguments
-
-      # Add options to args except the special :upsert option
+      # Add options to args except the special :conflict option
       args << opts if !opts.empty?
 
       # Add schema (=nil) if absent
@@ -935,29 +933,42 @@ module PgConn
       else
         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
+      identifiers_sql = quote_identifiers(fields)
+      values_sql = quote_tuples(tuples)
+      upsert_sql = ""
+
+      # On upsert
+      if upsert
+        other_identifiers_sql = quote_identifiers(fields.map { "excluded.#{_1}" })
+        upsert_sql = %(
+          on conflict (#{quote_identifiers(upsert)}) do update
+            set (#{identifiers_sql}) = (#{other_identifiers_sql}))
+      end
 
       # Execute SQL statement using either :value or :values depending on data arity
       self.send method, <<~SQL
-        insert into #{table} (#{quote_identifiers(fields)})
-          values #{quote_tuples(tuples)}
+        insert into #{table} (#{identifiers_sql})
+          values #{values_sql}
           #{upsert_sql}
           returning id
       SQL
     end
 
-    # Use upsert. Currently only 'on conflict do nothing' is supported
+    # Use upsert instead of insert and resolve conflicts by updating the target
+    # record. Called like #insert but with an additional key argument that is
+    # an array key to check for conflicts, default [:id]
+    #
+    # :call-seq:
+    #   upsert(table, struct|structs|record|records, key)
+    #   upsert(table, fields, struct|structs|record|records|tuples|values, key)
+    #
+    #   upsert(schema, table, struct|structs|record|records, key)
+    #   upsert(schema, table, fields, struct|structs|record|records|tuples|values, key)
+    #
     def upsert(*args)
-      insert(*args, upsert: true)
+      key = args.pop
+      key.is_a?(Array) && !key.empty? or raise ArgumentError, "Illegal value for key: #{key.inspect}"
+      insert(*args, upsert: key)
     end
 
     # Update record(s)
@@ -1007,19 +1018,17 @@ module PgConn
     end
 
     # Execute SQL statement(s) in a transaction and return the number of
-    # affected records (if any). Also sets #timestamp unless a transaction is
-    # already in progress. The +sql+ argument can be a command (String) or an
-    # arbitrarily nested array of commands. Note that you can't have commands
-    # that span multiple lines. The empty array is a NOP but the empty string
-    # is not.
+    # selected or affected records in the last statement. Also sets #timestamp
+    # unless a transaction is already in progress. The +sql+ argument can be a
+    # command (String) or an arbitrarily nested array of commands. The empty
+    # array is a NOP but the empty string is not.
     #
     # #exec pass Postgres exceptions to the caller unless :fail is false in
-    # which case it returns nil if an error occurred
-    #
-    # Note that postgres crashes the whole transaction stack if any error is
-    # met so if you're inside a transaction, the transaction will be in an
-    # error state and if you're also using subtransactions the whole
-    # transaction stack has collapsed
+    # which case it returns nil if an error occurred. Note that postgres
+    # crashes the whole transaction stack if any error is met so if you're
+    # inside a transaction, the transaction will be in an error state and if
+    # you're also using subtransactions the whole transaction stack has
+    # collapsed
     #
     # TODO: Make sure the transaction stack is emptied on postgres errors
     def exec(sql, commit: true, fail: true, silent: self.silent)

metadata

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