data_migrate 4.0.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 513041c34e205e9f58b811e7b91a667d2383faaf
-  data.tar.gz: e33fbb5f528b37e747639225e7e05d9205ea4019
+  metadata.gz: 6b86644bbbeb24eb00ad86756b55141264c1e4d5
+  data.tar.gz: 7a0e3820c6704f8fb4658366ebdd02b5b98283ad
 SHA512:
-  metadata.gz: 3352d4c800ad8cac090b0b4bb92e3fc646b16a54e871b88138f132b4f825581a42c1f3ff430563d6ed98c559129371e0dd0736466a328518405ddfd920204c3f
-  data.tar.gz: a93f9ed99ab3e6c346dacd1e3d5ce4ecfaf9c80cfa2d66ece9eb9177d72e2dccfdfacc60e0373f138582975bb3170a940e4974d2b5573e751a463d555e650e7d
+  metadata.gz: 8116bd9c3b090995c161f1668a5dc20db9d977c2c4b2fdecbaa303dcf2551ad1fed477d93e6f9caa59a94b094e317f2c1cbda57fcc7ad16ccc576a50c1a2e759
+  data.tar.gz: f4a4bacd929dcbd8b23ffacfe142b0d4a59e5c51f441276a69227fef773d574eb2c84b948b934e43522451b7ddf78ed40af41e8b8085202db91a3b7d86e32f5e

data/Changelog.md

@@ -1,6 +1,18 @@
 Changelog
 =========
 
+## 5.0.0
+
+Remove support for legacy migrations (from v2).
+
+**IMPORTANT**: If you used this gem from before version 2, make sure to run migration script
+
+```
+DataMigrate::LegacyMigrator.new.migrate
+```
+
+**Failure to do so may cause re-running old migrations**
+
 ## 4.0.0
 
 Support for Rails 5.2
@@ -24,7 +36,7 @@ The concept of schema:dump to data migrations, thanks to
 ## 3.2.1
 
 data_migrate table into rails schema dump, thanks to
-[jturkel](https://github.com/jturkel) 
+[jturkel](https://github.com/jturkel)
 
 
 ## 3.2.0

data/README.md

@@ -80,6 +80,10 @@ the gem wrote data migration versions into
 `schema_migrations` table. After the fix, it was corrected to write into
 `data_migrations`.
 
+If you need to use these old migrations, add the following configuration
+
+It is recommended to move all legacy migrations from `schema_migrations` table into `data_migrations` table
+
 This may cause some unintended consequences. See [#22](https://github.com/ilyakatz/data-migrate/issues/22)
 
 #### v1

data/data_migrate.gemspec

@@ -35,7 +35,10 @@ Gem::Specification.new do |s|
 
   s.post_install_message = <<-POST_INSTALL_MESSAGE
 #{"*" * 80}
-data-migrate: --skip-schema-migration option is no longer available as of version 3.0.0
+data-migrate: IMPORTANT: Breaking change introduced for migrations from v2.
+
+Failure to run the migration can have serious consequences.
+See Readme for more info.
 #{"*" * 80}
 POST_INSTALL_MESSAGE
 end

data/lib/data_migrate.rb

@@ -28,3 +28,13 @@ else
 end
 require File.join(File.dirname(__FILE__), "data_migrate", "railtie")
 require File.join(File.dirname(__FILE__), "data_migrate", "tasks/data_migrate_tasks")
+require File.join(File.dirname(__FILE__), "data_migrate", "legacy_migrator")
+
+module DataMigrate
+  include ActiveSupport::Configurable
+  class << self
+    def configure
+      yield config
+    end
+  end
+end

data/lib/data_migrate/data_migrator.rb

@@ -16,6 +16,9 @@ module DataMigrate
       end
     end
 
+    def load_migrated(connection = ActiveRecord::Base.connection)
+      self.class.get_all_versions(connection)
+    end
 
     class << self
       def current_version(connection = ActiveRecord::Base.connection)
@@ -24,16 +27,7 @@ module DataMigrate
 
       def get_all_versions(connection = ActiveRecord::Base.connection)
         if table_exists?(connection, schema_migrations_table_name)
-          # Certain versions of the gem wrote data migration versions into
-          # schema_migrations table. After the fix, it was corrected to write into
-          # data_migrations. However, not to break anything we are going to
-          # get versions from both tables.
-          #
-          # This may cause some problems:
-          # Eg. rake data:versions will show version from the schema_migrations table
-          # which may be a version of actual schema migration and not data migration
-          DataMigrate::DataSchemaMigration.all.map { |x| x.version.to_i }.sort +
-            ActiveRecord::SchemaMigration.all.map { |x| x.version.to_i }.sort
+          DataMigrate::DataSchemaMigration.all.map { |x| x.version.to_i }.sort
         else
           []
         end

data/lib/data_migrate/data_migrator_five.rb

@@ -23,17 +23,8 @@ module DataMigrate
     end
 
     def load_migrated
-      # Certain versions of the gem wrote data migration versions into
-      # schema_migrations table. After the fix, it was corrected to write into
-      # data_migrations. However, not to break anything we are going to
-      # get versions from both tables.
-      #
-      # This may cause some problems:
-      # Eg. rake data:versions will show version from the schema_migrations table
-      # which may be a version of actual schema migration and not data migration
       @migrated_versions =
-        DataMigrate::DataSchemaMigration.normalized_versions.map(&:to_i).sort +
-        ActiveRecord::SchemaMigration.normalized_versions.map(&:to_i).sort
+        DataMigrate::DataSchemaMigration.normalized_versions.map(&:to_i).sort
     end
 
     class << self

data/lib/data_migrate/legacy_migrator.rb

@@ -0,0 +1,22 @@
+module DataMigrate
+  class LegacyMigrator
+    def initialize(migrations_paths = "db/data")
+      @migrations_paths = migrations_paths || "db/data"
+    end
+
+    def migrate
+      dates =
+        DataMigrate::DataMigrator.migrations(@migrations_paths).collect(&:version)
+      legacy = ActiveRecord::SchemaMigration.where(version: dates)
+      legacy.each do |v|
+        begin
+          version = v.version
+          puts "Creating #{version} in data schema"
+          DataMigrate::DataSchemaMigration.create(version: version)
+        rescue ActiveRecord::RecordNotUnique
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/data_migrate/version.rb

@@ -1,3 +1,3 @@
 module DataMigrate
-  VERSION = "4.0.0".freeze
+  VERSION = "5.0.0".freeze
 end

data/lib/generators/data_migration/templates/data_migration.rb

@@ -5,4 +5,4 @@ class <%= migration_class_name %> < <%= migration_base_class_name %>
   def down
     raise ActiveRecord::IrreversibleMigration
   end
-end
+end

data/spec/data_migrate/data_migrator_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe DataMigrate::DataMigrator do
   let(:subject) { DataMigrate::DataMigrator }
@@ -9,6 +9,32 @@ describe DataMigrate::DataMigrator do
     }
   end
 
+  describe :load_migrated do
+    before do
+      allow(subject).to receive(:db_config) { db_config }.at_least(:once)
+      ActiveRecord::Base.establish_connection(db_config)
+      ::ActiveRecord::SchemaMigration.create_table
+      DataMigrate::DataSchemaMigration.create_table
+    end
+
+    after do
+      ActiveRecord::Migration.drop_table("data_migrations")
+      ActiveRecord::Migration.drop_table("schema_migrations")
+    end
+
+    it do
+      subject.assure_data_schema_table
+      DataMigrate::DataSchemaMigration.create(version: 20090000000000)
+      ::ActiveRecord::SchemaMigration.create(version: 20100000000000)
+      DataMigrate::DataSchemaMigration.create(version: 20110000000000)
+      ::ActiveRecord::SchemaMigration.create(version: 20120000000000)
+      migrated = subject.new(:up, []).load_migrated
+      expect(migrated.count).to eq 2
+      expect(migrated).to include 20090000000000
+      expect(migrated).to include 20110000000000
+    end
+  end
+
   describe :assure_data_schema_table do
     before do
       allow(subject).to receive(:db_config) { db_config }.at_least(:once)

data/spec/data_migrate/legacy_migrator_spec.rb

@@ -0,0 +1,50 @@
+require "spec_helper"
+
+describe DataMigrate::LegacyMigrator do
+  let(:context) {
+    DataMigrate::MigrationContext.new("spec/db/data")
+  }
+
+  after do
+    begin
+      ActiveRecord::Migration.drop_table("data_migrations")
+      ActiveRecord::Migration.drop_table("schema_migrations")
+    rescue StandardError
+      nil
+    end
+  end
+
+  before do
+    ActiveRecord::Base.establish_connection(db_config)
+    ActiveRecord::SchemaMigration.create_table
+    DataMigrate::DataSchemaMigration.create_table
+  end
+
+  let(:db_config) do
+    {
+      adapter: "sqlite3",
+      database: "spec/db/test.db"
+    }
+  end
+
+  it "migrate legacy migrations to be in correct table" do
+    DataMigrate::DataSchemaMigration.create_table
+    # simulate creation of legacy data migration when
+    # it was recorded in schema table
+    ActiveRecord::SchemaMigration.create(version: "20091231235959")
+
+    # create one migration in correct place
+    DataMigrate::DataSchemaMigration.create(version: "20171231235959")
+
+    migrated = DataMigrate::DataMigrator .new(:up, []).load_migrated
+    expect(migrated.count).to eq 1
+
+    DataMigrate::LegacyMigrator.new("spec/db/data").migrate
+
+    # after migacy migrator has been run, we should have records
+    # of both migrations
+    migrated = DataMigrate::DataMigrator .new(:up, []).load_migrated
+    expect(migrated.count).to eq 2
+  end
+
+end

data/spec/data_migrate/migration_context_spec.rb

@@ -4,6 +4,9 @@ describe DataMigrate::DataMigrator do
   let(:context) {
     DataMigrate::MigrationContext.new("spec/db/data")
   }
+  let(:schema_context) {
+    ActiveRecord::MigrationContext.new("spec/db/migrate/5.2")
+  }
 
   before do
     unless Rails::VERSION::MAJOR == 5 and
@@ -15,6 +18,7 @@ describe DataMigrate::DataMigrator do
   after do
     begin
       ActiveRecord::Migration.drop_table("data_migrations")
+      ActiveRecord::Migration.drop_table("schema_migrations")
     rescue StandardError
       nil
     end
@@ -33,6 +37,11 @@ describe DataMigrate::DataMigrator do
       ActiveRecord::SchemaMigration.create_table
     end
 
+    after do
+      ActiveRecord::Migration.drop_table("data_migrations")
+      ActiveRecord::Migration.drop_table("schema_migrations")
+    end
+
     it "migrates existing file" do
       context.migrate(nil)
       context.migrations_status
@@ -95,6 +104,16 @@ describe DataMigrate::DataMigrator do
       expect(versions).to include("20091231235959")
     end
 
+    it "rolls back 2 migrations" do
+      context.migrate(nil)
+      schema_context.migrate(nil)
+      expect {
+        context.rollback(2)
+      }.to output(/Undoing SomeName/).to_stdout
+      versions = DataMigrate::DataSchemaMigration.normalized_versions
+      expect(versions.count).to eq(0)
+    end
+
     it "rolls back 2 migrations" do
       context.migrate(nil)
       expect {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data_migrate
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Andrew J Vargo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-03 00:00:00.000000000 Z
+date: 2018-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -203,6 +203,7 @@ files:
 - lib/data_migrate/data_schema.rb
 - lib/data_migrate/data_schema_migration.rb
 - lib/data_migrate/database_tasks.rb
+- lib/data_migrate/legacy_migrator.rb
 - lib/data_migrate/migration.rb
 - lib/data_migrate/migration_context.rb
 - lib/data_migrate/migration_five.rb
@@ -223,6 +224,7 @@ files:
 - spec/data_migrate/data_schema_migration_spec.rb
 - spec/data_migrate/data_spec.rb
 - spec/data_migrate/database_tasks_spec.rb
+- spec/data_migrate/legacy_migrator_spec.rb
 - spec/data_migrate/migration.rb
 - spec/data_migrate/migration_context_spec.rb
 - spec/data_migrate/schema_dumper_spec.rb
@@ -251,7 +253,10 @@ licenses:
 metadata: {}
 post_install_message: |
   ********************************************************************************
-  data-migrate: --skip-schema-migration option is no longer available as of version 3.0.0
+  data-migrate: IMPORTANT: Breaking change introduced for migrations from v2.
+
+  Failure to run the migration can have serious consequences.
+  See Readme for more info.
   ********************************************************************************
 rdoc_options: []
 require_paths:
@@ -277,6 +282,7 @@ test_files:
 - spec/data_migrate/data_schema_migration_spec.rb
 - spec/data_migrate/data_spec.rb
 - spec/data_migrate/database_tasks_spec.rb
+- spec/data_migrate/legacy_migrator_spec.rb
 - spec/data_migrate/migration.rb
 - spec/data_migrate/migration_context_spec.rb
 - spec/data_migrate/schema_dumper_spec.rb