convergence 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdf6c82541efe1895f0e5346134025b161376199
-  data.tar.gz: cb67cd83c49cb3ece78f0b639c9cde1882f7b59e
+  metadata.gz: 454a00b43c4a1430553a68eddaeb73103bad92a5
+  data.tar.gz: 416cda690943feccf3d41226a9573455b7f4779d
 SHA512:
-  metadata.gz: 3d8799c6997f90911cb6e2197f7b091442a93b0015b3baf1420ce355b6541f6a87fd109e75ece21bd153cc1e8770b32398c6ad85b34f4c7c1bad17031daf8b3b
-  data.tar.gz: 2a730487ee76fda3a585c6e62224afbd192c9b86d4942ee56cb21b2cae834aed90fc74b5b47b221104c6a71cdc31231b0ac27c5fccf4274e0b1e1484546a9ef3
+  metadata.gz: c99e127b5dcbecc078f2f1f39ce91a5b720a13761872aecc61ef6c98be9672f79bfd7b6cdf63f9c6acf695a52706abf6faf93043a7881eee9a5b8ddaa362a4d2
+  data.tar.gz: 6bc3eca7161196ebaa4d007f28526c170a56cd3ca205fc661a23fbdb566027568ffe49fb9575d2b01b7bf3e2c9a492eab1d08e26a09816df8a57e252e97a8104

data/Gemfile.lock

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

data/README.md

@@ -296,6 +296,13 @@ create_table "authors", comment: 'Author', engine: 'MyISAM', collate: "utf8_gene
 end
 ```
 
+### auto increment
+
+```
+create_table "orders", auto_increment: 1000 do |t|
+  t.int :id, primary_key: true, extra: :auto_increment
+end
+```
 
 ## Test
 

data/lib/convergence/diff.rb

@@ -154,6 +154,9 @@ class Convergence::Diff
       .reject do |k, v|
         !from.table_options[k].nil? && from.table_options[k].to_s.downcase == v.to_s.downcase
       end
+    if remove_auto_increment_option?(from.table_options[:auto_increment], to.table_options[:auto_increment])
+      change_options.delete(:auto_increment)
+    end
     Hash[change_options]
   end
 
@@ -164,4 +167,9 @@ class Convergence::Diff
   def case_sensitive_column?(column)
     CASE_SENSITIVE_COLUMNS.include?(column)
   end
+
+  def remove_auto_increment_option?(from_value, to_value)
+    return true if from_value.nil? || to_value.nil?
+    from_value >= to_value
+  end
 end

data/lib/convergence/dumper/mysql_schema_dumper.rb

@@ -111,6 +111,7 @@ class Convergence::Dumper::MysqlSchemaDumper
     option.merge!(default_charset: table_option['CHARACTER_SET_NAME'])
     option.merge!(collate: table_option['TABLE_COLLATION'])
     option.merge!(comment: table_option['TABLE_COMMENT'])
+    option.merge!(auto_increment: table_option['AUTO_INCREMENT']) if table_option['AUTO_INCREMENT']
     table.table_options = option
   end
 

data/lib/convergence/sql_generator/mysql_generator.rb

@@ -4,7 +4,8 @@ class SQLGenerator::MysqlGenerator < SQLGenerator
     row_format: 'ROW_FORMAT',
     default_charset: 'DEFAULT CHARACTER SET',
     collate: 'COLLATE',
-    comment: 'COMMENT'
+    comment: 'COMMENT',
+    auto_increment: 'AUTO_INCREMENT'
   }
   QUOTE_OPTION = [:comment]
 

data/lib/convergence/version.rb

@@ -1,3 +1,3 @@
 module Convergence
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

data/spec/fixtures/add_table.schema

@@ -26,3 +26,7 @@ end
 create_table 'dummies', comment: 'Dummy Table' do |t|
   t.int "id", primary_key: true, extra: "auto_increment", comment: 'Hello Convergence'
 end
+
+create_table 'dummies2', auto_increment: 1000 do |t|
+  t.int :id, primary_key: true, extra: :auto_increment
+end

data/spec/integrations/command_dryrun.rb

@@ -72,4 +72,24 @@ describe 'Command::Dryrun#execute' do
       end
     end
   end
+
+  describe 'auto increment' do
+    describe 'create table with auto increment option' do
+      let(:exec_dsl) { 'add_table.schema' }
+      let(:expected_query) do
+      q = <<-QUERY
+# CREATE TABLE `dummies2` (
+#   `id` int(11) NOT NULL AUTO_INCREMENT,
+#   PRIMARY KEY (`id`)
+# ) ENGINE=InnoDB ROW_FORMAT=Compact DEFAULT CHARACTER SET=utf8 AUTO_INCREMENT=1000 COLLATE=utf8_general_ci
+      QUERY
+      q.strip
+      end
+
+      it 'should be create table with auto increment options' do
+        result = execute(exec_dsl)
+        expect(result).to be_include(expected_query)
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: convergence
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Shinsuke Nishio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-08 00:00:00.000000000 Z
+date: 2016-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2