actual_db_schema 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f452edc8daa863317285713926ed63c23141523bb4072d5d92efaf512c95023
-  data.tar.gz: 21d4189566b38353dc93f5f58acec5a343ef8553736f8e119263b4606672082f
+  metadata.gz: 116a62e0bbc1d2f43ad5e7654f732807bb6807520f26f33bfde84889601bb895
+  data.tar.gz: 63c36388ed0efa1d19b9daec936206b6580e22b1b04b25a0db3f058047c34b56
 SHA512:
-  metadata.gz: a591d53c12d6d26993ff7ffaebf12ee4fc2cfd183a04bae10f32d1f7b514dcbdc0b012349f0b2f6fc392d724fcba1ecc6981a6f8f5f0c69222eb0c91290f1397
-  data.tar.gz: c9251df1909fbd42a722ae7f62b3dfbcf40ff5cc669fc3a6eac992a322d91fd96c31d476a6adac0324bf21d9420e2f91bd5f08c910fb833dfb57841af7e84e73
+  metadata.gz: ef27b62051c6183b68a35018b0ed7f402f25f8de2f3d3da8f842b914c13516a49b00ab57687a513bca04b664fc682b40c93c75929e414dfea514c2e0065a68b9
+  data.tar.gz: 7a7f0ce3ef0ce09a5a0ecf90ff0aec292ae6f9ab58050ce946dd849123b36162398592a9249ea9ec4acecbe9cfe2031737cbe16c5c0b5ef89989ebb48237fee9

data/.rubocop.yml

@@ -1,5 +1,9 @@
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.7
+  Exclude:
+    - gemfiles/*
+    - test/dummy_app/**/*
+    - vendor/**/*
 
 Style/StringLiterals:
   Enabled: true
@@ -11,3 +15,12 @@ Style/StringLiteralsInInterpolation:
 
 Layout/LineLength:
   Max: 120
+
+Metrics/BlockLength:
+  Exclude:
+    - test/**/*
+    - actual_db_schema.gemspec
+
+Metrics/MethodLength:
+  Exclude:
+    -  test/**/*

data/Appraisals

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+%w[6.0 6.1 7.0 7.1].each do |version|
+  appraise "rails.#{version}" do
+    gem "activerecord", "~> #{version}.0"
+    gem "activesupport", "~> #{version}.0"
+  end
+end

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [0.6.0] - 2024-01-03
+
+- Added db:phantom_migrations task to display phantom migrations
+- Updated README
+
+## [0.5.0] - 2023-11-06
+
+- Rails 7.1 support added
+
 ## [0.4.0] - 2023-07-05
 
 - rollback migrations in the reversed order

data/Gemfile

@@ -5,8 +5,8 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in actual_db_schema.gemspec
 gemspec
 
-gem "rake", "~> 13.0"
-
+gem "activerecord", "~> 7.1.0"
+gem "activesupport", "~> 7.1.0"
 gem "minitest", "~> 5.0"
-
+gem "rake"
 gem "rubocop", "~> 1.21"

data/Gemfile.lock

@@ -1,61 +1,237 @@
 PATH
   remote: .
   specs:
-    actual_db_schema (0.4.0)
-      activerecord
+    actual_db_schema (0.6.0)
+      activerecord (>= 6.0.0)
+      activesupport (>= 6.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.0.6)
-      activesupport (= 7.0.6)
-    activerecord (7.0.6)
-      activemodel (= 7.0.6)
-      activesupport (= 7.0.6)
-    activesupport (7.0.6)
+    actioncable (7.1.1)
+      actionpack (= 7.1.1)
+      activesupport (= 7.1.1)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+      zeitwerk (~> 2.6)
+    actionmailbox (7.1.1)
+      actionpack (= 7.1.1)
+      activejob (= 7.1.1)
+      activerecord (= 7.1.1)
+      activestorage (= 7.1.1)
+      activesupport (= 7.1.1)
+      mail (>= 2.7.1)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.1.1)
+      actionpack (= 7.1.1)
+      actionview (= 7.1.1)
+      activejob (= 7.1.1)
+      activesupport (= 7.1.1)
+      mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
+      rails-dom-testing (~> 2.2)
+    actionpack (7.1.1)
+      actionview (= 7.1.1)
+      activesupport (= 7.1.1)
+      nokogiri (>= 1.8.5)
+      rack (>= 2.2.4)
+      rack-session (>= 1.0.1)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    actiontext (7.1.1)
+      actionpack (= 7.1.1)
+      activerecord (= 7.1.1)
+      activestorage (= 7.1.1)
+      activesupport (= 7.1.1)
+      globalid (>= 0.6.0)
+      nokogiri (>= 1.8.5)
+    actionview (7.1.1)
+      activesupport (= 7.1.1)
+      builder (~> 3.1)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activejob (7.1.1)
+      activesupport (= 7.1.1)
+      globalid (>= 0.3.6)
+    activemodel (7.1.1)
+      activesupport (= 7.1.1)
+    activerecord (7.1.1)
+      activemodel (= 7.1.1)
+      activesupport (= 7.1.1)
+      timeout (>= 0.4.0)
+    activestorage (7.1.1)
+      actionpack (= 7.1.1)
+      activejob (= 7.1.1)
+      activerecord (= 7.1.1)
+      activesupport (= 7.1.1)
+      marcel (~> 1.0)
+    activesupport (7.1.1)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
+    appraisal (2.5.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
     ast (2.4.2)
+    base64 (0.1.1)
+    bigdecimal (3.1.4)
+    builder (3.2.4)
     concurrent-ruby (1.2.2)
+    connection_pool (2.4.1)
+    crass (1.0.6)
+    date (3.3.3)
+    debug (1.8.0)
+      irb (>= 1.5.0)
+      reline (>= 0.3.1)
+    drb (2.1.1)
+      ruby2_keywords
+    erubi (1.12.0)
+    globalid (1.2.1)
+      activesupport (>= 6.1)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    json (2.6.2)
-    minitest (5.16.3)
-    parallel (1.22.1)
-    parser (3.1.2.1)
+    io-console (0.6.0)
+    irb (1.8.3)
+      rdoc
+      reline (>= 0.3.8)
+    json (2.6.3)
+    language_server-protocol (3.17.0.3)
+    loofah (2.21.4)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.12.0)
+    mail (2.8.1)
+      mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
+    marcel (1.0.2)
+    mini_mime (1.1.5)
+    minitest (5.20.0)
+    mutex_m (0.1.2)
+    net-imap (0.4.4)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.1)
+      timeout
+    net-smtp (0.4.0)
+      net-protocol
+    nio4r (2.5.9)
+    nokogiri (1.15.4-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.15.4-x86_64-linux)
+      racc (~> 1.4)
+    parallel (1.23.0)
+    parser (3.2.2.4)
       ast (~> 2.4.1)
+      racc
+    psych (5.1.1.1)
+      stringio
+    racc (1.7.3)
+    rack (3.0.8)
+    rack-session (2.0.0)
+      rack (>= 3.0.0)
+    rack-test (2.1.0)
+      rack (>= 1.3)
+    rackup (2.1.0)
+      rack (>= 3)
+      webrick (~> 1.8)
+    rails (7.1.1)
+      actioncable (= 7.1.1)
+      actionmailbox (= 7.1.1)
+      actionmailer (= 7.1.1)
+      actionpack (= 7.1.1)
+      actiontext (= 7.1.1)
+      actionview (= 7.1.1)
+      activejob (= 7.1.1)
+      activemodel (= 7.1.1)
+      activerecord (= 7.1.1)
+      activestorage (= 7.1.1)
+      activesupport (= 7.1.1)
+      bundler (>= 1.15.0)
+      railties (= 7.1.1)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
+    railties (7.1.1)
+      actionpack (= 7.1.1)
+      activesupport (= 7.1.1)
+      irb
+      rackup (>= 1.0.0)
+      rake (>= 12.2)
+      thor (~> 1.0, >= 1.2.2)
+      zeitwerk (~> 2.6)
     rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.6.0)
-    rexml (3.2.5)
-    rubocop (1.36.0)
+    rake (13.1.0)
+    rdoc (6.5.0)
+      psych (>= 4.0.0)
+    regexp_parser (2.8.2)
+    reline (0.3.9)
+      io-console (~> 0.5)
+    rexml (3.2.6)
+    rubocop (1.57.2)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.1.2.1)
+      parser (>= 3.2.2.4)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.20.1, < 2.0)
+      rubocop-ast (>= 1.28.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.21.0)
-      parser (>= 3.1.1.0)
-    ruby-progressbar (1.11.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.30.0)
+      parser (>= 3.2.1.0)
+    ruby-progressbar (1.13.0)
+    ruby2_keywords (0.0.5)
+    sqlite3 (1.6.8-x86_64-darwin)
+    sqlite3 (1.6.8-x86_64-linux)
+    stringio (3.0.8)
+    thor (1.3.0)
+    timeout (0.4.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.3.0)
+    unicode-display_width (2.5.0)
+    webrick (1.8.1)
+    websocket-driver (0.7.6)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
+    zeitwerk (2.6.12)
 
 PLATFORMS
   x86_64-darwin-20
+  x86_64-darwin-22
   x86_64-linux
 
 DEPENDENCIES
+  activerecord (~> 7.1.0)
+  activesupport (~> 7.1.0)
   actual_db_schema!
+  appraisal
+  debug
   minitest (~> 5.0)
-  rake (~> 13.0)
+  rails
+  rake
   rubocop (~> 1.21)
+  sqlite3
 
 BUNDLED WITH
    2.3.7

data/README.md

@@ -2,7 +2,37 @@
 
 # ActualDbSchema
 
-Keep Rails DB schema consistent while switching between branches with no additional actions.
+Does switching between branches in your Rails app mess up the DB schema?
+
+Keep the DB schema actual across branches in your Rails project. Just install `actual_db_schema` gem and run `db:migrate` in branches as usual. It automatically rolls back the *phantom migrations* (non-relevant to the current branch). No additional steps are needed.
+
+## Why ActualDbSchema
+
+Still not clear why it's needed? To grasp the purpose of this gem and the issue it addresses, review the problem definition outlined below.
+
+### The problem definition
+
+Imagine you're working on **branch A**. You add a not-null column to a database table with a migration. You run the migration. Then you switch to **branch B**. The code in **branch B** isn't aware of this newly added field. When it tries to write data to the table, it fails with an error `null value provided for non-null field`. Why? The existing code is writing a null value into the column with a not-null constraint.
+
+Here's an example of this error:
+
+    ActiveRecord::NotNullViolation:
+      PG::NotNullViolation: ERROR:  null value in column "log" of relation "check_results" violates not-null constraint
+      DETAIL:  Failing row contains (8, 46, success, 2022-10-16 21:47:21.07212, 2022-10-16 21:47:21.07212, null).
+
+Furthermore, the `db:migrate` task on **branch B** generates an irrelevant diff on the `schema.rb` file, reflecting the new column added in **branch A**.
+
+To fix this, you need to switch back to **branch A**, find the migration that added the problematic field, and roll it back. We'll call it a *phantom migration*. It's a pain, especially if you have a lot of branches in your project because you have to remember which branch the *phantom migration* is in and then manually roll it back.
+
+With `actual_db_schema` gem you don't need to care about that anymore. It saves you time by handling all this dirty work behind the scenes automatically.
+
+### How it solves the issue
+
+This gem stores all run migrations with their code in the `tmp/migrations` folder. Whenever you perform a schema dump, it rolls back the *phantom migrations*.
+
+The *phantom migrations* list is the difference between the migrations you've executed (in the `tmp/migrations` folder) and the current ones (in the `db/migrate` folder).
+
+Therefore, all you do is run rails `db:migrate` in your current branch. `actual_db_schema` will ensure the DB schema is up-to-date. You'll never have an inaccurate `schema.rb` file again.
 
 ## Installation
 
@@ -20,28 +50,14 @@ And then execute:
 
 ## Usage
 
-TLTR; Just run `rails db:migrate` inside the current branch.
-
-In **branch A** I add a mandatory (not null) field into DB via migration and run it.
-Then I switch to another **branch B**. This branch's code is not aware of that field.
-As the result, the code is failing with an error "null value provided for non-null field".
-Moreover, a DB rake task generates a diff on `schema.rb` that's not relevant to this branch.
-I can switch to **branch A** and roll back the migration, but I need to remember that branch or waste time on it.
-
-Some example of this error:
-
-     ActiveRecord::NotNullViolation:
-       PG::NotNullViolation: ERROR:  null value in column "log" of relation "check_results" violates not-null constraint
-       DETAIL:  Failing row contains (8, 46, success, 2022-10-16 21:47:21.07212, 2022-10-16 21:47:21.07212, null).
-
-This gem saves all run migrations inside `tmp/migrations` folder.
-Every run of schema dump (that's a dependency of `db:migrate` task as well) rolls back the "unknown" for the current branch migrations
-looking into the `tmp/migrations` folder.
+Just run `rails db:migrate` inside the current branch.
 
-You just need to run `rails db:migrate` in the current branch to actualize the DB schema. With its hand, you will never have wrongly generated `schema.rb`.
+> [!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.
 
-> **Warning**
-> This solution implies that all migrations are reversible. The cases with irreversible migrations should be solved manually. At the moment, these migrations are ignored by the gem and you will see a warning if some migrations can't roll back automatically.
+The gem offers the following rake tasks that can be manually run according to your preferences:
+- `rails db:rollback_branches` - run it to manually rolls back phantom migrations.
+- `rails db:phantom_migrations` - displays a list of phantom migrations.
 
 ## Development
 

data/Rakefile

@@ -6,11 +6,11 @@ require "rake/testtask"
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"
   t.libs << "lib"
-  t.test_files = FileList["test/**/test_*.rb"]
+  t.test_files = FileList["test/**/test_*.rb", "test/**/*_test.rb"]
 end
 
 require "rubocop/rake_task"
 
 RuboCop::RakeTask.new
 
-task default: %i[test rubocop]
+task default: %i[test]

data/actual_db_schema.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   DESC
   spec.homepage = "https://github.com/widefix/actual_db_schema"
   spec.license = "MIT"
-  spec.required_ruby_version = ">= 2.6.0"
+  spec.required_ruby_version = ">= 2.7.0"
 
   # spec.metadata["allowed_push_host"] = "TODO: Set to your gem server 'https://example.com'"
 
@@ -36,7 +36,13 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   # Uncomment to register a new dependency of your gem
-  spec.add_dependency "activerecord"
+  spec.add_runtime_dependency "activerecord", ">= 6.0.0"
+  spec.add_runtime_dependency "activesupport", ">= 6.0.0"
+
+  spec.add_development_dependency "appraisal"
+  spec.add_development_dependency "debug"
+  spec.add_development_dependency "rails"
+  spec.add_development_dependency "sqlite3"
 
   # For more information and examples about making a new gem, check out our
   # guide at: https://bundler.io/guides/creating_gem.html

data/gemfiles/rails.6.0.gemfile

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 6.0.0"
+gem "activesupport", "~> 6.0.0"
+gem "minitest", "~> 5.0"
+gem "rake"
+gem "rubocop", "~> 1.21"
+
+gemspec path: "../"

data/gemfiles/rails.6.1.gemfile

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 6.1.0"
+gem "activesupport", "~> 6.1.0"
+gem "minitest", "~> 5.0"
+gem "rake"
+gem "rubocop", "~> 1.21"
+
+gemspec path: "../"

data/gemfiles/rails.7.0.gemfile

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 7.0.0"
+gem "activesupport", "~> 7.0.0"
+gem "minitest", "~> 5.0"
+gem "rake"
+gem "rubocop", "~> 1.21"
+
+gemspec path: "../"

data/gemfiles/rails.7.1.gemfile

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 7.1.0"
+gem "activesupport", "~> 7.1.0"
+gem "minitest", "~> 5.0"
+gem "rake"
+gem "rubocop", "~> 1.21"
+
+gemspec path: "../"

data/lib/actual_db_schema/commands/base.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module ActualDbSchema
+  module Commands
+    # Base class for all commands
+    class Base
+      def call
+        unless ActualDbSchema.config.fetch(:enabled, true)
+          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
+
+      private
+
+      def call_impl
+        raise NotImplementedError
+      end
+
+      def context
+        @context ||=
+          ActiveRecord::Base.connection.migration_context.tap do |c|
+            c.extend(ActualDbSchema::Patches::MigrationContext)
+          end
+      end
+    end
+  end
+end

data/lib/actual_db_schema/commands/list.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module ActualDbSchema
+  module Commands
+    # Shows the list of phantom migrations
+    class List < Base
+      private
+
+      def call_impl
+        preambule
+        table
+      end
+
+      def indexed_phantom_migrations
+        @indexed_phantom_migrations ||= context.migrations.index_by { |m| m.version.to_s }
+      end
+
+      def preambule
+        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"
+        puts %(#{"Status".center(8)}  #{"Migration ID".ljust(14)}  Migration File)
+        puts "-" * 50
+      end
+
+      def table
+        context.migrations_status.each do |status, version|
+          migration = indexed_phantom_migrations[version]
+          next unless migration
+
+          puts %(#{status.center(8)}  #{version.to_s.ljust(14)}  #{migration.filename.gsub("#{Rails.root}/", "")})
+        end
+      end
+    end
+  end
+end

data/lib/actual_db_schema/commands/rollback.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module ActualDbSchema
+  module Commands
+    # Rolls back all phantom migrations
+    class Rollback < Base
+      private
+
+      def call_impl
+        context.rollback_branches
+
+        return if ActualDbSchema.failed.empty?
+
+        puts ""
+        puts "[ActualDbSchema] Irreversible migrations were found from other branches. Roll them back or fix manually:"
+        puts ""
+        puts ActualDbSchema.failed.map { |migration| "- #{migration.filename}" }.join("\n")
+        puts ""
+      end
+    end
+  end
+end

data/lib/actual_db_schema/patches/migration_context.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module ActualDbSchema
+  module Patches
+    # 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)
+          migrator.migrate
+        rescue StandardError => e
+          raise unless e.message.include?("ActiveRecord::IrreversibleMigration")
+
+          ActualDbSchema.failed << migration
+        end
+      end
+
+      private
+
+      def down_migrator_for(migration)
+        if ActiveRecord::Migration.current_version < 6
+          ActiveRecord::Migrator.new(:down, [migration], migration.version)
+        elsif ActiveRecord::Migration.current_version < 7.1
+          ActiveRecord::Migrator.new(:down, [migration], schema_migration, migration.version)
+        else
+          ActiveRecord::Migrator.new(:down, [migration], schema_migration, internal_metadata, migration.version)
+        end
+      end
+
+      def migration_files
+        paths = Array(migrations_paths)
+        current_branch_files = Dir[*paths.flat_map { |path| "#{path}/**/[0-9]*_*.rb" }]
+        other_branches_files = Dir["#{ActualDbSchema.migrated_folder}/**/[0-9]*_*.rb"]
+
+        current_branch_file_names = current_branch_files.map { |f| ActualDbSchema.migration_filename(f) }
+        other_branches_files.reject { |f| ActualDbSchema.migration_filename(f).in?(current_branch_file_names) }
+      end
+    end
+  end
+end

data/lib/actual_db_schema/patches/migration_proxy.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module ActualDbSchema
+  module Patches
+    # Records the migration file into the tmp folder after it's been migrated
+    module MigrationProxy
+      def migrate(direction)
+        super(direction)
+        FileUtils.copy(filename, ActualDbSchema.migrated_folder.join(basename)) if direction == :up
+      end
+    end
+  end
+end

data/lib/actual_db_schema/patches/migrator.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module ActualDbSchema
+  module Patches
+    # Run only one migration that's being rolled back
+    module Migrator
+      def runnable
+        migration = migrations.first # there is only one migration, because we pass only one here
+        ran?(migration) ? [migration] : []
+      end
+    end
+  end
+end

data/lib/actual_db_schema/version.rb

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

data/lib/actual_db_schema.rb

@@ -1,8 +1,37 @@
 # frozen_string_literal: true
 
+require "active_record/migration"
 require_relative "actual_db_schema/version"
+require_relative "actual_db_schema/patches/migration_proxy"
+require_relative "actual_db_schema/patches/migrator"
+require_relative "actual_db_schema/patches/migration_context"
+
+require_relative "actual_db_schema/commands/base"
+require_relative "actual_db_schema/commands/rollback"
+require_relative "actual_db_schema/commands/list"
 
 # The main module definition
 module ActualDbSchema
-  require "railtie" if defined?(Rails)
+  raise NotImplementedError, "ActualDbSchema is only supported in Rails" unless defined?(Rails)
+
+  require "railtie"
+
+  class << self
+    attr_accessor :config, :failed
+  end
+
+  self.failed = []
+  self.config = {
+    enabled: Rails.env.development?
+  }
+
+  def self.migrated_folder
+    Rails.root.join("tmp", "migrated").tap { |folder| FileUtils.mkdir_p(folder) }
+  end
+
+  def self.migration_filename(fullpath)
+    fullpath.split("/").last
+  end
 end
+
+ActiveRecord::MigrationProxy.prepend(ActualDbSchema::Patches::MigrationProxy)

data/lib/railtie.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "actual_db_schema"
 require "rails"
 
 module ActualDbSchema

data/lib/tasks/db.rake

@@ -1,96 +1,14 @@
 # frozen_string_literal: true
 
-return unless Rails.env.development?
-
-require "active_record/migration"
-
-def migrated_folder
-  Rails.root.join("tmp", "migrated").tap { |folder| FileUtils.mkdir_p(folder) }
-end
-
-def migration_filename(fullpath)
-  fullpath.split("/").last
-end
-
-# All patches are namespaced into this module
-module ActualDbSchema
-  class << self
-    attr_accessor :failed
-  end
-
-  self.failed = []
-
-  # Track migrated migrations inside the tmp folder
-  module MigrationProxyPatch
-    def migrate(direction)
-      super(direction)
-      FileUtils.copy(filename, migrated_folder.join(basename)) if direction == :up
-    end
-  end
-
-  # Run only one migration that's being rolled back
-  module MigratorPatch
-    def runnable
-      migration = migrations.first # there is only one migration, because we pass only one here
-      ran?(migration) ? [migration] : []
-    end
-  end
-
-  # Add new command to roll back the phantom migrations
-  module MigrationContextPatch
-    def rollback_branches
-      migrations.reverse_each do |migration|
-        migrator = down_migrator_for(migration)
-        migrator.extend(ActualDbSchema::MigratorPatch)
-        migrator.migrate
-      rescue StandardError => e
-        raise unless e.message.include?("ActiveRecord::IrreversibleMigration")
-
-        ActualDbSchema.failed << migration
-      end
-    end
-
-    private
-
-    def down_migrator_for(migration)
-      if ActiveRecord::Migration.current_version < 6
-        ActiveRecord::Migrator.new(:down, [migration], migration.version)
-      else
-        ActiveRecord::Migrator.new(:down, [migration], schema_migration, migration.version)
-      end
-    end
-
-    def migration_files
-      paths = Array(migrations_paths)
-      current_branch_files = Dir[*paths.flat_map { |path| "#{path}/**/[0-9]*_*.rb" }]
-      other_branches_files = Dir["#{migrated_folder}/**/[0-9]*_*.rb"]
-
-      current_branch_file_names = current_branch_files.map { |f| migration_filename(f) }
-      other_branches_files.reject { |f| migration_filename(f).in?(current_branch_file_names) }
-    end
-  end
-end
-
-ActiveRecord::MigrationProxy.prepend(ActualDbSchema::MigrationProxyPatch)
-
 namespace :db do
   desc "Rollback migrations that were run inside not a merged branch."
   task rollback_branches: :load_config do
-    if ActiveRecord::Migration.current_version >= 6
-      ActiveRecord::Tasks::DatabaseTasks.raise_for_multi_db(command: "db:rollback_branches")
-    end
+    ActualDbSchema::Commands::Rollback.new.call
+  end
 
-    context = ActiveRecord::Base.connection.migration_context
-    context.extend(ActualDbSchema::MigrationContextPatch)
-    context.rollback_branches
-    if ActualDbSchema.failed.any?
-      puts ""
-      puts "[ActualDbSchema] Irreversible migrations were found from other branches. Roll them back or fix manually:"
-      puts ""
-      puts ActualDbSchema.failed.map { |migration| "- #{migration.filename}" }.join("\n")
-      puts ""
-    end
-    # raise ActualDbSchema.failed.inspect
+  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
   end
 
   task _dump: :rollback_branches

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actual_db_schema
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Andrei Kaleshka
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-05 00:00:00.000000000 Z
+date: 2024-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,9 +16,79 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.0.0
   type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.0
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.0
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: debug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -35,6 +105,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".rubocop.yml"
+- Appraisals
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -43,7 +114,17 @@ files:
 - README.md
 - Rakefile
 - actual_db_schema.gemspec
+- gemfiles/rails.6.0.gemfile
+- gemfiles/rails.6.1.gemfile
+- gemfiles/rails.7.0.gemfile
+- gemfiles/rails.7.1.gemfile
 - lib/actual_db_schema.rb
+- lib/actual_db_schema/commands/base.rb
+- lib/actual_db_schema/commands/list.rb
+- lib/actual_db_schema/commands/rollback.rb
+- lib/actual_db_schema/patches/migration_context.rb
+- lib/actual_db_schema/patches/migration_proxy.rb
+- lib/actual_db_schema/patches/migrator.rb
 - lib/actual_db_schema/version.rb
 - lib/railtie.rb
 - lib/tasks/db.rake
@@ -63,14 +144,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.21
 signing_key:
 specification_version: 4
 summary: Keep your DB clean and consistent between branches.