ec-pg 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe77cf4fcd3e6dd213ece5869aa34f8d25114e448b42f428173e2fec8f3160ce
-  data.tar.gz: f84123214c7dcf8d6a8abc0c5e676accf604649cb36d2b214b245b978449c2e4
+  metadata.gz: 63b59448c98ca14882ddcd20aab8efd9e35c3d970891ca2f97722a539ec31bd1
+  data.tar.gz: 592bba1d9afb65ca9ad8b49baa45b217c0f6872e5558abb90a0044e0e8a7b6ea
 SHA512:
-  metadata.gz: b9361a94d4f3719a24a6dfda8240dc1c25bb2ce3c4780a4ff1bfa6cc697fba092028925a2803fa8c9818e00e8c32d705174bf459e8e05890bc6e806134c58f2d
-  data.tar.gz: 2b9f3c7caffd8012a41fe60be30ac227c4b98b8e4abcf2c29cfeba016e3f8f629eb7023f63f672c8a6c625689663f86bef9e310046495d7895182c4ce9f539c0
+  metadata.gz: 38921ca6212c3e0a5468db148a1b663adccc23c463c8fc12c2b00a497b6696a83109e8b76c2597c947e06afbf1878607beb235532ab2b64157f7497c2d913391
+  data.tar.gz: aa7e5b7f89c86a26c0f1171f227fb4a5664a2fc6d381f263c69368a11347acb8c8571da3b1f22baff9322468d34c5a1e0c9c2e58f15fa0061d0bdc3a5c99472a

data/lib/ec/pg/migrator.rb

@@ -14,9 +14,9 @@ module Ec
           Ec::Pg::SchemaMixin.registered_models.each do |model|
             model.schemas.each do |shard, schemas|
               Ec::Pg.switch(shard: shard) do 
-                schemas.each do |schema|
-                  Ec::Pg.dprint("migrating model: #{model}, shard: #{shard}, schema: #{schema}".red)
-                  migrate_schema(model.connection.pool, schema)
+                schemas.each do |schema_name|
+                  Ec::Pg.dprint("migrating model: #{model}, shard: #{shard}, schema: #{schema_name}".red)
+                  migrate_schema(model.connection, schema_name)
                 end
               end
             end
@@ -29,9 +29,9 @@ module Ec
           Ec::Pg::SchemaMixin.registered_models.each do |model|
             model.schemas.each do |shard, schemas|
               Ec::Pg.switch(shard: shard) do 
-                schemas.each do |schema|
-                  Ec::Pg.dprint("rolling back model: #{model}, shard: #{shard}, schema: #{schema}".red)
-                  rollback_schema(model.connection.pool, schema, steps)
+                schemas.each do |schema_name|
+                  Ec::Pg.dprint("rolling back model: #{model}, shard: #{shard}, schema: #{schema_name}".red)
+                  rollback_schema(model.connection, schema_name, steps)
                 end
               end
             end
@@ -41,16 +41,22 @@ module Ec
 
         private
 
-        def rollback_schema(pool, schema_name, steps)
-          ActiveRecord::Base.establish_connection(pool.db_config)
-          pool.schema_search_path = schema_name
-          pool.migration_context.rollback(steps)
+        def rollback_schema(connection, schema_name, steps)
+          with_pool(connection, schema_name) do |pool|
+            pool.migration_context.rollback(steps)
+          end
         end
 
         def migrate_schema(pool, schema_name)
-          ActiveRecord::Base.establish_connection(pool.db_config)
-          pool.schema_search_path = schema_name
-          pool.migration_context.migrate
+          with_pool(connection, schema_name) do |pool|
+            pool.migration_context.migrate
+          end
+        end
+
+        def with_pool(connection, schema_name)
+          ActiveRecord::Base.establish_connection(connection.pool.db_config)
+          connection.schema_search_path = schema_name
+          yield(connection.pool)
         end
       end
     end

data/lib/ec/pg/version.rb

@@ -2,6 +2,6 @@
 
 module Ec
   module Pg
-    VERSION = "0.1.4"
+    VERSION = "0.1.5"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ec-pg
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - gmhawash