pg_conn 0.39.0 → 0.40.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ace2859257bedbbdeb816bfb04d9d7e23d686942c328e0d521568b6f4fc57e90
-  data.tar.gz: b803feaaaa619668cf00f57d2c5ffd072f04a149e144eafb061b85d4bf4cfad4
+  metadata.gz: f946804765203fcdb2c40e704831e488e2a47c1975ce371217faa528c533141c
+  data.tar.gz: fa08dce1b7e10162aaa5e2cd20e0ada630f95a794462528a73969c6bd5ad484c
 SHA512:
-  metadata.gz: b2b913861f23ed8db39f8d521571bb054c3ed9ca1526b800c5f4982f9b4a9f285cc60b17dc59194b2df7cc2147019faaef7b838a4e10d4e8659941adb6fddde9
-  data.tar.gz: aac27bc4b8e7881ded4fdfe350a98be3de919052b9b5fcbca0d6767573dd9592d4922e3b2da968860b146d451b05bb96937e7344941d58048a104c5b8bda9081
+  metadata.gz: 41262613001be5709f861d125af4287a82968ce60878dca3c885a34033d0ef78786b76a774738123fbd97ffdaaad5821cf480899cc56772f3691757c831de8a7
+  data.tar.gz: de131f33563c6ec6e52c03d4537dd3ab730506534e84a0aae1aefaefc763a05fd45376713a4ee2d91177967c2def949c566bf137376f6c61496f0e7f691ad97f

data/TODO

@@ -96,7 +96,6 @@ TODO
   o Proper implementation of call of functions and procedures: Functions should
     be called through #value, #tuple etc. and procedures through #call.
     Proceduer output parameters needs handling too
-  o Implement search_path
   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
@@ -119,6 +118,7 @@ TODO
   + Quote methods (value, identier, ... -> Postgres string)
   + Have a 'with' method that combines multiple brachet-methods:
       conn.with(schema: public, transation: true) { ... }
+  + Implement search_path
 
 
 REFACTOR

data/lib/pg_conn/version.rb

@@ -1,3 +1,3 @@
 module PgConn
-  VERSION = "0.39.0"
+  VERSION = "0.40.0"
 end

data/lib/pg_conn.rb

@@ -465,6 +465,18 @@ module PgConn
       quote_record_impl(data, schema_name, type, array: true, **opts)
     end
 
+    # Return current search path. Note that a search path is part of
+    # the transaction
+    def search_path
+      self.value("show search_path").split(/,\s*/) - %w("$user" pg_temp)
+    end
+
+    # Set search path. It accepts a schema or an array of schema names
+    def search_path=(schemas)
+      schema_array = Array(schemas).flatten - %w("$user" pg_temp) + %w(pg_temp)
+      self.exec "set search_path to #{schema_array.join(', ')}"
+    end
+
     # :call-seq:
     #   exist?(query)
     #   exist?(table, id)
@@ -893,17 +905,47 @@ module PgConn
       exec %(delete from #{table} where #{constraint})
     end
 
-    # Execute block with global options and resets afterwards. Currently only
-    # :silent, :notice and :warning is supported. Very useful in RSpec tests
+    # Execute block with the given set of global or local options and reset
+    # them afterwards
+    #
+    # The global options :silent, :notice and :warning are supported, they're
+    # very useful in RSpec tests
     #
-    # TODO: :error, :fail, :symbol, :schema, :search_path
+    # Local options are :search_path that runs the block with the given
+    # schemas, :username that runs the block as the given user, and :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
     #
     def with(**options, &block)
+      search_path = options.delete(:search_path)
+      username = options.delete(:username)
+      commit = options.delete(:commit)
+
+      saved_options = @options.dup
+      saved_search_path = self.search_path if search_path
+
       begin
-        saved_options = @options.dup
         set_options(options)
-        yield
+        self.search_path = search_path if search_path
+
+        inner = lambda {
+          if !commit.nil?
+            self.transaction(commit: commit) {
+              block.yield
+            }
+          else
+            block.yield
+          end
+        }
+
+        if username
+          self.su(username, &inner)
+        else
+          inner.call
+        end
       ensure
+        self.search_path = saved_search_path if search_path
         set_options(saved_options)
       end
     end
@@ -975,16 +1017,23 @@ module PgConn
     # Switch user to the given user and execute the statement before swithcing
     # back to the original user
     #
-    # FIXME: The out-commented transaction block makes postspec fail for some reason
+    # FIXME:
+    #   The out-commented transaction block makes postspec fail for some
+    #   reason. Note that user-switches lives within transactions
+    #
     # TODO: Rename 'sudo' because it acts just like it.
+    #
     def su(username, &block)
       raise Error, "Missing block in call to PgConn::Connection#su" if !block_given?
       realuser = self.value "select current_user"
       result = nil
 #     transaction(commit: false) {
+      begin
         execute "set session authorization #{username}"
         result = yield
+      ensure
         execute "set session authorization #{realuser}"
+      end
 #     }
       result
     end
@@ -1087,7 +1136,7 @@ module PgConn
     # that the transaction timestamp is set to the start of the first
     # transaction even if transactions are nested
     #
-    # FIXME: There is some strange problem in rspec where an #insert handles
+    # FIXME: There is some strange problem in rspec where #insert handles
     # an exception correctly while #exec, #execute, and #transaction does not
     def transaction(commit: true, &block)
       if block_given?

metadata

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