sequel-search-path 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 085c3c7649911aa5244ccd0600b6e0a66cc4e992
-  data.tar.gz: 7f90504ae2b1660dabab063e35d78e44c8662e40
+  metadata.gz: 18c02e68988e33295e7308820956a65f40c666e4
+  data.tar.gz: a8aa4a36a988a10c7cc114508afb40c8625cdd42
 SHA512:
-  metadata.gz: ea1cfbbb79cf053cf739640e2c0fa3b9a96950045acd8e2743712a50e66b859031e6aef8611bc2db4ac245724eb8404e9123c425344caed590a8f15a83ea9aa5
-  data.tar.gz: 721703c73bf2560fa49fdc4e4cd30801cd8cfdf4e5a72a11c3200fa1fe0b6cd8f524599be20c5ec20e7d00d24d5d3648253d7e01d1cf567b00263d41c1b5bc8e
+  metadata.gz: 0ee5a79fc0ccecf3e14d3bbc7e366c0d483a14ba10143228170b1f357a7530cf172eee38c5b020440f40550ed2ca4c09c2fcb7f8e0161a1b4d428a01b9b84a34
+  data.tar.gz: afb99f180818c414602b74e004a72fbf6a13a0dca4de784f01f70af2a8ea686fb7bb356bab49d0723844c67e7de8c78d1e7788198da155b81f7d960a7aa3abbe

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

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

data/lib/sequel/extensions/search_path.rb

@@ -28,7 +28,13 @@ module Sequel
     def schemas=(schemas)
       schemas = schemas.map(&:to_sym).uniq
       Thread.current[schemas_key] = schemas
-      set_search_path(schemas)
+
+      # Set the search_path in Postgres, unless it's in transaction rollback.
+      # If it is, the search_path will be reset for us anyway, and the SQL
+      # call will just raise another error.
+      unless synchronize(&:transaction_status) == PG::PQTRANS_INERROR
+        set_search_path(schemas)
+      end
     end
 
     # The schema that new objects will be created in.
@@ -47,16 +53,6 @@ module Sequel
       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
 
     def schemas_key

metadata

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