sequel-search-path 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e5ab0d2b8f290a188bd0adea4a7a00b2b0bf69c
-  data.tar.gz: b6def29a652d1403f958dbe8ca69181e0f39bcd6
+  metadata.gz: 085c3c7649911aa5244ccd0600b6e0a66cc4e992
+  data.tar.gz: 7f90504ae2b1660dabab063e35d78e44c8662e40
 SHA512:
-  metadata.gz: 3cd07a78b812eae2c51c7a9affd174d768a42604edb4b8aadd908e9a5dd1b7fbbe3f3fad57a49b247ce2ff5a114bbd15c78c715d8ff3fa35ca087c2ff9347748
-  data.tar.gz: 50ad6bea6a7d819988d2504bb8111c3f9336331d984f2f7a2a672de3ea99a9c7520b871dd1a17da1cc64ca077ae3f6144061155681d42301f478c937c88e2d89
+  metadata.gz: ea1cfbbb79cf053cf739640e2c0fa3b9a96950045acd8e2743712a50e66b859031e6aef8611bc2db4ac245724eb8404e9123c425344caed590a8f15a83ea9aa5
+  data.tar.gz: 721703c73bf2560fa49fdc4e4cd30801cd8cfdf4e5a72a11c3200fa1fe0b6cd8f524599be20c5ec20e7d00d24d5d3648253d7e01d1cf567b00263d41c1b5bc8e

data/lib/sequel/extensions/search_path/version.rb

@@ -2,6 +2,6 @@
 
 module Sequel
   module SearchPath
-    VERSION = '0.0.4'
+    VERSION = '0.1.0'
   end
 end

data/lib/sequel/extensions/search_path.rb

@@ -10,25 +10,13 @@ module Sequel
 
     def override_schema(*new_schemas, &block)
       synchronize do
-        previous_schemas = schemas.dup
+        previous_schemas = schemas
 
         begin
-          schemas.replace new_schemas.map(&:to_sym).uniq
-          set_search_path
+          self.schemas = new_schemas
           yield
         ensure
-          schemas.replace previous_schemas
-
-          begin
-            set_search_path
-          rescue Sequel::DatabaseError
-            # This command will fail if we're in a transaction that the DB
-            # is rolling back due to an error, but in that case, there's no
-            # need to run it anyway (Postgres will reset the search_path for
-            # us). Since there's no way to know whether it will fail until
-            # we try it, and there's nothing to be done with the error it
-            # throws, just ignore it.
-          end
+          self.schemas = previous_schemas
         end
       end
     end
@@ -38,7 +26,9 @@ module Sequel
     end
 
     def schemas=(schemas)
+      schemas = schemas.map(&:to_sym).uniq
       Thread.current[schemas_key] = schemas
+      set_search_path(schemas)
     end
 
     # The schema that new objects will be created in.
@@ -46,19 +36,29 @@ module Sequel
       schemas.first
     end
 
-    def get_search_path
+    def search_path
       self["SHOW search_path"].get
     end
-    alias :show_search_path :get_search_path
+    alias :show_search_path :search_path
+
+    private
 
-    def set_search_path
+    def set_search_path(schemas)
       placeholders = schemas.map{'?'}.join(', ')
       placeholders = "''" if placeholders.empty?
       self["SET search_path TO #{placeholders}", *schemas].get
+    rescue Sequel::DatabaseError => e
+      if e.wrapped_exception.is_a?(PG::InFailedSqlTransaction)
+        # This command will fail if we're in a transaction that the DB is
+        # rolling back due to an error, but in that case, there's no need to run
+        # it anyway (Postgres will reset the search_path for us). Since there's
+        # no way to know whether it will fail until we try it, and there's
+        # nothing to be done with the error it throws, just ignore it.
+      else
+        raise
+      end
     end
 
-    private
-
     def schemas_key
       @schemas_key ||= "sequel-search-path-#{object_id}".to_sym
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel-search-path
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Chris Hanks
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-28 00:00:00.000000000 Z
+date: 2016-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler