actual_db_schema 0.7.2 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93ad4dbd2993e9e0b42afe547312d0c65027dd94a0bb12ec32bd8db9a054e050
-  data.tar.gz: d7ba34542cd5d9fcc09e6eadeba2147ab00e21245ad41197e9f0697db2c98ba9
+  metadata.gz: 7bae784cf88c546a852fea372e8bcbf1356008bc36c9e63c6ff0e18fb1c06bd6
+  data.tar.gz: 0fc13227fd92ecb46f7d10f16d900477115a2ca960c701a2080d19690f1631d3
 SHA512:
-  metadata.gz: 452cbc36fd51ff0c37e9cc6a4e1bd84ca0ecccee9ba7bb34958c77a96fa7753dc1f02a6d34f4d4bc1e26753f3bf9dfc6c31d9ac4d64a8cd5ad69ea0e4f04a011
-  data.tar.gz: 54a6f8d64cb267b7906b5c375b09074dd3e6dc1acffa99d33b19335143f2ef29b94843b8f9965b1d3eb4c8453dc1dc362da03da50bca428838f497dd98996e80
+  metadata.gz: 226db7dc680bb706a73048c1fec3e52685a1e36ac5d5e2cef82511080234e1cc6b789cb5266ea101669462205823ec565da9b059cc7d4b0752fc4f600f0cfbe2
+  data.tar.gz: 47c936d8bb2cddf627dbb04ab8d3993e71a960363d4472c9ef9fa4b2102b89789fea7257333b6b91e38ffe1a288c52b5e72ef619377c97276684a0f46dd04ee1

data/.rubocop.yml

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

data/Appraisals

@@ -6,3 +6,9 @@
     gem "activesupport", "~> #{version}.0"
   end
 end
+
+appraise "rails.edge" do
+  gem "rails", ">= 7.2.0.beta"
+  gem "activerecord", ">= 7.2.0.beta"
+  gem "activesupport", ">= 7.2.0.beta"
+end

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [0.7.4] - 2024-06-06
+- Rails 7.2 support added
+- Rails 6.0 support added
+
+## [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.4)
       activerecord (>= 6.0.0)
       activesupport (>= 6.0.0)
       csv
@@ -133,6 +133,8 @@ GEM
     net-smtp (0.4.0)
       net-protocol
     nio4r (2.5.9)
+    nokogiri (1.15.4-arm64-darwin)
+      racc (~> 1.4)
     nokogiri (1.15.4-x86_64-darwin)
       racc (~> 1.4)
     nokogiri (1.15.4-x86_64-linux)
@@ -204,6 +206,7 @@ GEM
       parser (>= 3.2.1.0)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
+    sqlite3 (1.6.8-arm64-darwin)
     sqlite3 (1.6.8-x86_64-darwin)
     sqlite3 (1.6.8-x86_64-linux)
     stringio (3.0.8)
@@ -219,6 +222,7 @@ GEM
     zeitwerk (2.6.12)
 
 PLATFORMS
+  arm64-darwin-23
   x86_64-darwin-20
   x86_64-darwin-22
   x86_64-linux

data/README.md

@@ -48,9 +48,11 @@ 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.
+Just run `rails db:migrate` inside the current branch. It will roll back all phantom migrations for all configured databases in your `database.yml.`
 
 > [!WARNING]
 > This solution implies that all migrations are reversible. The irreversible migrations should be solved manually. At the moment, the gem ignores them. You will see warnings in the terminal for each irreversible migrations.
@@ -73,6 +75,26 @@ To release a new version do the following in the order:
 - make the commit and push;
 - run `bundle exec rake release`. This will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
+### Running Tests with Specific Rails Versions
+
+The following versions can be specifically tested using Appraisal
+- 6.0
+- 6.1
+- 7.0
+- 7.1
+- edge
+
+To run tests with a specific version of Rails using Appraisal:
+- Run all tests with Rails 6.0:
+  ```sh
+  bundle exec appraisal rails.6.0 rake test
+- Run tests for a specific file:
+  ```sh
+  bundle exec appraisal rails.6.0 rake test TEST=test/rake_task_test.rb
+- Run a specific test:
+  ```sh
+  bundle exec appraisal rails.6.0 rake test TEST=test/rake_task_test.rb TESTOPTS="--name=/db::db:rollback_branches#test_0003_keeps/"
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/widefix/actual_db_schema. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/widefix/actual_db_schema/blob/master/CODE_OF_CONDUCT.md).

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/gemfiles/rails.edge.gemfile

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", ">= 7.2.0.beta"
+gem "activesupport", ">= 7.2.0.beta"
+gem "minitest", "~> 5.0"
+gem "rake"
+gem "rubocop", "~> 1.21"
+gem "rails", ">= 7.2.0.beta"
+gem "sqlite3"
+
+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
 
@@ -23,10 +19,19 @@ module ActualDbSchema
       end
 
       def context
-        @context ||=
-          ActiveRecord::Base.connection.migration_context.tap do |c|
-            c.extend(ActualDbSchema::Patches::MigrationContext)
-          end
+        @context ||= fetch_migration_context.tap do |c|
+          c.extend(ActualDbSchema::Patches::MigrationContext)
+        end
+      end
+
+      def fetch_migration_context
+        ar_version = Gem::Version.new(ActiveRecord::VERSION::STRING)
+        if ar_version >= Gem::Version.new("7.2.0") ||
+           (ar_version >= Gem::Version.new("7.1.0") && ar_version.prerelease?)
+          ActiveRecord::Base.connection_pool.migration_context
+        else
+          ActiveRecord::Base.connection.migration_context
+        end
       end
     end
   end

data/lib/actual_db_schema/commands/list.rb

@@ -19,11 +19,20 @@ module ActualDbSchema
         puts "\nPhantom migrations\n\n"
         puts "Below is a list of irrelevant migrations executed in unmerged branches."
         puts "To bring your database schema up to date, the migrations marked as \"up\" should be rolled back."
-        puts "\ndatabase: #{ActiveRecord::Base.connection_db_config.database}\n\n"
+        database_path = db_config[:database]
+        puts "\ndatabase: #{database_path}\n\n"
         puts header.join("  ")
         puts "-" * separator_width
       end
 
+      def db_config
+        if ActiveRecord::Base.respond_to?(:connection_db_config)
+          ActiveRecord::Base.connection_db_config.configuration_hash
+        else
+          ActiveRecord::Base.connection_config
+        end
+      end
+
       def separator_width
         header.map(&:length).sum + (header.size - 1) * 2
       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.4"
 end

data/lib/actual_db_schema.rb

@@ -29,12 +29,46 @@ 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
+    if ActiveRecord::Base.respond_to?(:connection_db_config)
+      ActiveRecord::Base.connection_db_config.migrations_paths
+    else
+      ActiveRecord::Base.connection_config[:migrations_paths]
+    end
   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|
+      config = db_config.respond_to?(:config) ? db_config.config : db_config
+      ActiveRecord::Base.establish_connection(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.4
 platform: ruby
 authors:
 - Andrei Kaleshka
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-30 00:00:00.000000000 Z
+date: 2024-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -131,6 +131,7 @@ files:
 - gemfiles/rails.6.1.gemfile
 - gemfiles/rails.7.0.gemfile
 - gemfiles/rails.7.1.gemfile
+- gemfiles/rails.edge.gemfile
 - lib/actual_db_schema.rb
 - lib/actual_db_schema/commands/base.rb
 - lib/actual_db_schema/commands/list.rb
@@ -166,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.21
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Keep your DB and schema.rb consistent in dev branches.