pg_conn 0.2.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df5aa73c1d8e34263b51b29acb63f2d675e7945141e44d9f5adbd00987d1bb46
-  data.tar.gz: 56ad22f1c45fb8e78d43f59ff4b982da09d86d4e1fdfd802cf7e396d66a16ece
+  metadata.gz: edc8c2d648a4ea373981633433cfc52ca94cdec159292f052a6ee5a077b56172
+  data.tar.gz: 7823404356129c95cfcb37869641a32a8982bd11da0d1d7f730893aa0f746701
 SHA512:
-  metadata.gz: b94e9e6b1ed7605aceab03fb0393e79f5f57ef1e7bb26794cd8b25a8de93c7f4358686dc910a2d76132941daa7c2ce113d20c45144ff9e2ff6fb3e5a744f96b6
-  data.tar.gz: 386d086a0af25b2f049046a083e1af1f947a7fbed63b0a5787659fe95414678761d93fcddb4ddce04b7a97d1dcb82160c7ff6bf79ec4aabe1d18ec49f55d62b9
+  metadata.gz: 6a539ed00e4a16a5ef9d3e400782d42000f19f578382e9721941b82c61cffb3f427856409b978224c42c2b533bb585df5e1c27765c73c1a9071809cc3c734358
+  data.tar.gz: c93dab2fa0404ffe61b02c4c1fbc0021d290dade58471cd6cabce8e74cbe2372a3b6c1f4a2fefd5eff82ffa4b545b71fb54851fd6f0fcf8abb9b53b16892324a

data/Gemfile

@@ -5,6 +5,3 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in pg_conn.gemspec
 gemspec
 
-gem "rake", "~> 13.0"
-
-gem "rspec", "~> 3.0"

data/TODO

@@ -1,4 +1,6 @@
 TODO
+  o Create an abstract PgConnBase and have PgStmts (writes statements to array)
+    and PgConn (sends statements to server) classes derived from it
   o fix silent
   o fix fail
   o A PgConn.new with a block. Useful for temporary database connections (a

data/lib/pg_conn/schema_methods.rb

@@ -81,13 +81,18 @@ module PgConn
       conn.values relation_list_query(schema, kind: %w(v m))
     end
 
-    # Return a list of columns. If relation is defined, only columns from that
+    # Return a list of columns. If +relation+ is defined, only columns from that
     # relation are listed. Columns are returned as fully qualified names (eg.
     # "schema.relation.column")
     def list_columns(schema, relation = nil)
       conn.values column_list_query(schema, relation)
     end
 
+    # Like #list_columns but returns a tuple of column UID and column type
+    def list_column_types(schema, relation = nil)
+      conn.tuples column_list_type_query(schema, relation)
+    end
+
     def exist_function(schema, function, signature)
       raise NotImplementedError
     end
@@ -143,15 +148,23 @@ module PgConn
           relation_clause
       ].compact.join(" and ")
     end
+
+    def column_list_type_query(schema, relation)
+      relation_clause = relation ? "relname = '#{relation}'" : nil
+      [
+          %(
+            select  '#{schema}' || '.' || c.relname || '.' || a.attname as "column",
+                    a.atttypid::regtype::text as "type"
+            from    pg_class c
+            join    pg_attribute a on a.attrelid = c.oid
+            where   relnamespace::regnamespace::text = 'public'
+            and     a.attnum > 0
+          ),
+          relation_clause
+      ].compact.join(" and ")
+    end
   end
 end
 
 
 
-
-
-
-
-
-
-

data/lib/pg_conn/version.rb

@@ -1,3 +1,3 @@
 module PgConn
-  VERSION = "0.2.1"
+  VERSION = "0.3.3"
 end

data/lib/pg_conn.rb

@@ -19,7 +19,7 @@ module PgConn
   def self.===(element) element.is_a?(PgConn::Connection) or super end
 
   # Returns a PgConn::Connection object (aka. a PgConn object). It's arguments
-  # can be an existing connection that will just be returned of a set of
+  # can be an existing connection that will just be returned or a set of
   # PgConn::Connection#initialize arguments that will be used to create a new
   # PgConn::Connection object
   def self.ensure(*args)
@@ -64,17 +64,16 @@ module PgConn
     # #exec or #transaction block
     attr_reader :timestamp
 
-          
-
-    # Initialize a connection object and connect to the database. #initialize has five
-    # variations:
-    #
+    # :call-seq:
     #     initialize(dbname = nil, user = nil, field_name_class: Symbol)
     #     initialize(connection_hash, field_name_class: Symbol)
     #     initialize(connection_string, field_name_class: Symbol)
     #     initialize(host, port, dbname, user, password, field_name_class: Symbol)
+    #     initialize(array, field_name_class: Symbol)
     #     initialize(pg_connection_object)
     #
+    # Initialize a connection object and connect to the database
+    #
     # The possible keys of the connection hash are :host, :port, :dbname, :user,
     # and :password. The connection string can either be a space-separated list
     # of <key>=<value> pairs with the same keys as the hash, or a URI with the
@@ -84,6 +83,11 @@ module PgConn
     # Symbol (the default) or String. The :timestamp option is used
     # internally to set the timestamp for transactions
     #
+    # If given an array argument, PgConn will not connect to the database and
+    # instead write its commands to the array. In this case, methods extracting
+    # values from the database (eg. #value) will return nil or raise an
+    # exception
+    #
     # The last variant is used to establish a PgConn from an existing
     # connection. It doesn't change the connection settings and is not
     # recommended except in cases where you want to piggyback on an existing
@@ -125,6 +129,9 @@ module PgConn
                 end
               when Hash
                 make_connection **arg
+              when Array
+                @pg_commands = arg
+                nil
             else
               raise Error, "Illegal argument type: #{arg.class}"
             end
@@ -136,7 +143,7 @@ module PgConn
             raise Error, "Illegal number of parameters: #{args.size}"
           end
 
-      if !using_existing_connection
+      if @pg_connection && !using_existing_connection
         # Auto-convert to ruby types
         type_map = PG::BasicTypeMapForResults.new(@pg_connection) 
 
@@ -170,7 +177,7 @@ module PgConn
 
     # Close the database connection
     def terminate()
-      @pg_connection.close if !@pg_connection.finished? 
+      @pg_connection.close if @pg_connection && !@pg_connection.finished? 
     end
 
     def self.new(*args, &block)
@@ -178,7 +185,7 @@ module PgConn
         begin
           object = Connection.allocate
           object.send(:initialize, *args)
-          yield(object) if object.pg_connection
+          yield(object) # if object.pg_connection
         ensure
           object.terminate if object.pg_connection
         end
@@ -187,9 +194,6 @@ module PgConn
       end
     end
 
-#   # Return true iff the query returns exactly one value
-#   def exist?(query) count(query) == 1 end
-
     # :call-seq:
     #   exist?(query)
     #   exist?(table, id)
@@ -459,7 +463,7 @@ module PgConn
       elsif r.nfields == 1
         r.column_values(0)
       else
-        r.values
+        r&.values
       end
     end
 
@@ -489,7 +493,11 @@ module PgConn
     #
     # TODO: Handle postgres exceptions wrt transaction state and stack
     def execute(sql, fail: true, silent: false)
-      pg_exec(sql, fail: fail, silent: silent)&.cmd_tuples
+      if @pg_connection
+        pg_exec(sql, fail: fail, silent: silent)&.cmd_tuples
+      else
+        pg_exec(sql, fail: fail, silent: silent)
+      end
     end
 
     # Switch user to the given user and execute the statement before swithcing
@@ -534,7 +542,7 @@ module PgConn
       else
         @savepoints = []
         pg_exec("begin")
-        @timestamp = pg_exec("select current_timestamp").values[0][0]
+        @timestamp = pg_exec("select current_timestamp").values[0][0] if @pg_connection
       end
     end
 
@@ -626,30 +634,39 @@ module PgConn
     #
     # TODO: Fix silent by not handling exceptions
     def pg_exec(arg, fail: true, silent: false)
-      begin
-        last_stmt = nil # To make the current SQL statement visible to the rescue clause
-        if arg.is_a?(String)
-          return nil if arg == ""
-          last_stmt = arg
-          @pg_connection.exec(last_stmt)
-        else
-          stmts = arg.flatten.compact
-          return nil if stmts.empty?
-          last_stmt = stmts.last
-          @pg_connection.exec(stmts.join(";\n"))
-        end
-        
-      rescue PG::Error => ex
-        if fail
-          if !silent # FIXME Why do we handle this? 
-            $stderr.puts arg
-            $stderr.puts ex.message
-            $stderr.flush
+      if @pg_connection
+        begin
+          last_stmt = nil # To make the current SQL statement visible to the rescue clause
+          if arg.is_a?(String)
+            return nil if arg == ""
+            last_stmt = arg
+            @pg_connection.exec(last_stmt)
+          else
+            stmts = arg.flatten.compact
+            return nil if stmts.empty?
+            last_stmt = stmts.last
+            @pg_connection.exec(stmts.join(";\n"))
           end
-          raise
+          
+        rescue PG::Error => ex
+          if fail
+            if !silent # FIXME Why do we handle this? 
+              $stderr.puts arg
+              $stderr.puts ex.message
+              $stderr.flush
+            end
+            raise
+          else
+            return nil
+          end
+        end
+      else # @pg_commands is defined
+        if arg.is_a?(String)
+          @pg_commands << arg if arg != ""
         else
-          return nil
+          @pg_commands.concat(arg)
         end
+        nil
       end
     end
 

data/pg_conn.gemspec

@@ -13,7 +13,6 @@ Gem::Specification.new do |spec|
   spec.homepage      = "http://www.nowhere.com/"
   spec.required_ruby_version = ">= 2.4.0"
 
-
   spec.metadata["homepage_uri"] = spec.homepage
 
   # Specify which files should be added to the gem when it is released.
@@ -27,28 +26,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  # Uncomment to register a new dependency of your gem
-  # spec.add_dependency "example-gem", "~> 1.0"
-
-  # For more information and examples about making a new gem, checkout our
-  # guide at: https://bundler.io/guides/creating_gem.html
-
-  # Add your production dependencies here
-  # spec.add_dependency GEM [, VERSION]
   spec.add_dependency "pg"
 
-  # Add your development dependencies here
-  # spec.add_development_dependency GEM [, VERSION]
-
-  # Also un-comment in spec/spec_helper to use simplecov
-  # spec.add_development_dependency "simplecov"
-
-  # In development mode override load paths for gems whose source are located
-  # as siblings of this project directory
-  if File.directory?("#{__dir__}/.git")
-    local_projects = Dir["../*"].select { |path| 
-      File.directory?(path) && File.exist?("#{path}/Gemfile")
-    }.map { |relpath| "#{File.absolute_path(relpath)}/lib" }
-    $LOAD_PATH.unshift *local_projects
-  end
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "simplecov"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_conn
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-28 00:00:00.000000000 Z
+date: 2022-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -24,6 +24,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Gem pg_conn
 email:
 - claus.l.rasmussen@gmail.com
@@ -64,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.26
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Gem pg_conn