convergence 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6ca8631b2fc6fbf1bc013707fd10f1126e4277e
-  data.tar.gz: d349021ae530f9a365c5bd89fb21a62e3e5ea0a0
+  metadata.gz: 791c3a30d2bc49635b6e63fe9d137e9d20a99236
+  data.tar.gz: c21c2f48ea674ee79308257165b5c57111b7f638
 SHA512:
-  metadata.gz: 7f622d677660e12eb49d524312333217bdedd92cb3f8d0d6675a70403332efb6e4b495f7cfbf4075b3d1ea9a0ab1f670e286dd8a162e448e221a99742db2598e
-  data.tar.gz: 5736856479b0a1bee16e729c391b413ba78cda885b8a8d0b4f258f1a34cc25e94fa3a33d8281d7db765b04d5ce6f27ab80dfb45c132c732c1c386cc91973bcfc
+  metadata.gz: 6f3c65613fe2ace2c270e8462d8b0b369aa177fb9c99ccaf21dbf31c5b5bfe7033b40dc30bc9cccb9a9eaf8eca46e0be2adb2fbd60f115fafc9697058f3d5ef2
+  data.tar.gz: 951a2df0c366c648462aaabd6b65d284f04b3374c4d057bacc1d1e409d22e2012b7525c9c50d2d1d1f19f8d4519f714b39665530df86f67a4915affac720408a

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## Convergence 0.2.6 (March 4, 2018) ##
+
+* Improve dryrun output (PR: #55)
+
+  *yujideveloper*
+
+* Support MySQL identifiers that require quotes in Ruby symbol syntax on export dsl (PR: #56)
+
+  *yujideveloper*
+
+* Output help message when executed without option (PR: #57)
+
+  *yujideveloper*
+
 ## Convergence 0.2.5 (December 21, 2017) ##
 
 * Bug Fix Diff option does not work fine (PR: #50)

data/Gemfile.lock

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

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014 Shinsuke Nishio
+Copyright (c) 2014-2018 Shinsuke Nishio
 
 MIT License
 

data/README.md

@@ -55,8 +55,6 @@ end
 
 $ convergence -c database.yml -i example.schema --dryrun
 
-#
-#
 # CREATE TABLE `test_tables` (
 #   `id` int(11) NOT NULL AUTO_INCREMENT,
 #   `name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL,
@@ -69,7 +67,7 @@ $ convergence -c database.yml -i example.schema --dryrun
 $ convergence -c database.yml -i example.schema --apply
 
 SET FOREIGN_KEY_CHECKS=0;
-  --> 0.000794s
+  --> 0.0005826340056955814s
 CREATE TABLE `test_tables` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL,
@@ -78,9 +76,9 @@ CREATE TABLE `test_tables` (
   PRIMARY KEY (`id`),
   KEY `index_test_tables_on_name` (`name`)
 ) ENGINE=InnoDB ROW_FORMAT=Compact DEFAULT CHARACTER SET=utf8 COLLATE=utf8_general_ci;
-  --> 0.01485s
+  --> 0.017457014000683557s
 SET FOREIGN_KEY_CHECKS=1;
-  --> 0.000115s
+  --> 0.00019878800230799243s
 
 $ cat changed_example.schema
 
@@ -93,24 +91,29 @@ end
 
 $ convergence -c database.yml -i changed_example.schema  --dryrun
 
-# ALTER TABLE `test_tables` DROP COLUMN `updated_at`;
-# ALTER TABLE `test_tables` ADD COLUMN `posted_at` datetime NOT NULL AFTER `created_at`;
 # DROP INDEX `index_test_tables_on_name` ON `test_tables`;
+# ALTER TABLE `test_tables`
+#   DROP COLUMN `updated_at`;
+# ALTER TABLE `test_tables`
+#   ADD COLUMN `posted_at` datetime NOT NULL AFTER `created_at`;
 # ALTER TABLE `test_tables` ENGINE=MyISAM COMMENT='Table Comment Test';
 
 $ convergence -c database.yml -i changed_example.schema  --apply
+
 SET FOREIGN_KEY_CHECKS=0;
-  --> 0.000847s
-ALTER TABLE `test_tables` DROP COLUMN `updated_at`;
-  --> 0.034026s
-ALTER TABLE `test_tables` ADD COLUMN `posted_at` datetime NOT NULL AFTER `created_at`;
-  --> 0.025328s
+  --> 0.0005331430002115667s
 DROP INDEX `index_test_tables_on_name` ON `test_tables`;
-  --> 0.011465s
+  --> 0.010850776998267975s
+ALTER TABLE `test_tables`
+  DROP COLUMN `updated_at`;
+  --> 0.025050114003533963s
+ALTER TABLE `test_tables`
+  ADD COLUMN `posted_at` datetime NOT NULL AFTER `created_at`;
+  --> 0.02903763700305717s
 ALTER TABLE `test_tables` ENGINE=MyISAM COMMENT='Table Comment Test';
-  --> 0.01115s
+  --> 0.022911186999408528s
 SET FOREIGN_KEY_CHECKS=1;
-  --> 0.000147s
+  --> 0.003360001996043138s
 
 $ mysql -u root example_database -e 'show create table test_tables\G'
 
@@ -315,4 +318,4 @@ $ bundle exec rspec
 
 ## Copyright
 
-Copyright © 2017 S.nishio. See LICENSE.txt for further details.
+Copyright © 2014-2018 S.nishio. See LICENSE.txt for further details.

data/lib/convergence/command.rb

@@ -19,7 +19,9 @@ class Convergence::Command
       elsif @opts[:apply]
         Convergence::Command::Apply
       end
-    unless execute_klass.nil?
+    if execute_klass.nil?
+      puts @opts
+    else
       execute_klass.new(@opts, config: @config).execute
     end
   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.to_sym.inspect]
     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,7 +27,7 @@ class Convergence::Dumper
   private
 
   def dump_column(column)
-    argument = [%(:#{column.column_name})]
+    argument = [column.column_name.to_sym.inspect]
     case [column.type, column.options[:limit]]
     when [:tinyint, '1']
       column_type = "boolean"
@@ -63,9 +63,9 @@ class Convergence::Dumper
   def single_or_multiple_symbol(values)
     values_array = [values].flatten
     if values_array.size == 1
-      ":#{values_array.first}"
+      values_array.first.to_sym.inspect
     else
-      %(#{values.map(&:to_sym)})
+      values.map(&:to_sym).inspect
     end
   end
 
@@ -79,6 +79,6 @@ class Convergence::Dumper
   end
 
   def key_value_symbol(k, v)
-    "#{k}: :#{v}"
+    "#{k}: #{v.to_sym.inspect}"
   end
 end

data/lib/convergence/sql_generator/mysql_generator.rb

@@ -15,9 +15,9 @@ class SQLGenerator::MysqlGenerator < SQLGenerator
     @original_table = original_table
     sqls = []
     sqls << change_table_sql(to_table, delta)
-    sqls << ['']
     sqls << drop_table_sqls(delta)
     sqls << create_table_sqls(delta)
+    sqls.reject!(&:empty?)
     sqls.join("\n")
   end
 
@@ -53,6 +53,7 @@ class SQLGenerator::MysqlGenerator < SQLGenerator
         results << alter_change_table_sql(table_name, table_delta[:change_table_option])
       end
     end
+    results << '' unless results.empty?
     results
   end
 

data/lib/convergence/version.rb

@@ -1,3 +1,3 @@
 module Convergence
-  VERSION = '0.2.5'
+  VERSION = '0.2.6'
 end

data/spec/convergence/dumper_spec.rb

@@ -36,5 +36,35 @@ end
       dsl = Convergence::Dumper.new.dump_table_dsl(table1)
       expect(dsl).to eq(table1_dsl)
     end
+
+    context "when MySQL identifiers that require quotes in Ruby symbol syntax" do
+      let(:table1) do
+        Convergence::Table.new('dummy-table', engine: 'MyISAM').tap do |t|
+          t.int :id, limit: 11
+          t.varchar :"column-1", limit: 100, null: true, comment: 'column 1'
+
+          t.index :"column-1", name: 'idx_column-1'
+          t.foreign_key :"column-1", reference: 'dummy-ref', reference_column: :"dummy-column"
+        end
+      end
+
+      let(:table1_dsl) do
+        dsl = <<-DSL
+create_table :"dummy-table", engine: "MyISAM" do |t|
+  t.int :id, limit: 11
+  t.varchar :"column-1", limit: 100, null: true, comment: "column 1"
+
+  t.index :"column-1", name: "idx_column-1"
+  t.foreign_key :"column-1", reference: :"dummy-ref", reference_column: :"dummy-column", name: "dummy-table_column-1_fk"
+end
+      DSL
+        dsl.strip
+      end
+
+      it 'should be able to dump dsl' do
+        dsl = Convergence::Dumper.new.dump_table_dsl(table1)
+        expect(dsl).to eq(table1_dsl)
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: convergence
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Shinsuke Nishio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-20 00:00:00.000000000 Z
+date: 2018-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2