convergence 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b34f5192771fd3c057fa0d11d63f09b3d46ca190
-  data.tar.gz: 204a4388242da4f35c5e17f3b837438981120b2a
+  metadata.gz: 31b591ac5f9afe5f6f73bdbbbb42378929607426
+  data.tar.gz: 3a86d9868b9c825d7b4ddc1b3dfb6a5997950897
 SHA512:
-  metadata.gz: c76166ec688cfaba2225b8225e4077d0f58901c238b1cc8dff75f9c70537e727f9ceca298c870d7cd1c79b24c5d7641aafe863ca33d4ad3643347a42ca934023
-  data.tar.gz: d5201425e466cca3cd467a415a07bbe1355729eda222ea715ccb8d313a38f3aa01aba8dca99b50b4383e11d4fd72dd0f83d937ae1aa068a7b20c04e6efa28441
+  metadata.gz: bb0c1a6e8f2456dbbfd858efcf3e0bac1ce10d75e6098eea8cc9835d5f247b4e677e51b4b0ddc671e311c7773c9f3ac7ffbedeea39248d5cc6a8679c7bac0fbf
+  data.tar.gz: 252b96343e6936c1850446c0ab3b43efc2db1d734fa7b841e64eda9b4644b18f4a053cda78806d2e7e369f948c67c489e51c870af7f8478b503c4b063637960b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    convergence (0.0.7)
+    convergence (0.0.8)
       diff-lcs
       diffy
       mysql2

data/lib/convergence/command/apply.rb

@@ -48,6 +48,6 @@ SET FOREIGN_KEY_CHECKS=1;
     input_tables_with_full_option =
       Convergence::DefaultParameter.append_database_default_parameter(input_tables, database_adapter)
     delta = Convergence::Diff.new.diff(current_tables_with_full_option, input_tables_with_full_option)
-    sql_generator.generate(input_tables_with_full_option, delta)
+    sql_generator.generate(input_tables_with_full_option, delta, current_tables_with_full_option)
   end
 end

data/lib/convergence/dumper/mysql_schema_dumper.rb

@@ -119,6 +119,7 @@ class Convergence::Dumper::MysqlSchemaDumper
   end
 
   def parse_indexes(table, table_indexes)
+    return if table_indexes.nil?
     table_indexes.group_by { |r| r['INDEX_NAME'] }.each do |index_name, indexes|
       type = indexes.first['CONSTRAINT_TYPE']
       columns = indexes.map { |v| v['COLUMN_NAME'] }

data/lib/convergence/sql_generator/mysql_generator.rb

@@ -8,7 +8,10 @@ class SQLGenerator::MysqlGenerator < SQLGenerator
   }
   QUOTE_OPTION = [:comment]
 
-  def generate(to_table, delta)
+  attr_reader :original_table
+
+  def generate(to_table, delta, original_table)
+    @original_table = original_table
     sqls = []
     sqls << change_table_sql(to_table, delta)
     sqls << ['']
@@ -63,7 +66,17 @@ class SQLGenerator::MysqlGenerator < SQLGenerator
   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?
-    %(ALTER TABLE `#{table_name}` MODIFY COLUMN #{create_column_sql(column, output_primary_key: true)};)
+    sql = ""
+    original_column = original_table[table_name].columns[column_name]
+    if original_column.options[:primary_key]
+      extra = original_column.options[:extra]
+      if extra && extra.upcase.include?('AUTO_INCREMENT')
+        sql += %(ALTER TABLE `#{table_name}` MODIFY COLUMN #{create_column_sql(original_column, output_auto_increment: false)};\n)
+      end
+      sql += %(ALTER TABLE `#{table_name}` DROP PRIMARY KEY;\n)
+    end
+    sql += %(ALTER TABLE `#{table_name}` MODIFY COLUMN #{create_column_sql(column, output_primary_key: true)};)
+    sql
   end
 
   def alter_change_table_sql(table_name, change_table_option)
@@ -131,7 +144,7 @@ DROP TABLE `#{table_name}`;
     end
   end
 
-  def create_column_sql(column, output_primary_key: false)
+  def create_column_sql(column, output_primary_key: false, output_auto_increment: true)
     sql = "`#{column.column_name}`"
     sql += " #{column.type}"
     sql += "(#{column.options[:limit]})" unless column.options[:limit].nil?
@@ -159,7 +172,11 @@ DROP TABLE `#{table_name}`;
       sql += " COMMENT '#{column.options[:comment]}'"
     end
     if column.options[:extra]
-      sql += " #{column.options[:extra].upcase}"
+      if output_auto_increment
+        sql += " #{column.options[:extra].upcase}"
+      else
+        sql += " #{column.options[:extra].upcase.sub('AUTO_INCREMENT', '')}"
+      end
     end
     if column.options.keys.include?(:after)
       if column.options[:after].nil?

data/lib/convergence/version.rb

@@ -1,3 +1,3 @@
 module Convergence
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: convergence
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Shinsuke Nishio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-16 00:00:00.000000000 Z
+date: 2015-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2