actual_db_schema 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93ad4dbd2993e9e0b42afe547312d0c65027dd94a0bb12ec32bd8db9a054e050
-  data.tar.gz: d7ba34542cd5d9fcc09e6eadeba2147ab00e21245ad41197e9f0697db2c98ba9
+  metadata.gz: ca3780aca89ac715ade8441154b10a78b258514b3daa1d23db1ede9d37d63108
+  data.tar.gz: cb4ce56d44d5a5c61d20220ab2ead11830db440438e1dd433d0774cdf23aef97
 SHA512:
-  metadata.gz: 452cbc36fd51ff0c37e9cc6a4e1bd84ca0ecccee9ba7bb34958c77a96fa7753dc1f02a6d34f4d4bc1e26753f3bf9dfc6c31d9ac4d64a8cd5ad69ea0e4f04a011
-  data.tar.gz: 54a6f8d64cb267b7906b5c375b09074dd3e6dc1acffa99d33b19335143f2ef29b94843b8f9965b1d3eb4c8453dc1dc362da03da50bca428838f497dd98996e80
+  metadata.gz: bf59099adf9a660b934fc65c3573460c4034e59876f0770691019799601217b6eeee29b9f3eda43d1ea837380d6da2bb2930819b81dbc9eb334c6bc2f4e4777c
+  data.tar.gz: 8c9f16c0bf8f0571f163bcf07a73fe4b62dc4c031897d2d156e234aac3d4ca749a6380a41e983c5dec722d61909b0aaf09caf1f3b2303f885bc76385da6b1039

data/.rubocop.yml

@@ -24,3 +24,7 @@ Metrics/BlockLength:
 Metrics/MethodLength:
   Exclude:
     -  test/**/*
+
+Metrics/ClassLength:
+  Exclude:
+    -  test/**/*

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## [0.7.3] - 2024-04-06
+- add multipe databases support
+
 ## [0.7.2] - 2024-03-30
 - update title and description in Rubygems
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    actual_db_schema (0.7.2)
+    actual_db_schema (0.7.3)
       activerecord (>= 6.0.0)
       activesupport (>= 6.0.0)
       csv

data/README.md

@@ -48,6 +48,8 @@ And then execute:
 
     $ bundle install
 
+If you cannot commit changes to the repo or Gemfile, consider the local Gemfile installation described in [this post](https://blog.widefix.com/personal-gemfile-for-development/).
+
 ## Usage
 
 Just run `rails db:migrate` inside the current branch.

data/gemfiles/rails.6.0.gemfile

@@ -9,5 +9,6 @@ gem "activesupport", "~> 6.0.0"
 gem "minitest", "~> 5.0"
 gem "rake"
 gem "rubocop", "~> 1.21"
+gem "sqlite3", "~> 1.4.0"
 
 gemspec path: "../"

data/gemfiles/rails.6.1.gemfile

@@ -9,5 +9,6 @@ gem "activesupport", "~> 6.1.0"
 gem "minitest", "~> 5.0"
 gem "rake"
 gem "rubocop", "~> 1.21"
+gem "sqlite3", "~> 1.4.0"
 
 gemspec path: "../"

data/gemfiles/rails.7.0.gemfile

@@ -9,5 +9,6 @@ gem "activesupport", "~> 7.0.0"
 gem "minitest", "~> 5.0"
 gem "rake"
 gem "rubocop", "~> 1.21"
+gem "sqlite3", "~> 1.4.0"
 
 gemspec path: "../"

data/gemfiles/rails.7.1.gemfile

@@ -9,5 +9,6 @@ gem "activesupport", "~> 7.1.0"
 gem "minitest", "~> 5.0"
 gem "rake"
 gem "rubocop", "~> 1.21"
+gem "sqlite3", "~> 1.4.0"
 
 gemspec path: "../"

data/lib/actual_db_schema/commands/base.rb

@@ -9,10 +9,6 @@ module ActualDbSchema
           raise "ActualDbSchema is disabled. Set ActualDbSchema.config[:enabled] = true to enable it."
         end
 
-        if ActiveRecord::Migration.current_version >= 6
-          ActiveRecord::Tasks::DatabaseTasks.raise_for_multi_db(command: "db:rollback_branches")
-        end
-
         call_impl
       end
 

data/lib/actual_db_schema/patches/migration_context.rb

@@ -5,7 +5,6 @@ module ActualDbSchema
     # Add new command to roll back the phantom migrations
     module MigrationContext
       def rollback_branches
-        ActualDbSchema.failed = []
         migrations.reverse_each do |migration|
           migrator = down_migrator_for(migration)
           migrator.extend(ActualDbSchema::Patches::Migrator)

data/lib/actual_db_schema/store.rb

@@ -9,6 +9,7 @@ module ActualDbSchema
 
     def write(filename)
       basename = File.basename(filename)
+      FileUtils.mkdir_p(folder)
       FileUtils.copy(filename, folder.join(basename))
       record_metadata(filename)
     end

data/lib/actual_db_schema/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActualDbSchema
-  VERSION = "0.7.2"
+  VERSION = "0.7.3"
 end

data/lib/actual_db_schema.rb

@@ -29,12 +29,41 @@ module ActualDbSchema
   }
 
   def self.migrated_folder
-    Rails.root.join("tmp", "migrated").tap { |folder| FileUtils.mkdir_p(folder) }
+    migrated_folders.first
+  end
+
+  def self.migrated_folders
+    return [default_migrated_folder] unless migrations_paths
+
+    Array(migrations_paths).map do |path|
+      if path.end_with?("db/migrate")
+        default_migrated_folder
+      else
+        postfix = path.split("/").last
+        Rails.root.join("tmp", "migrated_#{postfix}")
+      end
+    end
+  end
+
+  def self.default_migrated_folder
+    Rails.root.join("tmp", "migrated")
+  end
+
+  def self.migrations_paths
+    ActiveRecord::Base.connection_db_config.migrations_paths
   end
 
   def self.migration_filename(fullpath)
     fullpath.split("/").last
   end
+
+  def self.for_each_db_connection
+    configs = ActiveRecord::Base.configurations.configs_for(env_name: ActiveRecord::Tasks::DatabaseTasks.env)
+    configs.each do |db_config|
+      ActiveRecord::Base.establish_connection(db_config)
+      yield
+    end
+  end
 end
 
 ActiveRecord::MigrationProxy.prepend(ActualDbSchema::Patches::MigrationProxy)

data/lib/tasks/db.rake

@@ -3,13 +3,18 @@
 namespace :db do
   desc "Rollback migrations that were run inside not a merged branch."
   task rollback_branches: :load_config do
-    ActualDbSchema::Commands::Rollback.new.call
+    ActualDbSchema.failed = []
+    ActualDbSchema.for_each_db_connection do
+      ActualDbSchema::Commands::Rollback.new.call
+    end
   end
 
   desc "List all phantom migrations - non-relevant migrations that were run inside not a merged branch."
   task phantom_migrations: :load_config do
-    ActualDbSchema::Commands::List.new.call
+    ActualDbSchema.for_each_db_connection do
+      ActualDbSchema::Commands::List.new.call
+    end
   end
 
-  task _dump: :rollback_branches
+  task "schema:dump" => :rollback_branches
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actual_db_schema
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Andrei Kaleshka
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-30 00:00:00.000000000 Z
+date: 2024-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -166,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.21
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Keep your DB and schema.rb consistent in dev branches.