convergence 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9130e6ef267081dbba7479257213ee22b64f07a0
-  data.tar.gz: abbc5c42a8878c12bff46f826f26d302bcdf6dcd
+  metadata.gz: 7a6273e5e301b4140467d1ffbfa4144cc8aaa1e9
+  data.tar.gz: 7525bf62a8d3516f0eb00ccff2f6165d0300af0c
 SHA512:
-  metadata.gz: 130bbaa624388d12378d21c6d81592cb4ad01773f55c0fc5b61debe45e806fec9c4a1cd419bf66d51ccf8803b69131ca261820b3111b95f49ee757bf235b865d
-  data.tar.gz: c475b7d7b0db6c995f412e30c46eafe97797ee367b507b5d66112f88a5b8d8172cb45fc90c3e4d646bfbe093c4bb052c51fd3b3e8c00dadae909b5b6d1dc79c7
+  metadata.gz: db1e0e2a7b864f64ec3cccf3b52e681b85f9fd97d8eac57d915e4975d1bceb373b36508c784ddaa799cde6457082e71e5723165caa19f1b8f8fa163d04308541
+  data.tar.gz: 7c4aa29eb5cfda6dc6b3a5d0c9a53929b36218aa5e42af4e23ccb8c46c80bf0d6c3abaab622864ded1b86b851e6424dfcc47f49e4777e7eb7957e9cd3ffc4d73

data/CHANGELOG.md

@@ -0,0 +1,48 @@
+## Convergence 0.2.4 (December 20, 2017) ##
+
+* Bug Fix default: "" to default: nil does not work fine
+
+  *nishio-dens*
+
+## Convergence 0.2.3 (November 29, 2017) ##
+
+* Change default column limit (PR: #31)
+
+  Example:
+      
+      # Schema
+      create_table "sample" do |t|
+        t.tinyint :t
+        t.smallint :s
+        t.mediumint :m
+        t.int :i
+        t.bigint :b
+      end
+
+      # Before
+      CREATE TABLE `sample` (
+        `t` tinyint(3) NOT NULL,
+        `s` smallint(5) NOT NULL,
+        `m` mediumint(8) NOT NULL,
+        `i` int(11) NOT NULL,
+        `b` bigint(19) NOT NULL
+      ) ENGINE=InnoDB ROW_FORMAT=Compact DEFAULT CHARACTER SET=utf8 COLLATE=utf8_general_ci;
+
+      # After
+      CREATE TABLE `sample` (
+        `t` tinyint(4) NOT NULL,
+        `s` smallint(6) NOT NULL,
+        `m` mediumint(9) NOT NULL,
+        `i` int(11) NOT NULL,
+        `b` bigint(20) NOT NULL
+      ) ENGINE=InnoDB ROW_FORMAT=Compact DEFAULT CHARACTER SET=utf8 COLLATE=utf8_general_ci;
+
+  *yujideveloper*
+
+* Change supported ruby version from 2.0.0 to 2.4.1 (PR: #35)
+
+  *nishio-dens*
+
+* Fix Deprecated Warnings (PR: #36)
+
+  *nishio-dens*

data/Gemfile.lock

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

data/README.md

@@ -1,12 +1,13 @@
 # Convergence
 
-Convergence is a Database Schema management tools.
+Convergence is a pure-Ruby database schema migration tool.
 Currently, This tools is support only MySQL.
 
 It defines DB Schema using Convergence DSL(like Rails DSL).
 For more information about Convergence DSL, See below 'Detail About Convergence DSL'.
 
 
+[![Gem Version](https://badge.fury.io/rb/convergence.svg)](https://badge.fury.io/rb/convergence)
 [![Build Status](https://travis-ci.org/nishio-dens/convergence.svg?branch=master)](https://travis-ci.org/nishio-dens/convergence)
 
 ## Installation

data/lib/convergence/default_parameter/mysql_default_parameter.rb

@@ -120,7 +120,7 @@ class Convergence::DefaultParameter::MysqlDefaultParameter
   def remove_index_default_parameter(table)
     table.indexes.each do |_, va|
       va.options.each do |k, v|
-        if !DEFAULT_INDEX_PARAMETERS[k].nil? && DEFAULT_INDEX_PARAMETERS[k].downcase == v.to_s.downcase
+        if !DEFAULT_INDEX_PARAMETERS[k].nil? && DEFAULT_INDEX_PARAMETERS[k].to_s.downcase == v.to_s.downcase
           va.options.delete(k)
         end
       end

data/lib/convergence/diff.rb

@@ -79,12 +79,12 @@ class Convergence::Diff
           to_column_option_with_type = (from_column.options.map { |k, _v| { k => nil } }.reduce { |a, e| a.merge(e) } || {})
             .merge(to_column.options)
             .merge(type: to_column.type)
-            .map { |k, v| [k, case_sensitive_column?(k) ? v.to_s : v.to_s.downcase] }
+            .map { |k, v| [k, case_sensitive_column?(k) ? v&.to_s : v&.to_s&.downcase] }
             .to_a
           from_column_option_with_type = from_column
             .options
             .merge(type: from_column.type)
-            .map { |k, v| [k, case_sensitive_column?(k) ? v.to_s : v.to_s.downcase] }
+            .map { |k, v| [k, case_sensitive_column?(k) ? v&.to_s : v&.to_s.downcase] }
             .to_a
           { column_name => Hash[(to_column_option_with_type - from_column_option_with_type)] }
         end

data/lib/convergence/dumper.rb

@@ -6,7 +6,7 @@ class Convergence::Dumper
   end
 
   def dump_table_dsl(table)
-    table_argument = ["\"#{table.table_name}\""]
+    table_argument = [":#{table.table_name}"]
     table_argument << table.table_options.map { |k, v| key_value_text(k, v) }
     dsl = "create_table #{table_argument.flatten.join(', ')} do |t|\n"
     dsl += "  #{table.columns.map { |_, column| dump_column(column) }.join("\n  ")}"
@@ -27,33 +27,45 @@ class Convergence::Dumper
   private
 
   def dump_column(column)
-    argument = [%("#{column.column_name}")]
-    argument << column.options.map { |k, v| key_value_text(k, v) }
-    "t.#{column.type} #{argument.flatten.join(', ')}"
+    argument = [%(:#{column.column_name})]
+    case [column.type, column.options[:limit]]
+    when [:tinyint, '1']
+      column_type = "boolean"
+      options = column.options.dup
+      options.delete(:limit)
+      options = options.merge(default: false) if options[:default] == "0"
+      options = options.merge(default: true) if options[:default] == "1"
+      argument << options.map { |k, v| key_value_text(k, v) }
+    else
+      column_type = column.type
+      argument << column.options.map { |k, v| key_value_text(k, v) }
+    end
+
+    "t.#{column_type} #{argument.flatten.join(', ')}"
   end
 
   def dump_index(index)
-    columns = single_or_multiple_text(index.index_columns)
+    columns = single_or_multiple_symbol(index.index_columns)
     argument = [columns]
     argument << index.options.map { |k, v| key_value_text(k, v) }
     "t.index #{argument.flatten.join(', ')}"
   end
 
   def dump_foreign_key(foreign_key)
-    columns = single_or_multiple_text(foreign_key.from_columns)
+    columns = single_or_multiple_symbol(foreign_key.from_columns)
     argument = [columns]
-    argument << [key_value_text('reference', foreign_key.to_table)]
-    argument << ["reference_column: #{single_or_multiple_text(foreign_key.to_columns)}"]
+    argument << [key_value_symbol('reference', foreign_key.to_table)]
+    argument << ["reference_column: #{single_or_multiple_symbol(foreign_key.to_columns)}"]
     argument << foreign_key.options.map { |k, v| key_value_text(k, v) }
     "t.foreign_key #{argument.flatten.join(', ')}"
   end
 
-  def single_or_multiple_text(values)
+  def single_or_multiple_symbol(values)
     values_array = [values].flatten
     if values_array.size == 1
-      %("#{values_array.first}")
+      ":#{values_array.first}"
     else
-      %(#{values})
+      %(#{values.map(&:to_sym)})
     end
   end
 
@@ -65,4 +77,8 @@ class Convergence::Dumper
             end
     "#{k}: #{value}"
   end
+
+  def key_value_symbol(k, v)
+    "#{k}: :#{v}"
+  end
 end

data/lib/convergence/version.rb

@@ -1,3 +1,3 @@
 module Convergence
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

data/spec/convergence/dumper_spec.rb

@@ -12,12 +12,12 @@ describe Convergence::Dumper do
   end
   let(:table1_dsl) do
     dsl = <<-DSL
-create_table "dummy_table", engine: "MyISAM" do |t|
-  t.int "id", limit: 11
-  t.varchar "name", limit: 100, null: true, comment: "name"
+create_table :dummy_table, engine: "MyISAM" do |t|
+  t.int :id, limit: 11
+  t.varchar :name, limit: 100, null: true, comment: "name"
 
-  t.index "name", name: "idx_name"
-  t.foreign_key "id", reference: "dummy_ref", reference_column: "id", name: "dummy_table_id_fk"
+  t.index :name, name: "idx_name"
+  t.foreign_key :id, reference: :dummy_ref, reference_column: :id, name: "dummy_table_id_fk"
 end
   DSL
     dsl.strip

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: convergence
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Shinsuke Nishio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-29 00:00:00.000000000 Z
+date: 2017-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -176,6 +176,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - Guardfile