pg_conn 0.42.1 → 0.43.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1885ef3f2d7a35d098e8bf78136148634c7b2d828b33477235a3cd1e38765df6
-  data.tar.gz: 853369281c40c6c6fc60a80785f6166d27fcc500cf7f1e216e348adfed778c30
+  metadata.gz: b9b707fbab740595f05ebe65cbd36f20e996875f568b1c26ad37b60cfb42cb65
+  data.tar.gz: e5984072e4e09eb9f7ac76915f00d29d08e1766e1ad8edef9b90d56fd61a7313
 SHA512:
-  metadata.gz: b839c16a46f84ae89f8bb941d08972f24edd3f3bf777d17197ad1cdaf5bc8e5ab368135e8222dac202a3b3d670c04c027e7a9afff00a0b851af8d899f93baef9
-  data.tar.gz: a9171073a19b5ed326eaf58a4d4fbcd4b61fad8bc1154e0c000e99b61c94b068ba8f70c14e773bd9eb455d0d7dd111a2bac02c4646c07b1bd01843d134338cb4
+  metadata.gz: ed0c6002be578ca08f8a002b438c34eada70090bf362ea5fb9d642559101fc53827b42b2cf962e60803c02c011df5b6eef92bf5de5045faa18b47affc9a7a71c
+  data.tar.gz: d75913f57aac31fcb60c91f06958a746b20cd4559bd0feda169f12c48c173aa721423bacdfb883ed5612106f4e1320add1913d39e72d943abde483adb25a30df

data/lib/pg_conn/version.rb

@@ -1,3 +1,3 @@
 module PgConn
-  VERSION = "0.42.1"
+  VERSION = "0.43.0"
 end

data/lib/pg_conn.rb

@@ -161,6 +161,31 @@ module PgConn
     # #exec or #transaction block. The timestamp includes the current time zone
     attr_reader :timestamptz
 
+    # Write a Sql statement to the logger if defined. Return the given sql
+    def log(sql)
+      case @logger
+        when nil; # do nothing
+        when IO, StringIO; @logger.puts sql
+        when Proc; @logger.call sql
+      else
+        raise ArgumentError
+      end
+      sql # for convenience in #pg_exec
+    end
+
+    # Return true if logging
+    def log?() = @logger != false
+
+    # Control logging of SQL commands. It can be assigned true, false, nil, an
+    # unary Proc object, or a IO or StringIO object. True causes the message to
+    # be printed to standard error, false and nil ignores it
+    def logger=(logger) @logger = (logger == true ? $stdout : logger || nil) end
+
+    # Return current logger or nil if not logging. Note that the logger object
+    # is equal to $stdout if the logger is set to true and nil if it is set to
+    # false
+    def logger() = @logger
+
     # Controls error messages. It can be assigned true, false, nil, or a Proc
     # object that recieves the message. True causes the message to be printed
     # to standard error, false ignores it, and nil resets the state to the
@@ -209,31 +234,7 @@ module PgConn
     def debug?() !debug.nil? end
     def debug=(value) set_option(:debug, value) end
 
-    # Log SQL or return current logger if sql is nil
-    def log(sql = nil)
-      case sql and dst = @options[:log]
-        when false; # do nothing
-        when true; $stderr.puts sql
-        when Proc; dst.call sql
-        when IO; dst.puts sql
-        when StringIO; dst.puts sql
-        when nil; return @options[:log]
-      else
-        raise "Oops"
-      end
-      sql # for convenience in #pg_exec
-    end
-
-    # Return true if logging is enabled
-    def log?() @options[:log] != false end
-
-    # Control logging of SQL commands. It can be assigned true, false, nil, an
-    # unary Proc object, or a IO object. True causes the message to be printed
-    # to standard error, false ignores it, and nil resets the state to the
-    # default given when the connection was initialized. Default false
-    def log=(value) set_option(:log, value) end
-
-    DEFAULT_OPTIONS = { silent: false, warning: true, notice: false, info: false, debug: false, log: false }
+    DEFAULT_OPTIONS = { silent: false, warning: true, notice: false, info: false, debug: false }
 
     # TODO: Move error message handling into the same framework as notice and
     # warning but we have a name collision just below that would need to be
@@ -425,6 +426,7 @@ module PgConn
       @rdbms = RdbmsMethods.new(self)
       @session = SessionMethods.new(self)
       @savepoints = nil # Stack of savepoint names. Nil if no transaction in progress
+      @log = nil
     end
 
     # Reset connection but keep noise level (TODO: How about the other
@@ -936,25 +938,26 @@ module PgConn
     # very useful in RSpec tests
     #
     # Local options are :search_path that runs the block with the given
-    # schemas, :username that runs the block as the given user, :log that controls logging,
-    # SQL, :commit that runs the block in a transaction if true or false; true
-    # commits the transaction and false rolls it back. It is not run in a
-    # transaction if :commit is nil
+    # schemas, :username that runs the block as the given user, :log that
+    # controls logging (see #logger=), :commit that runs the block in a
+    # transaction if true or false; true commits the transaction and false
+    # rolls it back (very rarely useful). It is not run in a transaction if
+    # :commit is nil
     #
     def with(**options, &block)
       search_path = options.delete(:search_path)
       username = options.delete(:username)
-      logging = options.delete(:log) || false
+      log = options.delete(:log)
       commit = options.delete(:commit)
 
       saved_options = @options.dup
       saved_search_path = self.search_path if search_path
-      saved_logger = self.log if logging
+      saved_logger = self.logger if log
 
       begin
         set_options(options)
         self.search_path = search_path if search_path
-        self.log = logging
+        self.logger = log if !log.nil?
 
         inner = lambda {
           if !commit.nil?
@@ -972,7 +975,7 @@ module PgConn
           inner.call
         end
       ensure
-        self.log = saved_logger if logging
+        self.logger = saved_logger if log
         self.search_path = saved_search_path if search_path
         set_options(saved_options)
       end

metadata

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