tenant_realm 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec5080c5a6b4e997fd094811df564e8cb6c7520030a1fb0617917a155dd05223
-  data.tar.gz: 159100e048f540997d9e9ffa33ba215c035357573bb297a65afa52bd6547d593
+  metadata.gz: 5b8289d86354fe7ee75ca07d9b04ca4f7193a2bdb12f97e90f06757f6ee4103d
+  data.tar.gz: 8bedca7bab527dd404765ac3d46db39364b9cce22416445f0e701760efdbc757
 SHA512:
-  metadata.gz: 789611a5e9bc41b794a65e39d4d4cb48a69ad6d37a6d1bde72cb10e6f2bf499278f6715c5f50a7ba26023360408919bf921e33e72b9b994263747582eb0e8dc8
-  data.tar.gz: a7dc2cddb27f123a9772bd53d4e4b1f3d39f9f5cad245f83de9329aa9c3bd6acebde917cb42ce84927b12b896396f8837fe715f5f22ede2cbcec365cb2d72bfc
+  metadata.gz: 60b01860846cc2db01b93c8701751bdb5b41f8fc3689b781b5b4a1a88985f7043246c89dd6527e87089560eb04c547cf0e51cd2d221d4c2997e73c524e440808
+  data.tar.gz: 16452e0151f60519c4137730503573b8bc965bb918f00f00805e02ae05584c1c4a7e7942c5ad92f08a5e0b48a0b169a7658cd67dc3b902c07f78a9614193c441

data/lib/tasks/migrate.rake

@@ -5,6 +5,16 @@ namespace :tenant_realm do
   task migrate: :environment do
     tenants = TenantRealm::Tenant.tenants
 
+    puts 'Migrating primary'
+    root_db_config = TenantRealm::DbContext.root_db_config
+    ActiveRecord::Tasks::DatabaseTasks.with_temporary_connection(root_db_config) do
+      ActiveRecord::Tasks::DatabaseTasks.migrate
+      TenantRealm::DbContext.dump_schema(
+        shard: :primary,
+        db_config: root_db_config
+      )
+    end
+
     tenants.each do |tenant|
       shard = TenantRealm::Utils.shard_name_from_tenant(tenant:)
 

data/lib/tenant_realm/cache/kredis_cache.rb

@@ -23,6 +23,8 @@ module TenantRealm
         end
 
         def cache_tenant(tenant)
+          return tenant if tenant.blank?
+
           tenant_unique_keys(tenant).each do |key|
             cached_tenant = tenant_kredis(key)
             cached_tenant.value = tenant

data/lib/tenant_realm/db_context.rb

@@ -55,10 +55,10 @@ module TenantRealm
           YAML.dump(config, f)
         end
 
-        ActiveRecord::Base.configurations.configurations << ActiveRecord::DatabaseConfigurations::HashConfig.new(
-          Rails.env,
+        ActiveRecord::Base.configurations.configurations << build_db_hash_config(
           shard_name,
-          tenant_shard_config
+          tenant_shard_config,
+          Rails.env
         )
 
         sym_shard = shard_name.to_sym
@@ -110,8 +110,30 @@ module TenantRealm
         db_config
       end
 
+      def dump_schema(db_config:, shard:)
+        return unless ActiveRecord.dump_schema_after_migration
+
+        schema_format = ENV.fetch('SCHEMA_FORMAT', ActiveRecord.schema_format).to_sym
+        ActiveRecord::Tasks::DatabaseTasks.dump_schema(
+          build_db_hash_config(
+            shard.to_s,
+            db_config,
+            Rails.env
+          ),
+          schema_format
+        )
+      end
+
       private
 
+      def build_db_hash_config(shard, db_config, env_name = Rails.env)
+        ActiveRecord::DatabaseConfigurations::HashConfig.new(
+          env_name,
+          shard,
+          db_config
+        )
+      end
+
       def build_connected_shards
         @@shards.keys.each_with_object({}) do |shard, shards|
           sym_shard = shard.to_sym

data/lib/tenant_realm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TenantRealm
-  VERSION = '1.0.0'
+  VERSION = '1.0.2'
 end

data/lib/tenant_realm.rb

@@ -33,10 +33,10 @@ module TenantRealm
         identifier = Utils.identifier_resolver(request)
         tenant = Tenant.tenant(identifier)
         db_config = Utils.dig_db_config(tenant:)
-        shard = Utils.shard_name_from_tenant(tenant:)
 
         return :primary if db_config.blank?
 
+        shard = Utils.shard_name_from_tenant(tenant:)
         Config.current.tenant = tenant
         DbContext.add_shard(shard:, db_config:)
         ActiveRecord::Base.connects_to(shards: DbContext.connected_shards)

data/tenant_realm.gemspec

@@ -34,6 +34,10 @@ Gem::Specification.new do |spec|
             .vscode/settings.json
             LICENSE.txt
             lefthook.yml
+            docs/
+            biome.json
+            package.json
+            pnpm-lock.yaml
           ]
         )
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tenant_realm
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Alpha
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-27 00:00:00.000000000 Z
+date: 2024-01-29 00:00:00.000000000 Z
 dependencies: []
 description: Ruby on Rails gem to support multi-tenant
 email: