pg_conn 0.17.2 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebc1f6ad069daaf41d1bc7d58d40b3215bb53e03ad43de79251361f64ada5bd2
-  data.tar.gz: f746cf3be418cd9f5bf712e9ea2e2c549561f98ddb6741f5321464d6b71fb5e3
+  metadata.gz: f7b067cc4d9e831d6c30c135a351a05362953d75414d888a9c012105117dfcd1
+  data.tar.gz: 17eeef29e2844094019bf16890a98cade8b788f2465eb63797a46cdac66d3b93
 SHA512:
-  metadata.gz: 347112883473ba9ea49e4b041686b76f6c7c754fb5c438b39d3a7d1ffe1c8c5dbf131653f385700cfdba6023fe25c1090b301fcf701c737cbc586dc80ab74bad
-  data.tar.gz: b297c042cf2623f419b9a1aa777c103458b71591f92a8d6461be7a5fddf0c55a176bda3cdcf58fff6cc4d77858e5cdd581836d95c8d9bf7171eb044306006e91
+  metadata.gz: d4e77389acba0ebdd70d4e22440db2449129184bec8a775019d9e8e5a1e601990b276be89482286f4e24c7a35767f3aeba8293a6e2de9832600a16183dfe97db
+  data.tar.gz: 348441a6c040059ad68f648146c468d52e914841411f282efde924cee707d97ef7616092612b7d82844a0ededbb05e8bc33122cf408458f040cd9701214ddebc

data/TODO

@@ -1,6 +1,9 @@
 TODO
-  o Create aliases
+  o Have a 'with' method that combines multiple brachet-methods:
+
+      conn.with(schema: public, transation: true) { ... }
 
+  o Create aliases
       tuple   ->  array
       tuples      arrays
       field

data/lib/pg_conn/session_methods.rb

@@ -84,16 +84,16 @@ module PgConn
 
     # Return true if session triggers are enabled. Triggers are enabled by
     # default by Postgres
-    def triggers?() conn.value "select current_setting('session_replication_role') = 'replica'" end
+    def triggers?() conn.value "select current_setting('session_replication_role') <> 'replica'" end
     
     # Enable session triggers
     def enable_triggers()
-      conn.execute "set session session_replication_role = replica"
+      conn.execute "set session session_replication_role = DEFAULT"
     end
 
     # Disable session triggers
     def disable_triggers()
-      conn.execute "set session session_replication_role = DEFAULT"
+      conn.execute "set session session_replication_role = replica"
     end
 
     # Execute block with session triggers on or off
@@ -107,10 +107,9 @@ module PgConn
         end
         yield
       ensure
-        if on_off && !active
-          disable_triggers
-        elsif !on_off && active
-          enable_triggers
+        case active
+          when true; enable_triggers if !triggers?
+          when false; disable_triggers if triggers?
         end
       end
     end

data/lib/pg_conn/version.rb

@@ -1,3 +1,3 @@
 module PgConn
-  VERSION = "0.17.2"
+  VERSION = "0.18.0"
 end

data/lib/pg_conn.rb

@@ -327,8 +327,8 @@ module PgConn
     # Return a single value. It is an error if the query doesn't return a
     # single record with a single column. If :transaction is true, the query
     # will be executed in a transaction and also be committed if :commit is
-    # true (this is the default). It can be used to execute 'insert' statements
-    # with a 'returning' clause
+    # true (this is the default). It can also be used to execute 'insert'
+    # statements with a 'returning' clause
     def value(query) #, transaction: false, commit: true)
       r = pg_exec(query)
       check_1c(r)
@@ -567,16 +567,59 @@ module PgConn
       end
     end
 
-    # Insert record(s) in a table. Returns the id of the inserted record(s)
-    def insert(schema = nil, table, array_or_hash)
-      return [] if array_or_hash.empty?
-      table = [schema, table].compact.join(".")
-      is_array = array_or_hash.is_a?(Array)
-      array = is_array ? array_or_hash : [array_or_hash]
-      identifiers = quote_identifier_list(array.first.keys)
-      literals = array.map { |hash| quote_literal_list(hash.values) }.join(", ")
-      method = (is_array ? :values : :value)
-      self.send method, %(insert into #{table} #{identifiers} values #{literals} returning id)
+    # :call-seq*
+    #   insert(table, record|records)
+    #   insert(table, fields, record|records|tuples)
+    #   insert(schema, table, record|records)
+    #   insert(schema, table, fields, record|records|tuples)
+    #
+    # Insert record(s) in table and return id(s)
+    #
+    # 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)
+      # Add schema (=nil) if absent
+      args.unshift nil if args.size == 2 || (args.size == 3 && args[1].is_a?(Array))
+
+      # Add fields (=nil) if absent
+      args.insert(-2, nil) if !args[-2].is_a?(Array)
+
+      # Check number of arguments
+      args.size == 4 or raise ArgumentError, "Illegal number of arguments"
+
+      # Extract parameters
+      schema, table, fields, data = args
+
+      # Normalize table
+      table = schema ? "#{schema}.#{table}" : table
+
+      # Find method and normalize data
+      if data.is_a?(Array) 
+        if data.empty?
+          return []
+        elsif data.first.is_a?(Array)
+          method = :values
+          fields or raise ArgumentError
+          tuples = data
+        elsif data.first.is_a?(Hash)
+          method = :values
+          fields ||= data.first.keys
+          tuples = data.map { |record| fields.map { |field| record[field] } }
+        else
+          raise ArgumentError
+        end
+      elsif data.is_a?(Hash)
+        method = :value
+        fields ||= data.keys
+        tuples = [fields.map { |field| data[field] }]
+      else
+        raise ArgumentError
+      end
+
+      # Build and execute SQL statement
+      columns = quote_identifier_list(fields)
+      values = tuples.map { |tuple| quote_literal_list(tuple) }.join(', ')
+      self.send method, %(insert into #{table} #{columns} values #{values} returning id)
     end
 
     # Update record(s)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_conn
 version: !ruby/object:Gem::Version
-  version: 0.17.2
+  version: 0.18.0
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-09 00:00:00.000000000 Z
+date: 2024-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg