convergence 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75c8ae12a9ee346dd376ff2dfe6f03451a96aa4dc58acf414f9c0447c3e79bab
-  data.tar.gz: 57e2096d724239594acd415001e801f89f22bba706e3382ccca46dd3309cd5b9
+  metadata.gz: 633f45bac912daa7950afa5535bfd87d13a7b33b25ff72489fb7fa125d0b6bdd
+  data.tar.gz: 392d293827a735cfeb515e878eb6f565d593259d0ff9f36e7aae8c0b4076b1ec
 SHA512:
-  metadata.gz: ca8171ecd7a63c898401fb316be440a1cee97b4cd44d52bda5ac449c608dd54432574aa5ce6e2222fe0d65acac0e89d4ec092eecd6e83cb6a3e9874ffb382cbc
-  data.tar.gz: 3b7ca04775d9e8800a69f6b70034d9d906b8ba679a575603b8d7d5283db2dd031215d50c42e4d16993f2e686c38ba4bb04ffa4d1028eac2f896f52df05c99f31
+  metadata.gz: f4255769af38418d8d336b8db4ef7e1ec2844ed3fbcf99cfd4e4bafa055e9765e5d30aaa92d2962ea8152c0b0688821e632ab71e2700158bcbe2f6a212f06270
+  data.tar.gz: 481f9bbebb0423275c0695445ab065ca6d54771f7dc25f94b005ac2918a1d7ad94730766a0d8a7c869fb76e49d7b6cc8e8da7cfea177d77c6fd2c049dbf0051b

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## Convergence 1.2.0 (August 26, 2026) ##
+
+* Add `renamed_from:` support to detect table/column renames instead of a
+  destructive drop+add, for MySQL, PostgreSQL, and SQLite (PR: #101)
+
+  *nishio-dens*
+
+* Bump rexml to fix CVE-2024-49761 (PR: #103)
+
+  *nishio-dens*
+
 ## Convergence 1.1.0 (August 25, 2026) ##
 
 * Add PostgreSQL support (PR: #93)

data/Gemfile.lock

@@ -1,9 +1,11 @@
 PATH
   remote: .
   specs:
-    convergence (1.1.0)
+    convergence (1.2.0)
+      benchmark
       diff-lcs
       diffy (>= 3.4.2)
+      logger
       mysql2
       pg
       sqlite3
@@ -13,6 +15,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.1)
+    benchmark (0.5.0)
     bigdecimal (4.1.2)
     coderay (1.1.3)
     diff-lcs (1.4.4)
@@ -37,6 +40,7 @@ GEM
     listen (3.3.3)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
+    logger (1.7.0)
     lumberjack (1.2.8)
     method_source (1.1.0)
     mini_portile2 (2.8.9)
@@ -50,7 +54,6 @@ GEM
     parser (3.0.0.0)
       ast (~> 2.4.1)
     pg (1.6.3)
-    pg (1.6.3-x86_64-linux)
     pry (0.16.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -63,7 +66,7 @@ GEM
     regexp_parser (2.0.3)
     reline (0.7.0)
       io-console (~> 0.5)
-    rexml (3.2.5)
+    rexml (3.4.4)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -92,13 +95,11 @@ GEM
     shellany (0.0.1)
     sqlite3 (2.8.1)
       mini_portile2 (~> 2.8.0)
-    sqlite3 (2.8.1-x86_64-linux-gnu)
     thor (1.0.1)
     unicode-display_width (1.7.0)
 
 PLATFORMS
   ruby
-  x86_64-linux
 
 DEPENDENCIES
   convergence!
@@ -110,4 +111,4 @@ DEPENDENCIES
   rubocop
 
 BUNDLED WITH
-   4.0.19
+  4.0.19

data/README.md

@@ -191,7 +191,9 @@ create/drop indexes on an existing table. Changing a column's type/null/default,
 foreign key or primary key on an existing table, all require SQLite's own "rebuild the table" procedure
 (create a new table, copy the data over, drop the old one, rename it), which this adapter does not implement
 yet -- it raises `NotImplementedError` instead of generating SQL that SQLite would reject. Creating a brand new
-table with any of the above (including foreign keys) works fine.
+table with any of the above (including foreign keys) works fine. Renaming a table/column via `renamed_from:`
+(see [Rename tables and columns](#rename-tables-and-columns)) is an exception to this limitation -- SQLite has
+natively supported `RENAME TABLE`/`RENAME COLUMN` since 3.25.0, so it doesn't need the rebuild procedure.
 
 Like PostgreSQL, MySQL-only table options (`engine`, `row_format`, `default_charset`/`character_set`, `collate`,
 table/column `comment`) have no SQLite equivalent and are ignored. `extra: 'auto_increment'` maps to SQLite's
@@ -340,6 +342,33 @@ $ convergence apply example.schema -c database.yml --safe-migration
 
 This also applies to `--dry-run` and `--rollback-dry-run`.
 
+### Rename tables and columns
+
+Without `renamed_from:`, convergence detects a renamed table/column as a drop followed by an add -- which loses
+the data in that table/column. Add `renamed_from:` to the new name so convergence generates `RENAME TABLE`/`RENAME
+COLUMN` instead:
+
+```ruby
+create_table "user_accounts", renamed_from: "users" do |t|
+  t.int "id", primary_key: true, extra: "auto_increment"
+  t.varchar "full_name", limit: 200, renamed_from: "name"
+end
+```
+
+A few things to know:
+
+* When a table or column has `renamed_from:`, **only the rename is applied on that pass** -- any other change to
+  the same table/column (a type change, a new `null`/`default`, ...) is ignored until you run `apply` again. Run
+  `apply` a second time (with `renamed_from:` still in place, or removed) to pick up the rest.
+* `renamed_from:` is safe to leave in the schema file after the rename has been applied -- convergence detects
+  that the target name already exists and treats it as a no-op.
+* Swapping two names (A ↔ B) or chaining renames (A → B → C) in a single `apply` is not supported. Use an
+  intermediate temporary name and apply in multiple steps instead.
+* MySQL's `RENAME COLUMN` requires MySQL 8.0+; there's no fallback for 5.7.
+* `convergence diff`'s pretty-printed output does not yet understand renames -- it will describe a rename as "no
+  change" for the renamed table/column. This is a known limitation, unrelated to the SQL that `apply`/`dry-run`
+  actually generate.
+
 ### Include Other Schema files
 
 ```

data/convergence.gemspec

@@ -24,6 +24,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'diff-lcs'
   spec.add_dependency 'diffy', '>= 3.4.2'
   spec.add_dependency 'thor'
+  spec.add_dependency 'logger'
+  spec.add_dependency 'benchmark'
 
   spec.required_ruby_version = ">= 2.4.0"
 

data/lib/convergence/column.rb

@@ -1,5 +1,5 @@
 class Convergence::Column
-  attr_accessor :type, :column_name, :options
+  attr_accessor :type, :column_name, :options, :renamed_from
 
   COLUMN_TYPE = %i(
     tinyint
@@ -38,6 +38,7 @@ class Convergence::Column
   def initialize(type, column_name, options = {})
     @type = type
     @column_name = column_name
-    @options = options
+    @renamed_from = options[:renamed_from]&.to_s
+    @options = options.reject { |k| k == :renamed_from }
   end
 end

data/lib/convergence/diff.rb

@@ -11,6 +11,9 @@ class Convergence::Diff
   def diff(from_database, to_database)
     delta = {}
     from_database = {} if from_database.nil?
+    delta[:rename_table] = scan_rename_table(from_database, to_database)
+    from_database = from_database.reject { |name, _| delta[:rename_table].key?(name) }
+    to_database = to_database.reject { |name, _| delta[:rename_table].value?(name) }
     delta[:add_table] = scan_add_table(from_database, to_database)
     delta[:remove_table] = scan_remove_table(from_database, to_database)
     change_table = scan_change_table(from_database, to_database)
@@ -24,8 +27,11 @@ class Convergence::Diff
     from = from_table.dup
     to = to_table.dup
     delta = {}
+    delta[:rename_column] = scan_rename_column(from, to)
+    from.columns = from.columns.reject { |name, _| delta[:rename_column].key?(name) }
+    to.columns = to.columns.reject { |name, _| delta[:rename_column].value?(name) }
     delta[:remove_column] = scan_remove_column(from, to)
-    return delta if removed_all_columns?(from, delta)
+    return delta if removed_all_columns?(from_table, delta)
     delta[:add_column] = scan_add_column(from, to)
     delta[:change_column] = scan_change_column(from, to)
     scan_change_order_column(from, to, delta)
@@ -39,6 +45,36 @@ class Convergence::Diff
 
   private
 
+  def scan_rename_table(from, to)
+    renames = {}
+    to.each do |new_name, to_table|
+      old_name = to_table.renamed_from
+      next if old_name.nil?
+      next unless from.key?(old_name)
+      next if from.key?(new_name)
+      if renames.key?(old_name)
+        fail ArgumentError.new("renamed_from '#{old_name}' is specified for multiple tables")
+      end
+      renames[old_name] = new_name
+    end
+    renames
+  end
+
+  def scan_rename_column(from, to)
+    renames = {}
+    to.columns.each do |new_name, to_column|
+      old_name = to_column.renamed_from
+      next if old_name.nil?
+      next unless from.columns.key?(old_name)
+      next if from.columns.key?(new_name)
+      if renames.key?(old_name)
+        fail ArgumentError.new("#{to.table_name}: renamed_from '#{old_name}' is specified for multiple columns")
+      end
+      renames[old_name] = new_name
+    end
+    renames
+  end
+
   def scan_add_table(from, to)
     to.reject { |table_name, _| from.map { |k, _| k }.include?(table_name) }
   end

data/lib/convergence/sql_generator/mysql_generator.rb

@@ -16,6 +16,7 @@ class SQLGenerator::MysqlGenerator < SQLGenerator
   def generate(to_table, delta, original_table, safe_migration: false)
     @original_table = original_table
     sqls = []
+    sqls << rename_table_sqls(delta)
     sqls << change_table_sql(to_table, delta)
     sqls << (safe_migration ? [] : drop_table_sqls(delta))
     sqls << create_table_sqls(delta)
@@ -25,6 +26,12 @@ class SQLGenerator::MysqlGenerator < SQLGenerator
 
   private
 
+  def rename_table_sqls(delta)
+    results = delta[:rename_table].map { |old_name, new_name| %(ALTER TABLE `#{old_name}` RENAME TO `#{new_name}`;) }
+    results << '' unless results.empty?
+    results
+  end
+
   # FIXME: multiple pk change not supported yet
   def change_table_sql(to_table, delta)
     change_table = delta[:change_table]
@@ -36,6 +43,9 @@ class SQLGenerator::MysqlGenerator < SQLGenerator
       table_delta[:remove_index].each do |index_name, _index|
         results << alter_remove_index_sql(table_name, index_name)
       end
+      table_delta[:rename_column].each do |old_name, new_name|
+        results << alter_rename_column_sql(table_name, old_name, new_name)
+      end
       unless table_delta[:remove_column].empty?
         results << alter_remove_columns_sql(table_name, table_delta[:remove_column].values)
       end
@@ -73,6 +83,10 @@ class SQLGenerator::MysqlGenerator < SQLGenerator
     sql
   end
 
+  def alter_rename_column_sql(table_name, old_name, new_name)
+    %(ALTER TABLE `#{table_name}` RENAME COLUMN `#{old_name}` TO `#{new_name}`;)
+  end
+
   def alter_change_column_sql(table_name, column_name, change_column_option, to_table)
     column = to_table[table_name].columns[column_name]
     column.options.merge!(after: change_column_option[:after]) unless change_column_option[:after].nil?

data/lib/convergence/sql_generator/postgres_generator.rb

@@ -37,6 +37,7 @@ class SQLGenerator::PostgresGenerator < SQLGenerator
   def generate(to_table, delta, original_table, safe_migration: false)
     @original_table = original_table
     sqls = []
+    sqls << rename_table_sqls(delta)
     sqls << change_table_sql(to_table, delta)
     sqls << (safe_migration ? [] : drop_table_sqls(delta))
     sqls << create_table_sqls(delta)
@@ -46,6 +47,12 @@ class SQLGenerator::PostgresGenerator < SQLGenerator
 
   private
 
+  def rename_table_sqls(delta)
+    results = delta[:rename_table].map { |old_name, new_name| %(ALTER TABLE "#{old_name}" RENAME TO "#{new_name}";) }
+    results << '' unless results.empty?
+    results
+  end
+
   # FIXME: multiple pk change not supported yet
   def change_table_sql(to_table, delta)
     change_table = delta[:change_table]
@@ -57,6 +64,9 @@ class SQLGenerator::PostgresGenerator < SQLGenerator
       table_delta[:remove_index].each do |index_name, _index|
         results << alter_remove_index_sql(index_name)
       end
+      table_delta[:rename_column].each do |old_name, new_name|
+        results << alter_rename_column_sql(table_name, old_name, new_name)
+      end
       unless table_delta[:remove_column].empty?
         results << alter_remove_columns_sql(table_name, table_delta[:remove_column].values)
       end
@@ -90,6 +100,10 @@ class SQLGenerator::PostgresGenerator < SQLGenerator
     columns.map { |column| %(ALTER TABLE "#{table_name}" DROP COLUMN "#{column.column_name}";) }.join("\n")
   end
 
+  def alter_rename_column_sql(table_name, old_name, new_name)
+    %(ALTER TABLE "#{table_name}" RENAME COLUMN "#{old_name}" TO "#{new_name}";)
+  end
+
   def alter_change_column_sql(table_name, column_name, change_column_option, to_table)
     column = to_table[table_name].columns[column_name]
     column.options.merge!(after: change_column_option[:after]) unless change_column_option[:after].nil?

data/lib/convergence/sql_generator/sqlite_generator.rb

@@ -15,6 +15,7 @@ class SQLGenerator::SqliteGenerator < SQLGenerator
   def generate(to_table, delta, original_table, safe_migration: false)
     @original_table = original_table
     sqls = []
+    sqls << rename_table_sqls(delta)
     sqls << change_table_sql(to_table, delta)
     sqls << (safe_migration ? [] : drop_table_sqls(delta))
     sqls << create_table_sqls(delta)
@@ -24,6 +25,12 @@ class SQLGenerator::SqliteGenerator < SQLGenerator
 
   private
 
+  def rename_table_sqls(delta)
+    results = delta[:rename_table].map { |old_name, new_name| %(ALTER TABLE "#{old_name}" RENAME TO "#{new_name}";) }
+    results << '' unless results.empty?
+    results
+  end
+
   def change_table_sql(to_table, delta)
     change_table = delta[:change_table]
     results = []
@@ -41,6 +48,9 @@ class SQLGenerator::SqliteGenerator < SQLGenerator
       table_delta[:remove_index].each do |index_name, _index|
         results << alter_remove_index_sql(index_name)
       end
+      table_delta[:rename_column].each do |old_name, new_name|
+        results << alter_rename_column_sql(table_name, old_name, new_name)
+      end
       unless table_delta[:remove_column].empty?
         results << alter_remove_columns_sql(table_name, table_delta[:remove_column].values)
       end
@@ -72,6 +82,10 @@ class SQLGenerator::SqliteGenerator < SQLGenerator
     columns.map { |column| %(ALTER TABLE "#{table_name}" DROP COLUMN "#{column.column_name}";) }.join("\n")
   end
 
+  def alter_rename_column_sql(table_name, old_name, new_name)
+    %(ALTER TABLE "#{table_name}" RENAME COLUMN "#{old_name}" TO "#{new_name}";)
+  end
+
   def alter_remove_index_sql(index_name)
     %(DROP INDEX "#{index_name}";)
   end

data/lib/convergence/table.rb

@@ -3,7 +3,7 @@ require 'convergence/index'
 require 'convergence/foreign_key'
 
 class Convergence::Table
-  attr_accessor :table_name, :table_options, :columns, :indexes, :foreign_keys
+  attr_accessor :table_name, :table_options, :columns, :indexes, :foreign_keys, :renamed_from
 
   Convergence::Column::COLUMN_TYPE.each do |column_type|
     define_method "#{column_type}" do |column_name, options = {}|
@@ -46,7 +46,8 @@ class Convergence::Table
 
   def initialize(table_name, options = {})
     @table_name = table_name
-    @table_options = options.reject { |k| k == :id }
+    @renamed_from = options[:renamed_from]&.to_s
+    @table_options = options.reject { |k| k == :id || k == :renamed_from }
     @columns = {}
     @indexes = {}
     @foreign_keys = {}

data/lib/convergence/version.rb

@@ -1,3 +1,3 @@
 module Convergence
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/spec/convergence/diff_spec.rb

@@ -64,6 +64,96 @@ describe Convergence::DSL do
       end
     end
 
+    context 'when a table is renamed' do
+      let(:renamed_table) do
+        Convergence::Table.new('simple_table_renamed', renamed_from: 'simple_table').tap do |t|
+          t.int('id', primary_key: true)
+        end
+      end
+      let(:from_db) do
+        { 'simple_table' => simple_table }
+      end
+      let(:to_db) do
+        { 'simple_table_renamed' => renamed_table }
+      end
+
+      subject { Convergence::Diff.new.diff(from_db, to_db) }
+
+      it 'should detect it as a rename, not add/remove' do
+        expect(subject[:rename_table]).to eq('simple_table' => 'simple_table_renamed')
+        expect(subject[:add_table]).to be_empty
+        expect(subject[:remove_table]).to be_empty
+        expect(subject[:change_table]).to be_empty
+      end
+    end
+
+    context 'when renamed_from references a table that does not exist' do
+      let(:renamed_table) do
+        Convergence::Table.new('simple_table2', renamed_from: 'nonexistent_table').tap do |t|
+          t.int('id', primary_key: true)
+        end
+      end
+      let(:from_db) do
+        { 'simple_table' => simple_table }
+      end
+      let(:to_db) do
+        { 'simple_table' => simple_table, 'simple_table2' => renamed_table }
+      end
+
+      subject { Convergence::Diff.new.diff(from_db, to_db) }
+
+      it 'should fall back to a normal add' do
+        expect(subject[:rename_table]).to be_empty
+        expect(subject[:add_table]['simple_table2']).not_to be_nil
+      end
+    end
+
+    context 'when the renamed_from target already exists (idempotent re-apply)' do
+      let(:renamed_table) do
+        Convergence::Table.new('simple_table2', renamed_from: 'simple_table').tap do |t|
+          t.int('id', primary_key: true)
+        end
+      end
+      let(:from_db) do
+        { 'simple_table' => simple_table, 'simple_table2' => simple_table2 }
+      end
+      let(:to_db) do
+        { 'simple_table' => simple_table, 'simple_table2' => renamed_table }
+      end
+
+      subject { Convergence::Diff.new.diff(from_db, to_db) }
+
+      it 'should be a no-op for the rename' do
+        expect(subject[:rename_table]).to be_empty
+        expect(subject[:add_table]).to be_empty
+        expect(subject[:remove_table]).to be_empty
+        expect(subject[:change_table]).to be_empty
+      end
+    end
+
+    context 'when multiple tables claim the same renamed_from (ambiguous)' do
+      let(:renamed_table1) do
+        Convergence::Table.new('simple_table_a', renamed_from: 'simple_table').tap do |t|
+          t.int('id', primary_key: true)
+        end
+      end
+      let(:renamed_table2) do
+        Convergence::Table.new('simple_table_b', renamed_from: 'simple_table').tap do |t|
+          t.int('id', primary_key: true)
+        end
+      end
+      let(:from_db) do
+        { 'simple_table' => simple_table }
+      end
+      let(:to_db) do
+        { 'simple_table_a' => renamed_table1, 'simple_table_b' => renamed_table2 }
+      end
+
+      it 'should raise an ArgumentError' do
+        expect { Convergence::Diff.new.diff(from_db, to_db) }.to raise_error(ArgumentError)
+      end
+    end
+
     context 'table column are changed' do
       let(:table_from) do
         Convergence::Table.new('table1').tap do |t|
@@ -132,6 +222,23 @@ describe Convergence::DSL do
           expect(included_after_option).to eq false
         end
       end
+
+      context 'all columns are renamed' do
+        let(:table_to) do
+          Convergence::Table.new('table1').tap do |t|
+            t.int('id_rename', primary_key: true, renamed_from: 'id')
+            t.varchar('name_rename', limit: 200, null: false, renamed_from: 'name')
+          end
+        end
+
+        it 'should detect it as a change_table with rename_column, not a drop+add' do
+          results = Convergence::Diff.new.diff({ 'table1' => table_from }, { 'table1' => table_to })
+          expect(results[:add_table]).to be_empty
+          expect(results[:remove_table]).to be_empty
+          expect(results[:change_table]).not_to be_empty
+          expect(results[:change_table]['table1'][:rename_column]).to eq('id' => 'id_rename', 'name' => 'name_rename')
+        end
+      end
     end
   end
 
@@ -248,6 +355,66 @@ describe Convergence::DSL do
       end
     end
 
+    context 'rename column' do
+      let(:table_from) do
+        Convergence::Table.new('table1').tap do |t|
+          t.int('id', primary_key: true)
+          t.varchar('name', limit: 200, null: false)
+        end
+      end
+      let(:table_to) do
+        Convergence::Table.new('table1').tap do |t|
+          t.int('id', primary_key: true)
+          t.varchar('full_name', limit: 200, null: false, renamed_from: 'name')
+        end
+      end
+
+      it 'should detect it as a rename, not remove+add' do
+        expect(results[:rename_column]).to eq('name' => 'full_name')
+        expect(results[:remove_column]).to be_empty
+        expect(results[:add_column]).to be_empty
+      end
+    end
+
+    context 'rename column together with an unrelated change on another column' do
+      let(:table_from) do
+        Convergence::Table.new('table1').tap do |t|
+          t.int('id', primary_key: true)
+          t.varchar('name', limit: 200, null: false)
+        end
+      end
+      let(:table_to) do
+        Convergence::Table.new('table1').tap do |t|
+          t.int('id', primary_key: true)
+          t.varchar('full_name', limit: 300, null: false, renamed_from: 'name')
+        end
+      end
+
+      it 'should detect only the rename, deferring the other change to the next apply pass' do
+        expect(results[:rename_column]).to eq('name' => 'full_name')
+        expect(results[:change_column]).to be_empty
+      end
+    end
+
+    context 'rename the only column in a table' do
+      let(:table_from) do
+        Convergence::Table.new('table1').tap do |t|
+          t.int('id', primary_key: true)
+        end
+      end
+      let(:table_to) do
+        Convergence::Table.new('table1').tap do |t|
+          t.int('identifier', primary_key: true, renamed_from: 'id')
+        end
+      end
+
+      it 'should not be misdetected as removing all columns' do
+        expect(results[:rename_column]).to eq('id' => 'identifier')
+        expect(results[:remove_column]).to be_empty
+        expect(results[:add_column]).to be_empty
+      end
+    end
+
     context 'remove index' do
       let(:table_from) do
         Convergence::Table.new('table1').tap do |t|

data/spec/convergence/table_spec.rb

@@ -26,6 +26,29 @@ describe Convergence::Table do
       table.decimal(dummy_column, default: 1)
       expect(table.columns[dummy_column].options[:default]).to eq(1.0)
     end
+
+    it 'should extract renamed_from into its own accessor' do
+      table.int(dummy_column, renamed_from: 'old_column')
+      expect(table.columns[dummy_column].renamed_from).to eq('old_column')
+      expect(table.columns[dummy_column].options).not_to have_key(:renamed_from)
+    end
+
+    it 'should have a nil renamed_from when not specified' do
+      table.int(dummy_column)
+      expect(table.columns[dummy_column].renamed_from).to be_nil
+    end
+  end
+
+  describe 'renamed_from' do
+    it 'should extract renamed_from into its own accessor' do
+      renamed_table = Convergence::Table.new('new_table', renamed_from: 'old_table')
+      expect(renamed_table.renamed_from).to eq('old_table')
+      expect(renamed_table.table_options).not_to have_key(:renamed_from)
+    end
+
+    it 'should have a nil renamed_from when not specified' do
+      expect(table.renamed_from).to be_nil
+    end
   end
 
   describe '#boolean' do

data/spec/fixtures/postgres/rename_column_on_paper.schema

@@ -0,0 +1,28 @@
+create_table "authors" do |t|
+  t.int "id", primary_key: true, extra: "auto_increment"
+  t.varchar "name", limit: 110
+  t.int "age"
+  t.datetime "created_at", null: true
+  t.datetime "updated_at", null: true
+
+  t.index "created_at", name: "index_authors_on_created_at"
+end
+
+create_table "papers", comment: "Paper" do |t|
+  t.int "id", primary_key: true, extra: "auto_increment"
+  t.varchar "slug", comment: "Slug"
+  t.varchar "title1", limit: 300, comment: "Title 1"
+  t.varchar "title2", limit: 300, comment: "Title 2"
+  t.text "notes", null: true, comment: "Description", renamed_from: "description"
+
+  t.index "slug", name: "index_papers_on_slug", unique: true
+end
+
+create_table "paper_authors", comment: "Paper Author Relation" do |t|
+  t.int "id", primary_key: true, extra: "auto_increment"
+  t.int "paper_id", comment: "Paper id"
+  t.int "author_id", comment: "Paper author id"
+
+  t.foreign_key "author_id", reference: "authors", reference_column: "id", name: "paper_authors_author_id_fk"
+  t.foreign_key "paper_id", reference: "papers", reference_column: "id", name: "paper_authors_paper_id_fk"
+end

data/spec/fixtures/postgres/rename_table.schema

@@ -0,0 +1,28 @@
+create_table "authors" do |t|
+  t.int "id", primary_key: true, extra: "auto_increment"
+  t.varchar "name", limit: 110
+  t.int "age"
+  t.datetime "created_at", null: true
+  t.datetime "updated_at", null: true
+
+  t.index "created_at", name: "index_authors_on_created_at"
+end
+
+create_table "papers", comment: "Paper" do |t|
+  t.int "id", primary_key: true, extra: "auto_increment"
+  t.varchar "slug", comment: "Slug"
+  t.varchar "title1", limit: 300, comment: "Title 1"
+  t.varchar "title2", limit: 300, comment: "Title 2"
+  t.text "description", null: true, comment: "Description"
+
+  t.index "slug", name: "index_papers_on_slug", unique: true
+end
+
+create_table "paper_author_links", comment: "Paper Author Relation", renamed_from: "paper_authors" do |t|
+  t.int "id", primary_key: true, extra: "auto_increment"
+  t.int "paper_id", comment: "Paper id"
+  t.int "author_id", comment: "Paper author id"
+
+  t.foreign_key "author_id", reference: "authors", reference_column: "id", name: "paper_authors_author_id_fk"
+  t.foreign_key "paper_id", reference: "papers", reference_column: "id", name: "paper_authors_paper_id_fk"
+end

data/spec/fixtures/rename_column_to_author.schema

@@ -0,0 +1,26 @@
+create_table "authors", collate: "utf8_general_ci", comment: "" do |t|
+  t.int "id", primary_key: true, extra: "auto_increment"
+  t.varchar "full_name", limit: 110, renamed_from: "name"
+  t.int "age", unsigned: true
+  t.datetime "created_at", null: true
+  t.datetime "updated_at", null: true
+
+  t.index "created_at", name: "index_authors_on_created_at"
+end
+
+create_table "papers", collate: "utf8_general_ci", comment: "Paper" do |t|
+  t.int "id", primary_key: true, extra: "auto_increment"
+  t.varchar "slug", comment: "Slug"
+  t.varchar "title1", limit: 300, comment: "Title 1"
+  t.varchar "title2", limit: 300, comment: "Title 2"
+  t.text "description", null: true, comment: "Description"
+end
+
+create_table "paper_authors", collate: "utf8_general_ci", comment: "Paper Author Relation" do |t|
+  t.int "id", primary_key: true, extra: "auto_increment"
+  t.int "paper_id", comment: "Paper id"
+  t.int "author_id", comment: "Paper author id"
+
+  t.foreign_key "author_id", reference: "authors", reference_column: "id", name: "paper_authors_author_id_fk"
+  t.foreign_key "paper_id", reference: "papers", reference_column: "id", name: "paper_authors_paper_id_fk"
+end

data/spec/fixtures/rename_table.schema

@@ -0,0 +1,26 @@
+create_table "authors", collate: "utf8_general_ci", comment: "" do |t|
+  t.int "id", primary_key: true, extra: "auto_increment"
+  t.varchar "name", limit: 110
+  t.int "age", unsigned: true
+  t.datetime "created_at", null: true
+  t.datetime "updated_at", null: true
+
+  t.index "created_at", name: "index_authors_on_created_at"
+end
+
+create_table "papers", collate: "utf8_general_ci", comment: "Paper" do |t|
+  t.int "id", primary_key: true, extra: "auto_increment"
+  t.varchar "slug", comment: "Slug"
+  t.varchar "title1", limit: 300, comment: "Title 1"
+  t.varchar "title2", limit: 300, comment: "Title 2"
+  t.text "description", null: true, comment: "Description"
+end
+
+create_table "paper_author_links", collate: "utf8_general_ci", comment: "Paper Author Relation", renamed_from: "paper_authors" do |t|
+  t.int "id", primary_key: true, extra: "auto_increment"
+  t.int "paper_id", comment: "Paper id"
+  t.int "author_id", comment: "Paper author id"
+
+  t.foreign_key "author_id", reference: "authors", reference_column: "id", name: "paper_authors_author_id_fk"
+  t.foreign_key "paper_id", reference: "papers", reference_column: "id", name: "paper_authors_paper_id_fk"
+end

data/spec/fixtures/sqlite/rename_column_on_paper.schema

@@ -0,0 +1,28 @@
+create_table "authors" do |t|
+  t.int "id", primary_key: true, extra: "auto_increment"
+  t.varchar "name", limit: 110
+  t.int "age"
+  t.datetime "created_at", null: true
+  t.datetime "updated_at", null: true
+
+  t.index "created_at", name: "index_authors_on_created_at"
+end
+
+create_table "papers" do |t|
+  t.int "id", primary_key: true, extra: "auto_increment"
+  t.varchar "slug", limit: 255
+  t.varchar "title1", limit: 300
+  t.varchar "title2", limit: 300
+  t.text "notes", null: true, renamed_from: "description"
+
+  t.index "slug", name: "index_papers_on_slug", unique: true
+end
+
+create_table "paper_authors" do |t|
+  t.int "id", primary_key: true, extra: "auto_increment"
+  t.int "paper_id"
+  t.int "author_id"
+
+  t.foreign_key "author_id", reference: "authors", reference_column: "id", name: "paper_authors_author_id_fk"
+  t.foreign_key "paper_id", reference: "papers", reference_column: "id", name: "paper_authors_paper_id_fk"
+end

data/spec/fixtures/sqlite/rename_table.schema

@@ -0,0 +1,27 @@
+create_table "authors" do |t|
+  t.int "id", primary_key: true, extra: "auto_increment"
+  t.varchar "name", limit: 110
+  t.int "age"
+  t.datetime "created_at", null: true
+  t.datetime "updated_at", null: true
+
+  t.index "created_at", name: "index_authors_on_created_at"
+end
+
+create_table "papers" do |t|
+  t.int "id", primary_key: true, extra: "auto_increment"
+  t.varchar "slug", limit: 255
+  t.varchar "title1", limit: 300
+  t.varchar "title2", limit: 300
+
+  t.index "slug", name: "index_papers_on_slug", unique: true
+end
+
+create_table "paper_author_links", renamed_from: "paper_authors" do |t|
+  t.int "id", primary_key: true, extra: "auto_increment"
+  t.int "paper_id"
+  t.int "author_id"
+
+  t.foreign_key "author_id", reference: "authors", reference_column: "id", name: "paper_authors_author_id_fk"
+  t.foreign_key "paper_id", reference: "papers", reference_column: "id", name: "paper_authors_paper_id_fk"
+end

data/spec/integrations/command_dryrun.rb

@@ -108,6 +108,28 @@ describe 'Command::Dryrun#execute' do
     end
   end
 
+  describe 'rename column' do
+    let(:exec_dsl) { 'rename_column_to_author.schema' }
+
+    it 'should be output rename column query, not drop+add' do
+      result = execute(exec_dsl)
+      expect(result).to be_include('# ALTER TABLE `authors` RENAME COLUMN `name` TO `full_name`;')
+      expect(result).not_to be_include('DROP COLUMN `name`')
+      expect(result).not_to be_include('ADD COLUMN `full_name`')
+    end
+  end
+
+  describe 'rename table' do
+    let(:exec_dsl) { 'rename_table.schema' }
+
+    it 'should be output rename table query, not drop+add' do
+      result = execute(exec_dsl)
+      expect(result).to be_include('# ALTER TABLE `paper_authors` RENAME TO `paper_author_links`;')
+      expect(result).not_to be_include('DROP TABLE `paper_authors`')
+      expect(result).not_to be_include('CREATE TABLE `paper_author_links`')
+    end
+  end
+
   describe 'auto increment' do
     describe 'create table with auto increment option' do
       let(:exec_dsl) { 'add_table.schema' }

data/spec/postgres_integrations/command_dryrun.rb

@@ -67,6 +67,28 @@ describe 'PostgreSQL Command::Dryrun#execute' do
     end
   end
 
+  describe 'rename column' do
+    let(:exec_dsl) { 'rename_column_on_paper.schema' }
+
+    it 'should be output rename column query, not drop+add' do
+      result = execute(exec_dsl)
+      expect(result).to be_include(%(# ALTER TABLE "papers" RENAME COLUMN "description" TO "notes";))
+      expect(result).not_to be_include('DROP COLUMN "description"')
+      expect(result).not_to be_include('ADD COLUMN "notes"')
+    end
+  end
+
+  describe 'rename table' do
+    let(:exec_dsl) { 'rename_table.schema' }
+
+    it 'should be output rename table query, not drop+add' do
+      result = execute(exec_dsl)
+      expect(result).to be_include(%(# ALTER TABLE "paper_authors" RENAME TO "paper_author_links";))
+      expect(result).not_to be_include('DROP TABLE "paper_authors"')
+      expect(result).not_to be_include('CREATE TABLE "paper_author_links"')
+    end
+  end
+
   describe 'drop foreign key' do
     let(:exec_dsl) { 'drop_foreign_key.schema' }
 

data/spec/sqlite_integrations/command_dryrun.rb

@@ -60,6 +60,28 @@ describe 'SQLite Command::Dryrun#execute' do
     end
   end
 
+  describe 'rename column' do
+    let(:exec_dsl) { 'rename_column_on_paper.schema' }
+
+    it 'should be output rename column query, not drop+add' do
+      result = execute(exec_dsl)
+      expect(result).to be_include(%(# ALTER TABLE "papers" RENAME COLUMN "description" TO "notes";))
+      expect(result).not_to be_include('DROP COLUMN "description"')
+      expect(result).not_to be_include('ADD COLUMN "notes"')
+    end
+  end
+
+  describe 'rename table' do
+    let(:exec_dsl) { 'rename_table.schema' }
+
+    it 'should be output rename table query, not drop+add' do
+      result = execute(exec_dsl)
+      expect(result).to be_include(%(# ALTER TABLE "paper_authors" RENAME TO "paper_author_links";))
+      expect(result).not_to be_include('DROP TABLE "paper_authors"')
+      expect(result).not_to be_include('CREATE TABLE "paper_author_links"')
+    end
+  end
+
   describe 'drop foreign key' do
     let(:exec_dsl) { 'drop_foreign_key.schema' }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: convergence
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Shinsuke Nishio
@@ -93,6 +93,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: benchmark
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -263,14 +291,20 @@ files:
 - spec/fixtures/postgres/drop_foreign_key.schema
 - spec/fixtures/postgres/drop_table.schema
 - spec/fixtures/postgres/remove_columns_to_paper.schema
+- spec/fixtures/postgres/rename_column_on_paper.schema
+- spec/fixtures/postgres/rename_table.schema
 - spec/fixtures/postgres_test_db.sql
 - spec/fixtures/remove_columns_to_paper.schema
+- spec/fixtures/rename_column_to_author.schema
+- spec/fixtures/rename_table.schema
 - spec/fixtures/sqlite/add_columns_to_paper.schema
 - spec/fixtures/sqlite/add_table.schema
 - spec/fixtures/sqlite/change_columns_to_paper.schema
 - spec/fixtures/sqlite/drop_foreign_key.schema
 - spec/fixtures/sqlite/drop_table.schema
 - spec/fixtures/sqlite/remove_columns_to_paper.schema
+- spec/fixtures/sqlite/rename_column_on_paper.schema
+- spec/fixtures/sqlite/rename_table.schema
 - spec/fixtures/sqlite_test_db.sql
 - spec/fixtures/test_db.sql
 - spec/integrations/command_diff.rb
@@ -330,14 +364,20 @@ test_files:
 - spec/fixtures/postgres/drop_foreign_key.schema
 - spec/fixtures/postgres/drop_table.schema
 - spec/fixtures/postgres/remove_columns_to_paper.schema
+- spec/fixtures/postgres/rename_column_on_paper.schema
+- spec/fixtures/postgres/rename_table.schema
 - spec/fixtures/postgres_test_db.sql
 - spec/fixtures/remove_columns_to_paper.schema
+- spec/fixtures/rename_column_to_author.schema
+- spec/fixtures/rename_table.schema
 - spec/fixtures/sqlite/add_columns_to_paper.schema
 - spec/fixtures/sqlite/add_table.schema
 - spec/fixtures/sqlite/change_columns_to_paper.schema
 - spec/fixtures/sqlite/drop_foreign_key.schema
 - spec/fixtures/sqlite/drop_table.schema
 - spec/fixtures/sqlite/remove_columns_to_paper.schema
+- spec/fixtures/sqlite/rename_column_on_paper.schema
+- spec/fixtures/sqlite/rename_table.schema
 - spec/fixtures/sqlite_test_db.sql
 - spec/fixtures/test_db.sql
 - spec/integrations/command_diff.rb