flydata 0.6.3 → 0.6.4

data/flydata-core/spec/table_def/mysql_table_def_spec.rb

@@ -253,6 +253,63 @@ describe MysqlTableDef do
         expect(subject[:columns][4][:type]).to eq("varchar(300)")
       end
     end
+
+    context 'when column comment has unique keyword' do
+      let(:dump_file_io) { file_io('mysqldump_test_col_comment_with_unique_keyword.dump')}
+      it 'should not include unique in column def' do
+        expect(subject[:columns]).to eq(
+           [
+               {:column=>"id", :type=>"int4(11)", :auto_increment=>true, :not_null=>true, :primary_key=>true },
+               {:column=>"title", :type=>"varchar(768)", :default=>nil , :comment=>"This column is not unique column."},
+               {:column=>"name", :type=>"text"},
+               {:column=>"num", :type=>"int4(11)", :default=>nil}
+           ]
+        )
+      end
+    end
+
+    context 'when column comment has unique keyword' do
+      let(:dump_file_io) { file_io('mysqldump_test_col_comment_with_AUTO_INCREMENT_keyword.dump')}
+      it 'should not include AUTO_INCREMENT in column def' do
+        expect(subject[:columns]).to eq(
+           [
+               {:column=>"id", :type=>"int4(11)", :auto_increment=>true, :not_null=>true, :primary_key=>true },
+               {:column=>"title", :type=>"varchar(768)", :default=>nil , :comment=>"This column is not AUTO_INCREMENT column."},
+               {:column=>"name", :type=>"text"},
+               {:column=>"num", :type=>"int4(11)", :default=>nil}
+           ]
+        )
+      end
+    end
+
+    context 'when column comment has unique keyword' do
+      let(:dump_file_io) { file_io('mysqldump_test_col_comment_with_unsigned_keyword.dump')}
+      it 'should not include unsigned in column def' do
+        expect(subject[:columns]).to eq(
+           [
+               {:column=>"id", :type=>"int4(11)", :auto_increment=>true, :not_null=>true, :primary_key=>true },
+               {:column=>"title", :type=>"varchar(768)", :default=>nil , :comment=>"This column is not unsigned column."},
+               {:column=>"name", :type=>"text"},
+               {:column=>"num", :type=>"int4(11)", :default=>nil}
+           ]
+        )
+      end
+    end
+
+
+    context 'when column comment has not null keyword' do
+      let(:dump_file_io) { file_io('mysqldump_test_col_comment_with_not_null_keyword.dump')}
+      it 'should not include not null in column def' do
+        expect(subject[:columns]).to eq(
+           [
+               {:column=>"id", :type=>"int4(11)", :auto_increment=>true, :not_null=>true, :primary_key=>true },
+               {:column=>"title", :type=>"varchar(768)", :default=>nil , :comment=>"This column is not null column."},
+               {:column=>"name", :type=>"text"},
+               {:column=>"num", :type=>"int4(11)", :default=>nil}
+           ]
+        )
+      end
+    end
   end
 
   describe '.convert_to_flydata_type' do

data/flydata-core/spec/table_def/mysql_to_redshift_table_def_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
 require 'flydata-core/table_def'
+require 'timecop'
 
 module FlydataCore
   module TableDef
@@ -22,11 +23,15 @@ module FlydataCore
         MysqlTableDef.create(dump_file_io).to_flydata_tabledef)
       }
 
+      before do
+        Timecop.freeze(Time.local(2016, 1, 25, 23, 28, 57))
+      end
+
       context 'with mysqldump_test_table_all' do
         let(:dump_file_name) { 'mysqldump_test_table_all.dump' }
 
         it 'should return ddl' do
-          expect(subject).to eq( <<EOT.strip )
+          expect(subject).to eq( <<EOT )
 CREATE TABLE IF NOT EXISTS "flydata_ctl_columns"(
   id integer NOT NULL IDENTITY(1,1),
   table_name varchar(128) NOT NULL,
@@ -44,7 +49,42 @@ CREATE TABLE IF NOT EXISTS "flydata_ctl_tables"(
   created_at timestamp DEFAULT SYSDATE,
   PRIMARY KEY(id)
 ) DISTKEY(table_name) SORTKEY(table_name);
-DROP TABLE IF EXISTS "test_table_all";
+BEGIN;
+DROP TABLE IF EXISTS "test_table_all_flydata20160125232857";
+CREATE TABLE IF NOT EXISTS "test_table_all" (
+  "id" int8,
+  "col_binary" varchar(202) DEFAULT NULL,
+  "col_blob" varchar(65535),
+  "col_bool" int2 DEFAULT '0',
+  "col_char" varchar(18) DEFAULT NULL,
+  "col_date" date DEFAULT NULL,
+  "col_datetime" timestamp DEFAULT NULL,
+  "col_decimal" numeric(5,2) DEFAULT NULL,
+  "col_double" float8 DEFAULT NULL,
+  "col_float" float4 DEFAULT NULL,
+  "col_float_4_2" float4 DEFAULT NULL,
+  "col_int" int4 DEFAULT NULL,
+  "col_int_6" int4 DEFAULT NULL,
+  "col_longblob" varchar(65535),
+  "col_longtext" varchar(max),
+  "col_mediumblob" varchar(65535),
+  "col_mediumint" int4 DEFAULT NULL,
+  "col_mediumtext" varchar(max),
+  "col_smallint" int2 DEFAULT NULL,
+  "col_text" varchar(max),
+  "col_time" timestamp DEFAULT NULL,
+  "col_timestamp" timestamp DEFAULT SYSDATE,
+  "col_tinyblob" varchar(255),
+  "col_tinyint" int2 DEFAULT NULL,
+  "col_tinytext" varchar(max),
+  "col_varbinary" varchar(512) DEFAULT NULL,
+  "col_varchar" varchar(372) DEFAULT NULL,
+  "col_year" date DEFAULT NULL,
+  "col_year_4" date DEFAULT NULL,
+  "col_year_2" date DEFAULT NULL,
+  PRIMARY KEY ("id")
+) DISTKEY("id") SORTKEY("id");
+ALTER TABLE "test_table_all" RENAME TO "test_table_all_flydata20160125232857";
 CREATE TABLE "test_table_all" (
   "id" int8,
   "col_binary" varchar(202) DEFAULT NULL,
@@ -147,6 +187,8 @@ INSERT INTO "flydata_ctl_tables" (table_name, attribute, value) VALUES
   `col_year_2` year(2) DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT=\\'test table includes all kind of format type\\';".split("\n").join}');
+COMMIT;
+DROP TABLE IF EXISTS "test_table_all_flydata20160125232857";
 EOT
         end
       end
@@ -155,7 +197,7 @@ EOT
         let(:dump_file_name) { 'mysqldump_test_bit_table.dump' }
 
         it 'should return ddl' do
-          expect(subject).to eq( <<EOT.strip )
+          expect(subject).to eq( <<EOT )
 CREATE TABLE IF NOT EXISTS "flydata_ctl_columns"(
   id integer NOT NULL IDENTITY(1,1),
   table_name varchar(128) NOT NULL,
@@ -173,7 +215,15 @@ CREATE TABLE IF NOT EXISTS "flydata_ctl_tables"(
   created_at timestamp DEFAULT SYSDATE,
   PRIMARY KEY(id)
 ) DISTKEY(table_name) SORTKEY(table_name);
-DROP TABLE IF EXISTS "bit_test_def_1";
+BEGIN;
+DROP TABLE IF EXISTS "bit_test_def_1_flydata20160125232857";
+CREATE TABLE IF NOT EXISTS "bit_test_def_1" (
+  "id" int4,
+  "bit_value" bigint DEFAULT 1,
+  "int_value" int4 DEFAULT 16,
+  PRIMARY KEY ("id")
+) DISTKEY("id") SORTKEY("id");
+ALTER TABLE "bit_test_def_1" RENAME TO "bit_test_def_1_flydata20160125232857";
 CREATE TABLE "bit_test_def_1" (
   "id" int4,
   "bit_value" bigint DEFAULT 1,
@@ -195,6 +245,8 @@ INSERT INTO "flydata_ctl_tables" (table_name, attribute, value) VALUES
   `int_value` int(11) DEFAULT x\\'10\\',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;".split("\n").join}');
+COMMIT;
+DROP TABLE IF EXISTS "bit_test_def_1_flydata20160125232857";
 EOT
         end
       end
@@ -203,7 +255,7 @@ EOT
         let(:dump_file_name) { 'mysqldump_test_foreign_key.dump' }
 
         it 'should return ddl' do
-          expect(subject).to eq( <<EOT.strip )
+          expect(subject).to eq( <<EOT )
 CREATE TABLE IF NOT EXISTS "flydata_ctl_columns"(
   id integer NOT NULL IDENTITY(1,1),
   table_name varchar(128) NOT NULL,
@@ -221,7 +273,16 @@ CREATE TABLE IF NOT EXISTS "flydata_ctl_tables"(
   created_at timestamp DEFAULT SYSDATE,
   PRIMARY KEY(id)
 ) DISTKEY(table_name) SORTKEY(table_name);
-DROP TABLE IF EXISTS "product_order";
+BEGIN;
+DROP TABLE IF EXISTS "product_order_flydata20160125232857";
+CREATE TABLE IF NOT EXISTS "product_order" (
+  "no" int4,
+  "product_category" int4,
+  "product_id" int4,
+  "customer_id" int4,
+  PRIMARY KEY ("no")
+) DISTKEY("no") SORTKEY("no");
+ALTER TABLE "product_order" RENAME TO "product_order_flydata20160125232857";
 CREATE TABLE "product_order" (
   "no" int4,
   "product_category" int4,
@@ -250,6 +311,8 @@ INSERT INTO "flydata_ctl_tables" (table_name, attribute, value) VALUES
   CONSTRAINT `product_order_ibfk_1` FOREIGN KEY (`product_category`, `product_id`) REFERENCES `product` (`category`, `id`) ON UPDATE CASCADE,
   CONSTRAINT `product_order_ibfk_2` FOREIGN KEY (`customer_id`) REFERENCES `customer` (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;".split("\n").join}');
+COMMIT;
+DROP TABLE IF EXISTS "product_order_flydata20160125232857";
 EOT
         end
       end
@@ -258,7 +321,7 @@ EOT
         let(:dump_file_name) { 'mysqldump_test_table_column_comment.dump' }
 
         it 'should return ddl' do
-          expect(subject).to eq( <<EOT.strip )
+          expect(subject).to eq( <<EOT )
 CREATE TABLE IF NOT EXISTS "flydata_ctl_columns"(
   id integer NOT NULL IDENTITY(1,1),
   table_name varchar(128) NOT NULL,
@@ -276,7 +339,14 @@ CREATE TABLE IF NOT EXISTS "flydata_ctl_tables"(
   created_at timestamp DEFAULT SYSDATE,
   PRIMARY KEY(id)
 ) DISTKEY(table_name) SORTKEY(table_name);
-DROP TABLE IF EXISTS "test_table_column_comment";
+BEGIN;
+DROP TABLE IF EXISTS "test_table_column_comment_flydata20160125232857";
+CREATE TABLE IF NOT EXISTS "test_table_column_comment" (
+  "id" int4 DEFAULT '0',
+  "value" varchar(max),
+  PRIMARY KEY ("id")
+) DISTKEY("id") SORTKEY("id");
+ALTER TABLE "test_table_column_comment" RENAME TO "test_table_column_comment_flydata20160125232857";
 CREATE TABLE "test_table_column_comment" (
   "id" int4 DEFAULT '0',
   "value" varchar(max),
@@ -297,6 +367,8 @@ INSERT INTO "flydata_ctl_tables" (table_name, attribute, value) VALUES
   `value` text,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT=\\'column comment test\\';".split("\n").join}');
+COMMIT;
+DROP TABLE IF EXISTS "test_table_column_comment_flydata20160125232857";
 EOT
         end
       end
@@ -305,7 +377,7 @@ EOT
         let(:dump_file_name) { 'mysqldump_test_table_enum.dump' }
 
         it 'should return ddl' do
-          expect(subject).to eq( <<EOT.strip )
+          expect(subject).to eq( <<EOT )
 CREATE TABLE IF NOT EXISTS "flydata_ctl_columns"(
   id integer NOT NULL IDENTITY(1,1),
   table_name varchar(128) NOT NULL,
@@ -323,7 +395,16 @@ CREATE TABLE IF NOT EXISTS "flydata_ctl_tables"(
   created_at timestamp DEFAULT SYSDATE,
   PRIMARY KEY(id)
 ) DISTKEY(table_name) SORTKEY(table_name);
-DROP TABLE IF EXISTS "test_table_enum";
+BEGIN;
+DROP TABLE IF EXISTS "test_table_enum_flydata20160125232857";
+CREATE TABLE IF NOT EXISTS "test_table_enum" (
+  "id" int4,
+  "enum_1" varchar encode bytedict DEFAULT NULL,
+  "enum_2" varchar encode bytedict DEFAULT 'a',
+  "enum_3" varchar encode bytedict,
+  PRIMARY KEY ("id")
+) DISTKEY("id") SORTKEY("id");
+ALTER TABLE "test_table_enum" RENAME TO "test_table_enum_flydata20160125232857";
 CREATE TABLE "test_table_enum" (
   "id" int4,
   "enum_1" varchar encode bytedict DEFAULT NULL,
@@ -348,6 +429,8 @@ INSERT INTO "flydata_ctl_tables" (table_name, attribute, value) VALUES
   `enum_3` enum(\\'e\\',\\'f\\',\\'g\\') NOT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT=\\'with enum column\\';".split("\n").join}');
+COMMIT;
+DROP TABLE IF EXISTS "test_table_enum_flydata20160125232857";
 EOT
         end
       end
@@ -356,7 +439,7 @@ EOT
         let(:dump_file_name) { 'mysqldump_test_table_multi_pk.dump' }
 
         it 'should return ddl' do
-          expect(subject).to eq( <<EOT.strip )
+          expect(subject).to eq( <<EOT )
 CREATE TABLE IF NOT EXISTS "flydata_ctl_columns"(
   id integer NOT NULL IDENTITY(1,1),
   table_name varchar(128) NOT NULL,
@@ -374,7 +457,15 @@ CREATE TABLE IF NOT EXISTS "flydata_ctl_tables"(
   created_at timestamp DEFAULT SYSDATE,
   PRIMARY KEY(id)
 ) DISTKEY(table_name) SORTKEY(table_name);
-DROP TABLE IF EXISTS "test_table_multi_pk";
+BEGIN;
+DROP TABLE IF EXISTS "test_table_multi_pk_flydata20160125232857";
+CREATE TABLE IF NOT EXISTS "test_table_multi_pk" (
+  "id1" int4 DEFAULT '0',
+  "id2" int4 DEFAULT '0',
+  "value" varchar(max),
+  PRIMARY KEY ("id1","id2")
+) DISTKEY("id1") SORTKEY("id1","id2");
+ALTER TABLE "test_table_multi_pk" RENAME TO "test_table_multi_pk_flydata20160125232857";
 CREATE TABLE "test_table_multi_pk" (
   "id1" int4 DEFAULT '0',
   "id2" int4 DEFAULT '0',
@@ -396,6 +487,8 @@ INSERT INTO "flydata_ctl_tables" (table_name, attribute, value) VALUES
   `value` text,
   PRIMARY KEY (`id1`,`id2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT=\\'multiple primary key\\';".split("\n").join}');
+COMMIT;
+DROP TABLE IF EXISTS "test_table_multi_pk_flydata20160125232857";
 EOT
         end
       end
@@ -412,7 +505,7 @@ EOT
         let(:dump_file_name) { 'mysqldump_test_unique_key.dump' }
 
         it 'should return ddl' do
-          expect(subject).to eq( <<EOT.strip )
+          expect(subject).to eq( <<EOT )
 CREATE TABLE IF NOT EXISTS "flydata_ctl_columns"(
   id integer NOT NULL IDENTITY(1,1),
   table_name varchar(128) NOT NULL,
@@ -430,7 +523,16 @@ CREATE TABLE IF NOT EXISTS "flydata_ctl_tables"(
   created_at timestamp DEFAULT SYSDATE,
   PRIMARY KEY(id)
 ) DISTKEY(table_name) SORTKEY(table_name);
-DROP TABLE IF EXISTS "sample1";
+BEGIN;
+DROP TABLE IF EXISTS "sample1_flydata20160125232857";
+CREATE TABLE IF NOT EXISTS "sample1" (
+  "id" int4,
+  "title" varchar(768) DEFAULT NULL,
+  "name" varchar(max),
+  "num" int4 DEFAULT NULL,
+  PRIMARY KEY ("id")
+) DISTKEY("id") SORTKEY("id");
+ALTER TABLE "sample1" RENAME TO "sample1_flydata20160125232857";
 CREATE TABLE "sample1" (
   "id" int4,
   "title" varchar(768) DEFAULT NULL,
@@ -457,6 +559,8 @@ INSERT INTO "flydata_ctl_tables" (table_name, attribute, value) VALUES
   UNIQUE KEY `title` (`title`),
   UNIQUE KEY `num` (`num`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;".split("\n").join}');
+COMMIT;
+DROP TABLE IF EXISTS "sample1_flydata20160125232857";
 EOT
         end
       end
@@ -465,7 +569,7 @@ EOT
         let(:dump_file_name) { 'mysqldump_test_unique_key2.dump' }
 
         it 'should return ddl' do
-          expect(subject).to eq( <<EOT.strip )
+          expect(subject).to eq( <<EOT )
 CREATE TABLE IF NOT EXISTS "flydata_ctl_columns"(
   id integer NOT NULL IDENTITY(1,1),
   table_name varchar(128) NOT NULL,
@@ -483,7 +587,16 @@ CREATE TABLE IF NOT EXISTS "flydata_ctl_tables"(
   created_at timestamp DEFAULT SYSDATE,
   PRIMARY KEY(id)
 ) DISTKEY(table_name) SORTKEY(table_name);
-DROP TABLE IF EXISTS "sample1";
+BEGIN;
+DROP TABLE IF EXISTS "sample1_flydata20160125232857";
+CREATE TABLE IF NOT EXISTS "sample1" (
+  "id" int4,
+  "title" varchar(768) DEFAULT NULL,
+  "name" varchar(max),
+  "num" int4 DEFAULT NULL,
+  PRIMARY KEY ("id")
+) DISTKEY("id") SORTKEY("id");
+ALTER TABLE "sample1" RENAME TO "sample1_flydata20160125232857";
 CREATE TABLE "sample1" (
   "id" int4,
   "title" varchar(768) DEFAULT NULL,
@@ -510,6 +623,8 @@ INSERT INTO "flydata_ctl_tables" (table_name, attribute, value) VALUES
   UNIQUE KEY `title` (`title`),
   UNIQUE KEY `index_num` (`num`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;".split("\n").join}');
+COMMIT;
+DROP TABLE IF EXISTS "sample1_flydata20160125232857";
 EOT
         end
       end
@@ -518,7 +633,7 @@ EOT
         let(:dump_file_name) { 'mysqldump_test_unique_key3.dump' }
 
         it 'should return ddl' do
-          expect(subject).to eq( <<EOT.strip )
+          expect(subject).to eq( <<EOT )
 CREATE TABLE IF NOT EXISTS "flydata_ctl_columns"(
   id integer NOT NULL IDENTITY(1,1),
   table_name varchar(128) NOT NULL,
@@ -536,7 +651,30 @@ CREATE TABLE IF NOT EXISTS "flydata_ctl_tables"(
   created_at timestamp DEFAULT SYSDATE,
   PRIMARY KEY(id)
 ) DISTKEY(table_name) SORTKEY(table_name);
-DROP TABLE IF EXISTS "invoice_items";
+BEGIN;
+DROP TABLE IF EXISTS "invoice_items_flydata20160125232857";
+CREATE TABLE IF NOT EXISTS "invoice_items" (
+  "id" int4,
+  "app_id" int4,
+  "subscription_id" int4,
+  "overage_id" varchar(765),
+  "stripe_invoice_item_id" varchar(765) DEFAULT NULL,
+  "stripe_error" varchar(765) DEFAULT NULL,
+  "synced_to_stripe" int2 DEFAULT '0',
+  "description" varchar(max),
+  "item_name" varchar(765),
+  "item_cost" int4,
+  "item_count" int4,
+  "total_cost" int4,
+  "created_at" timestamp DEFAULT NULL,
+  "updated_at" timestamp DEFAULT NULL,
+  "bill_ahead" int2 DEFAULT '0',
+  "bill_ahead_resolved_at" timestamp DEFAULT NULL,
+  "stripe_invoice_id" varchar(765) DEFAULT NULL,
+  "is_vat" int2 DEFAULT '0',
+  PRIMARY KEY ("id")
+) DISTKEY("id") SORTKEY("id");
+ALTER TABLE "invoice_items" RENAME TO "invoice_items_flydata20160125232857";
 CREATE TABLE "invoice_items" (
   "id" int4,
   "app_id" int4,
@@ -604,6 +742,8 @@ INSERT INTO "flydata_ctl_tables" (table_name, attribute, value) VALUES
   PRIMARY KEY (`id`),
   UNIQUE KEY `index_invoice_items_on_app_id_and_overage_id_and_item_name` (`app_id`,`overage_id`(32),`item_name`(32)) USING BTREE
 ) ENGINE=InnoDB AUTO_INCREMENT=16654 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;".split("\n").join}');
+COMMIT;
+DROP TABLE IF EXISTS "invoice_items_flydata20160125232857";
 EOT
         end
       end
@@ -612,7 +752,7 @@ EOT
         let(:dump_file_name) { 'mysqldump_test_unsigned.dump' }
 
         it 'should return ddl' do
-          expect(subject).to eq( <<EOT.strip )
+          expect(subject).to eq( <<EOT )
 CREATE TABLE IF NOT EXISTS "flydata_ctl_columns"(
   id integer NOT NULL IDENTITY(1,1),
   table_name varchar(128) NOT NULL,
@@ -630,7 +770,19 @@ CREATE TABLE IF NOT EXISTS "flydata_ctl_tables"(
   created_at timestamp DEFAULT SYSDATE,
   PRIMARY KEY(id)
 ) DISTKEY(table_name) SORTKEY(table_name);
-DROP TABLE IF EXISTS "zerofill_table";
+BEGIN;
+DROP TABLE IF EXISTS "zerofill_table_flydata20160125232857";
+CREATE TABLE IF NOT EXISTS "zerofill_table" (
+  "id" int4,
+  "value_int" int8 DEFAULT NULL,
+  "value_float" float4 DEFAULT NULL,
+  "value_dec" numeric(10,2) DEFAULT NULL,
+  "value_double" float8 DEFAULT NULL,
+  "name" varchar(768) DEFAULT NULL,
+  "value_small_int" int4 DEFAULT NULL,
+  PRIMARY KEY ("id")
+) DISTKEY("id") SORTKEY("id");
+ALTER TABLE "zerofill_table" RENAME TO "zerofill_table_flydata20160125232857";
 CREATE TABLE "zerofill_table" (
   "id" int4,
   "value_int" int8 DEFAULT NULL,
@@ -664,6 +816,8 @@ INSERT INTO "flydata_ctl_tables" (table_name, attribute, value) VALUES
   `value_small_int` smallint(5) unsigned DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=latin1;".split("\n").join}');
+COMMIT;
+DROP TABLE IF EXISTS "zerofill_table_flydata20160125232857";
 EOT
         end
       end