ec-pg 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe77cf4fcd3e6dd213ece5869aa34f8d25114e448b42f428173e2fec8f3160ce
-  data.tar.gz: f84123214c7dcf8d6a8abc0c5e676accf604649cb36d2b214b245b978449c2e4
+  metadata.gz: 96db794a56eb50815839a716d668cb9cb1309ab19e9a7dca540f72d67c6aa0b3
+  data.tar.gz: 1a5ab8f3fc64bac9aaa3f965bb1698015e2d639af3819077dc051f7ae1bd016c
 SHA512:
-  metadata.gz: b9361a94d4f3719a24a6dfda8240dc1c25bb2ce3c4780a4ff1bfa6cc697fba092028925a2803fa8c9818e00e8c32d705174bf459e8e05890bc6e806134c58f2d
-  data.tar.gz: 2b9f3c7caffd8012a41fe60be30ac227c4b98b8e4abcf2c29cfeba016e3f8f629eb7023f63f672c8a6c625689663f86bef9e310046495d7895182c4ce9f539c0
+  metadata.gz: 49b2648cdd99f5849d2aff3cfc55c49711aceef2e6a5d86ea7b66a19c3330daa2a2f3e382927aadd45b9a18d35984b064ed355e761a244b91ebfdaf227d87d06
+  data.tar.gz: 73222c5fb6ef8dce5392fb4bf63a8a9b08fb93fd1d10d85df0648e06e4f18346e949a548ea90ca038112840771f0d403241f5ded7f64dbd9858840d6e6d25029

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(connection, schema_name)
+          with_pool(connection, schema_name) do |pool|
+            pool.migration_context.migrate
+          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
+        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.6"
   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.6
 platform: ruby
 authors:
 - gmhawash