convergence 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 250c3b5fc317a0e1cefe3cec1e0db3bcaf5909b4
-  data.tar.gz: 89758911b5fbbb7273f8bca63f077afd38c4aa1d
+  metadata.gz: 6e59c90548033df0d06ce497a7adab3c2b921c58
+  data.tar.gz: 626f2ad1f787eb43eb14ed04879bc371098d969a
 SHA512:
-  metadata.gz: e7a1d469158863a27d516ab7e8af3f19dbbd7031bc6f122233a4a6e5978431c784c6aa69e4a492c8d25a212d8910ef55fb8365d84b6aa4ae132a76917af6c317
-  data.tar.gz: 8bd402c806647e1e8c72c200e381a82a206094be6db93b3e15ba108e4ca82c81a38964100cfc8c720b34c9c7b854cc993d3f73c61ec0f4996237109ede345b62
+  metadata.gz: 48f0400326373ef4948cf104bbf585dc0e3e02e1a2f08da5353ef54b4f776ed36c4a2b6bd994c0b67e04307abfda7f79a8577cfb0c55f6f23f6773a49e6b5f33
+  data.tar.gz: bfb521f59e1cc1cc3599ee0f6df18a55ce54ba9a45fe81728c01fb4080185b28f6efc66e48c14bd572de33138a66118c77e9218e57b4dab18fdda47589886b27

data/Gemfile.lock

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

data/lib/convergence/dumper/mysql_schema_dumper.rb

@@ -54,7 +54,7 @@ class Convergence::Dumper::MysqlSchemaDumper
   def select_index_definitions(database_name)
     mysql.query("
       SELECT
-        DISTINCT S.TABLE_NAME, S.COLUMN_NAME, S.NON_UNIQUE, S.INDEX_NAME, S.SEQ_IN_INDEX, S.INDEX_TYPE,
+        DISTINCT S.TABLE_NAME, S.COLUMN_NAME, S.SUB_PART, S.NON_UNIQUE, S.INDEX_NAME, S.SEQ_IN_INDEX, S.INDEX_TYPE,
         IF(TC.CONSTRAINT_TYPE IS NULL, 'INDEX', TC.CONSTRAINT_TYPE) CONSTRAINT_TYPE,
         KCU.REFERENCED_TABLE_NAME, KCU.REFERENCED_COLUMN_NAME
       FROM
@@ -132,6 +132,8 @@ class Convergence::Dumper::MysqlSchemaDumper
       when 'INDEX', 'UNIQUE'
         options = { name: index_name, type: indexes.first['INDEX_TYPE'] }
         options.merge!(unique: true) if type == 'UNIQUE'
+        length = indexes.reject { |v| v['SUB_PART'].nil? }.reduce({}) { |a, e| a[e['COLUMN_NAME']] = e['SUB_PART']; a }
+        options.merge!(length: length) unless length.empty?
         table.index(columns, options)
       when 'FOREIGN KEY'
         to_table = indexes.first['REFERENCED_TABLE_NAME']

data/lib/convergence/index.rb

@@ -5,5 +5,31 @@ class Convergence::Index
     @index_name = index_name
     @index_columns = [index_columns].flatten.map(&:to_s)
     @options = { name: @index_name }.merge(options)
+    length = @options[:length]
+    case length
+    when Hash
+      @options[:length] = Hash[length.map { |k, v| [k.to_s, v] }]
+    when Fixnum
+      @options[:length] = Hash[@index_columns.map { |col| [col, length] }]
+    end
+  end
+
+  def quoted_columns
+    option_strings = Hash[@index_columns.map { |name| [name, ''] }]
+    option_strings = add_index_length(option_strings, @index_columns, @options)
+    @index_columns.map { |name| quote_column_name(name) + option_strings[name] }
+  end
+
+  private
+
+  def quote_column_name(name)
+    "`#{name.to_s.gsub('`', '``')}`"
+  end
+
+  def add_index_length(option_strings, column_names, options = {})
+    if length = options[:length]
+      column_names.each { |name| option_strings[name] += "(#{length[name]})" if length.has_key?(name) && !length[name].nil? }
+    end
+    option_strings
   end
 end

data/lib/convergence/sql_generator/mysql_generator.rb

@@ -99,7 +99,7 @@ class SQLGenerator::MysqlGenerator < SQLGenerator
   def alter_add_index_sql(table_name, index)
     sql = 'CREATE'
     sql += ' UNIQUE' if index.options[:unique]
-    sql += " INDEX `#{index.index_name}` ON `#{table_name}`(#{index.index_columns.join(',')});"
+    sql += " INDEX `#{index.index_name}` ON `#{table_name}`(#{index.quoted_columns.join(',')});"
     sql
   end
 

data/lib/convergence/version.rb

@@ -1,3 +1,3 @@
 module Convergence
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: convergence
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Shinsuke Nishio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-10 00:00:00.000000000 Z
+date: 2015-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2