pg_conn 0.26.0 → 0.26.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4148bbd8c21613249beed07d5248aa71780a8805881afc94899f9f29cd2d452d
-  data.tar.gz: 21bea1c8c108a4a135eb1d6936a56995b457db0e8192a17b745d0b3dd1676846
+  metadata.gz: 419e3bd17f4343be6860d172864ad0eeaaed032ab72cc659a02afa14914cdf65
+  data.tar.gz: 00d673f75424491bd322cf1321cc8afbb67eba1d955a9545b4f7a0df334bc0b8
 SHA512:
-  metadata.gz: 7cca5aea976d949607b1650e8f00347a22be14907c8296a26379cd804a51f5610bb9786bc21b3b9317496a00ef135564033f276d5e3300dbd4d133b056835a79
-  data.tar.gz: 8bcf303b9712c1e6de69c301115c88a53d908aad90c8bce6b8e73e912d6b710772fb88a6bb191bc34142ca29f016845bfbc035cda4670c91d5e3d407ce82907e
+  metadata.gz: 9e732a7523af59a16052603766aeea731d3d54a4f36fbd250f2dea33b85d1bc890af2fb7de4f8efb96d816eed2ecce390fb4510224715f78bd75a693c4243062
+  data.tar.gz: f1b0b073a7231a68a5e0e3b255523c50000db9d50e24596a7545d9228b84bc69056a70b4c8111f899ad6852990ac6b84dc646f2e369c7cb4fbe77f77615d65e7

data/lib/pg_conn/session_methods.rb

@@ -16,14 +16,14 @@ module PgConn
       else
         conn.tuples %(
           select datname, usename
-          from pg_stat_activity 
+          from pg_stat_activity
           where datname is not null and usename is not null
         )
       end
     end
 
     # Return true if the given database accepts connections
-    def enabled?(database) 
+    def enabled?(database)
       !database.nil? or raise ArgumentError
       conn.value "select datallowconn from pg_catalog.pg_database where datname = '#{database}'"
     end
@@ -50,19 +50,21 @@ module PgConn
     #       multiple sessions (is this ever relevant?)
     #
     def terminate(database, *users)
+      users = Array(users).flatten
       !database.nil? or raise ArgumentError
       enabled = self.enabled?(database)
 
       case users
-        when []; 
+        when [];
           return
         when [nil]
           self.disable(database) if enabled
           users = self.list(database)
-        else 
+        else
           users = Array(users).flatten
       end
       pids = self.pids(database, users)
+
       if !pids.empty?
         pids_sql = pids.map { |pid| "(#{pid})" }.join(", ")
         conn.execute "select pg_terminate_backend(pid) from ( values #{pids_sql} ) as x(pid)"
@@ -71,7 +73,7 @@ module PgConn
     end
 
     # Run block without any connected users. Existing sessions are terminated
-    def exclusive(database, &block) 
+    def exclusive(database, &block)
       !database.nil? or raise ArgumentError
       begin
         disable(database)
@@ -85,7 +87,7 @@ 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
-    
+
     # Enable session triggers
     def enable_triggers()
       conn.execute "set session session_replication_role = DEFAULT"

data/lib/pg_conn/version.rb

@@ -1,3 +1,3 @@
 module PgConn
-  VERSION = "0.26.0"
+  VERSION = "0.26.2"
 end

data/lib/pg_conn.rb

@@ -315,41 +315,21 @@ module PgConn
     end
 
     # Quote a record and cast it into the given type, the type can also be a
-    # table or view. 'data' is a hash or struct representation of the record
+    # table or view. 'data' is an array, hash, or struct representation of the
+    # record
     #
     # Note that the fields are retrived from the database so this method is not
     # as fast as the other quote-methods. It is however very convenient when
     # you're testing and need a composite type because record-quoting can
     # easily become unwieldly
-    def quote_record(schema_name = nil, type, data, elem_types: nil)
-      qual_name = [schema_name, type].compact .join('.')
-
-      fields = self.values(%(
-        select attname
-        from pg_attribute
-        where
-          attrelid = '#{qual_name}'::regclass
-          and attnum > 0
-          and not attisdropped
-        order by attnum
-      )).map(&:to_sym)
-
-      values =
-          case data
-            when Hash; fields.map { |f| data[f] }
-            when OpenStruct; fields.map { |f| data.send(f) }
-            when Array; data
-          else
-            raise Error, "Illegal value #{data.inspect}"
-          end
-
-      "(#{quote_tuple(values, elem_types: elem_types)})::#{qual_name}"
+    def quote_record(data, schema_name = nil, type, elem_types: nil)
+      quote_record_impl(data, schema_name, type, elem_types: elem_types, array: false)
     end
 
-    def quote_records(schema_name = nil, type, datas, elem_types: nil)
-      qual_name = [schema_name, type].compact .join('.') + "[]"
-      records = datas.map { |data| quote_record(schema_name, type, data, elem_types: elem_types) }
-      "array[#{records.join(", ")}]::#{qual_name}"
+    # Quote an array of records. The type is the record type, not the type of
+    # the enclosing array
+    def quote_records(data, schema_name = nil, type, elem_types: nil)
+      quote_record_impl(data, schema_name, type, elem_types: elem_types, array: true)
     end
 
     # :call-seq:
@@ -980,6 +960,42 @@ module PgConn
       end
     end
 
+    # Common implementation for #quote_record and #quote_records that avoids
+    # query the database multiple times while not duplication the code. the
+    # :array flag controls the mode
+    def quote_record_impl(datas, schema_name = nil, type, elem_types: nil, array: nil)
+      pg_type = [schema_name, type].compact.join('.')
+      fields = self.values(%(
+        select attname
+        from pg_attribute
+        where
+          attrelid = '#{pg_type}'::regclass
+          and attnum > 0
+          and not attisdropped
+        order by attnum
+      )).map(&:to_sym)
+
+      datas = [datas] if !array
+
+      literals = datas.map { |data|
+        values =
+            case data
+              when Hash; fields.map { |f| data[f] }
+              when OpenStruct; fields.map { |f| data.send(f) }
+              when Array; data
+            else
+              raise Error, "Illegal value #{data.inspect}"
+            end
+        "(#{quote_tuple(values, elem_types: elem_types)})::#{pg_type}"
+      }
+
+      if array
+        "array[#{literals.join(', ')}]::#{pg_type}[]"
+      else
+        literals.first
+      end
+    end
+
     # :call-seq:
     #   pg_exec(string)
     #   pg_exec(array)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_conn
 version: !ruby/object:Gem::Version
-  version: 0.26.0
+  version: 0.26.2
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-16 00:00:00.000000000 Z
+date: 2024-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg