ec-pg 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96db794a56eb50815839a716d668cb9cb1309ab19e9a7dca540f72d67c6aa0b3
-  data.tar.gz: 1a5ab8f3fc64bac9aaa3f965bb1698015e2d639af3819077dc051f7ae1bd016c
+  metadata.gz: 927ed76ae446cafa9cfa09623eb2ed3b05adf7973023c21de25353a95e7f59b2
+  data.tar.gz: 59865a939e8b813ec9872d4c27e9e5b7313dae76edf001cc175d79f41f76cb66
 SHA512:
-  metadata.gz: 49b2648cdd99f5849d2aff3cfc55c49711aceef2e6a5d86ea7b66a19c3330daa2a2f3e382927aadd45b9a18d35984b064ed355e761a244b91ebfdaf227d87d06
-  data.tar.gz: 73222c5fb6ef8dce5392fb4bf63a8a9b08fb93fd1d10d85df0648e06e4f18346e949a548ea90ca038112840771f0d403241f5ded7f64dbd9858840d6e6d25029
+  metadata.gz: 2e54504bc522de9c78e56344bae59e0b4661cc4fdce52ebc393ea210ab5c09d1fe1d49e8d7fc49b610f0c3ac729747ec82d028703d41ec9b7fb0650fee0337e9
+  data.tar.gz: 067f8f312bc09007fef2544b45a94f91f7c7e5196dc74101c736bef801875b3795b57f04ec156db2b647bb181acf159e7e6e25a77915d7a01e49786eb84b7978

data/lib/ec/pg/schema_manager.rb

@@ -81,9 +81,12 @@ module Ec
 
       # Builds the search_path string and executes SET search_path on the connection.
       def apply_schema(schema_name)
-        registered_connections.each do |connection|
+        registered_models.each do |model|
+          connection = model.connection
           shared = Ec::Pg.configuration.shared_schemas
           path   = ([schema_name] + shared).uniq.join(", ")
+
+          Ec::Pg.dprint("%s: Switching to schema: %s" % [model, path], color: :green)
           connection.schema_search_path = path
         end
       end
@@ -94,8 +97,10 @@ module Ec
         shared = Ec::Pg.configuration.shared_schemas
         path   = ([default] + shared).uniq.join(", ")
 
-        registered_connections.each do |connection|
+        registered_models.each do |model|
+          connection = model.connection
           if connection && connection.pool.present?
+            Ec::Pg.dprint("%s: Restoring schema to: %s" % [model, path], color: :red)
             connection.schema_search_path = path
           end
         end
@@ -103,10 +108,8 @@ module Ec
         # Swallow errors during cleanup (connection may have been returned to pool)
       end
 
-      def registered_connections
-        Ec::Pg::SchemaMixin
-          .registered_models
-          .map(&:connection)
+      def registered_models
+        Ec::Pg::SchemaMixin.registered_models
       end
 
       # Guards against SQL injection via schema names.
@@ -120,7 +123,7 @@ module Ec
               "Only alphanumeric characters and underscores are allowed."
       end
 
-      module_function :apply_schema, :restore_schema, :validate_schema_name!, :registered_connections
+      module_function :apply_schema, :restore_schema, :validate_schema_name!, :registered_models
     end
   end
 end

data/lib/ec/pg/tenant_context.rb

@@ -20,19 +20,18 @@ module Ec
 
         # Layer composition: innermost layer first so that the outermost wrapper
         # controls the connection that the inner layers receive.
-
         run = block
 
         # 1. Schema (innermost)
         if schema
-          inner_run = run
-          run = -> {SchemaManager.with_schema(schema, &inner_run)}
+          schema_run = run
+          run = -> {SchemaManager.with_schema(schema, &schema_run)}
         end
 
         # 2. Shard (outermost — switches the connection first)
         if shard
-          inner_run = run
-          run = -> {ShardManager.with_shard(shard, &inner_run)}
+          shard_run = run
+          run = -> {ShardManager.with_shard(shard, &shard_run)}
         end
 
         if run.present?

data/lib/ec/pg/version.rb

@@ -2,6 +2,6 @@
 
 module Ec
   module Pg
-    VERSION = "0.1.6"
+    VERSION = "0.1.8"
   end
 end

data/lib/ec/pg.rb

@@ -36,9 +36,9 @@ module Ec
 
     module_function 
 
-    def dprint(*args)
+    def dprint(message, color: :white)
       if ENV['ECPG_DEBUG']
-        puts args
+        puts message.colorize(color)
       end
     end
 

metadata

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