sequel-postgres-schemata 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d37a44aec26c81236ec3faed93d070e979470d24
-  data.tar.gz: 8f45729d8dfb844871fe82fb87fe2b5887675c56
+  metadata.gz: 82a2bd1a15e792cf64681981c3be64c1e11d71cb
+  data.tar.gz: cedd9abd2407e342c4b5f1e1e8f99dbe20086004
 SHA512:
-  metadata.gz: 97eae6ecccd8c8244812da30778488380b8f8feb947fea5f544e521dc3726af14d53f8f8e74f4026d347cb6d570ea8cf8e4824e27d6ef2f80b8551b68d0653cf
-  data.tar.gz: 2845aa0d56e81c4f164836d51210f1c10cf0661f5a6ed1ac59e33f4fc2af39d0dacef095d1258a89e55e90f14fc394ecd638452ca258b67e256ef1a6e0cefc43
+  metadata.gz: a0774f6ba877d48a5c9c81cb9254768eb7717529fb30362c209e208f054e8fc720a4d8cec06495c7fa76cd9681cad5fb7e3511c21f7e0a4843541c12137f6ad0
+  data.tar.gz: d273ce571db7b5f2e73214a99b3406b01afa3f20e7ac4e1014182766595d411f0c017c403eaa92c3e4e705b0817aeca1fea4ac78b8412e9b04d69c587d753726

data/README.md

@@ -24,12 +24,22 @@ db = Sequel.connect adapter: 'postgres', search_path: %w(foo public)
 db.create_schema :bar
 
 db.search_path # => [:foo, :public]
+
+db.search_path :baz do
+  db.search_path # => [:baz]
+end
+
+db.search_path :baz, prepend: true do
+  db.search_path # => [:baz, :foo, :public]
+end
+
 db.schemata # => [:pg_toast, :pg_temp_1, :pg_toast_temp_1, :pg_catalog, :public, :information_schema, :bar]
 db.current_schemata # => [:public]
 db.search_path = [:bar, :foo, :public]
 db.current_schemata # => [:bar, :public]
 db.rename_schema :bar, :foo
 db.current_schemata # => [:foo, :public]
+
 ```
 
 ## Contributing

data/lib/sequel/postgres/schemata.rb

@@ -15,16 +15,24 @@ module Sequel
         
         # Returns a symbol list containing the current search path.
         # Note that the search path can contain non-existent schematas.
-        def search_path
-          metadata_dataset.with_sql(SHOW_SEARCH_PATH).
-            single_value.scan(SCHEMA_SCAN_RE).flatten.
-            map{|s|s.strip.sub(SCHEMA_SUB_RE, '\1').gsub('""', '"').to_sym}
+        # If given a block and an argument, instead temporarily changes
+        # the search path inside the block. It also accepts several arguments,
+        # in which case it treats them as an array of schemata to put in search path.
+        # If you use prepend: true, it prepends any given schemata to the current search path.
+        def search_path *a, prepend: false, &block
+          if block_given?
+            a = a.flatten
+            a += search_path if prepend
+            run_with_search_path a, &block
+          else
+            get_search_path
+          end
         end
         
         # Sets the search path. Starting with Postgres 9.2 it can contain
         # non-existent schematas.
-        # Accepted formats include a single symbol, a single string (passed
-        # to the server verbatim) and lists of symbols or strings.
+        # Accepted formats include a single symbol, a single string (split on ,)
+        # and lists of symbols or strings.
         def search_path= search_path
           case search_path
           when String
@@ -52,7 +60,20 @@ module Sequel
         end
         
         private
-        
+
+        def get_search_path
+          metadata_dataset.with_sql(SHOW_SEARCH_PATH).
+            single_value.scan(SCHEMA_SCAN_RE).flatten.
+            map{|s|s.strip.sub(SCHEMA_SUB_RE, '\1').gsub('""', '"').to_sym}
+        end
+
+        def run_with_search_path path, &block
+          old_path = search_path
+          self.search_path = path
+          yield
+          self.search_path = old_path
+        end
+
         SHOW_SEARCH_PATH = "SHOW search_path".freeze
         SCHEMA_SCAN_RE = /(?<=\A|,)(".*?"|.*?)(?=,|\z)/.freeze
         SCHEMA_SUB_RE = /\A"(.*)"\z/.freeze

data/lib/sequel/postgres/schemata/version.rb

@@ -1,7 +1,7 @@
 module Sequel
   module Postgres
     module Schemata
-      VERSION = "0.0.4"
+      VERSION = "0.1.0"
     end
   end
 end

data/spec/schemata_spec.rb

@@ -21,6 +21,29 @@ describe Sequel::Postgres::Schemata do
     it "correctly handles the default list" do
       expect(plain_db.search_path).to eq(%i($user public))
     end
+
+    describe "with a block" do
+      it "changes the search path temporarily" do
+        db.search_path :bar do
+          db.search_path.should == %i(bar)
+        end
+        db.search_path.should == %i(foo public)
+      end
+
+      it "accepts symbols as arglist" do
+        db.search_path :bar, :baz do
+          db.search_path.should == %i(bar baz)
+        end
+        db.search_path.should == %i(foo public)
+      end
+
+      it "allows prepending with prepend: true" do
+        db.search_path :bar, prepend: true do
+          db.search_path.should == %i(bar foo public)
+        end
+        db.search_path.should == %i(foo public)
+      end
+    end
   end
   
   describe "#search_path=" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel-postgres-schemata
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Rafał Rzepecki