flydata 0.7.13 → 0.7.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30343349c710d665850b71f57d39308b6db3ac9c
-  data.tar.gz: 5c4ecdd659a4dc2e5a20bd12746bd2903315e71d
+  metadata.gz: 80a23a5417e480bb9b0b1847be172e3e75354d23
+  data.tar.gz: 6b29963fd37ac981f5a6ebda6485b82a6c1c6f39
 SHA512:
-  metadata.gz: cffa5e91a09f5a7e9091dcd198db4e15d3de9c9666d753b888e06b1a8735de494371733353b1503f07a0dff41c8704ed29b8b143177d46649397f6580e7af548
-  data.tar.gz: c13cb4a781ab2a263a9c88f52700a4d21e8ee11c1ab38b5c92620f2718846eae13c28394d9714e20ff58b6b81c6c8eb9611a764e00567541f33f83b91fdef0db
+  metadata.gz: 33e95be5a5ba2cb787f0d99655a1d83af447be3d3ee6122b24156c55de272e8c9eb73be1624e7ad26f45d6874234112d45149b63b42cab41c941a97c5bea5d95
+  data.tar.gz: 802b8a85a0c3ddc9009daa119b2842642a50a94718355b1787760d25e4970d53b5495bed832c9a82a0ca97bd5b569e3d179902fafd105d5f727a284a03dcf79e

data/VERSION

@@ -1 +1 @@
-0.7.13
+0.7.14

data/flydata-core/lib/flydata-core/compatibility_check/db_compatibility_checker.rb

@@ -33,6 +33,10 @@ module FlydataCore
         tables.collect{|tn| "'#{tn}'"}.join(',')
       end
 
+      def database_in_query(database)
+        "'#{database}'"
+      end
+
       def word_for_table_schema
         "schema"
       end
@@ -55,6 +59,7 @@ module FlydataCore
       # COMPATIBILITY_ERROR_CLASS = MysqlCompatibilityError
 
       def create_query(option = @option)
+        return nil if option[:tables].empty?
         self.class::TABLE_EXISTENCE_CHECK_QUERY_TMPLT % schema_and_table_in_query(option)
       end
 
@@ -83,6 +88,7 @@ module FlydataCore
 
       def check_result(result, option = @option)
         table_schema, missing_pk_tables = get_schema_and_tables(result)
+
         unless missing_pk_tables.empty?
           raise self.class::COMPATIBILITY_ERROR_CLASS,
             "Primary key is required for tables to sync. " +

data/flydata-core/lib/flydata-core/errors.rb

@@ -34,9 +34,39 @@ module ErrorCode
   BREAKING_ALTER_TABLE_ERROR = 10010
   BREAKING_INFORMATION_SCHEMA_ERROR = 10011
   BREAKING_TABLE_DDL_ERROR = 10012
+  UNSUPPORTED_COLUMN_TYPE_ERROR = 10013
+  NO_PRIMARY_KEY_ERROR = 10014
   INTERNAL_ERROR = 1200
 end
 
+module ErrorCode
+  # Convert an error reason to an error hash
+  # ex. {"err_code" => 10003, "Table does not exist"}
+  #
+  # Use this to convert an error message from an old agent to the new error hash
+  def self.err_reason_to_error(err_reason)
+    {"err_code" => lookup_err_code(err_reason), "err_reason" => err_reason}
+  end
+
+  def self.lookup_err_code(err_reason)
+    case err_reason
+    when /^no primary key defined/i
+      FlydataCore::ErrorCode::NO_PRIMARY_KEY_ERROR
+    when /^table does not exist in the MySQL database/i
+      FlydataCore::ErrorCode::TABLE_MISSING_ERROR
+    when /^GEOMETRY type/
+      FlydataCore::ErrorCode::UNSUPPORTED_COLUMN_TYPE_ERROR
+    when /^Newly registered table/
+      # The current agent doesn't send this error.  Must be an old deprecated
+      # error.
+      FlydataCore::ErrorCode::INTERNAL_ERROR
+    else
+      # shouldn't come here
+      FlydataCore::ErrorCode::INTERNAL_ERROR
+    end
+  end
+end
+
 # Error Level
 # 0 Emergency: system is unusable
 # 1 Alert: action must be taken immediately

data/flydata-core/lib/flydata-core/logger.rb

@@ -124,6 +124,11 @@ module FlydataCore
       log_common(:debug, message, log_params, opt)
     end
 
+    def log_debug_with_backtrace(message, log_params = {}, options = {})
+      opt = { depth_offset: 1}.merge(options)
+      log_common(:debug, message, log_params, opt.merge(backtrace: true))
+    end
+
     def log_info(message, log_params = {}, options = {})
       opt = { depth_offset: 1}.merge(options)
       log_common(:info, message, log_params, opt)
@@ -134,6 +139,11 @@ module FlydataCore
       log_common(:warn, message, log_params, opt)
     end
 
+    def log_warn_with_backtrace(message, log_params = {}, options = {})
+      opt = { depth_offset: 1}.merge(options)
+      log_common(:warn, message, log_params, opt.merge(backtrace: true))
+    end
+
     def log_error(message, log_params = {}, options = {})
       opt = { depth_offset: 1}.merge(options)
       log_common(:error, message, log_params, opt)
@@ -145,7 +155,9 @@ module FlydataCore
     end
 
     def get_logger(options = {})
-      options[:logger] || logger || log_context_logger || $log
+      ret = options[:logger] || logger || log_context_logger
+      ret = Rails.logger if ret.nil? && defined?(Rails) && Rails.logger
+      ret || $log
     end
 
     def build_log_message(level, raw_message, log_params = {}, options = {})

data/flydata-core/lib/flydata-core/mysql/compatibility_checker.rb

@@ -209,8 +209,8 @@ module FlydataCore
       include FlydataCore::CompatibilityCheck::TableExistenceCheck
       TABLE_EXISTENCE_CHECK_QUERY_TMPLT = <<EOT
 SELECT
-  t.table_schema,
-  t.table_name
+  t.table_schema as table_schema,
+  t.table_name as table_name
 FROM
   information_schema.tables t
 WHERE
@@ -243,16 +243,21 @@ EOT
     end
 
     class TableTypeChecker < MysqlCompatibilityChecker
-      SELECT_TABLE_INFO_TMPLT = 
-        "SELECT table_name, table_type, engine " +
-        "FROM information_schema.tables " +
-        "WHERE table_schema = '%s' and table_name in (%s)"
+      SELECT_TABLE_INFO_TMPLT = <<EOT
+SELECT
+  table_name as table_name,
+  table_type as table_type,
+  engine as engine
+FROM information_schema.tables
+WHERE table_schema = '%s' and table_name in (%s)
+EOT
 
       UNSUPPORTED_ENGINES = %w(MEMORY BLACKHOLE)
 
       # option[:client] : Mysql2::Client object
       # option[:tables] : target table list
       def create_query(option = @option)
+        return nil if option[:tables].empty?
         SELECT_TABLE_INFO_TMPLT % [
           Mysql2::Client.escape(option[:database]),
           option[:tables].collect{|t| "'#{Mysql2::Client.escape(t)}'"}.join(", ")
@@ -277,8 +282,8 @@ EOT
       include FlydataCore::CompatibilityCheck::PrimaryKeyCheck
       PK_CHECK_QUERY_TMPLT = <<EOT
 SELECT
-  t.table_schema,
-  t.table_name,
+  t.table_schema as table_schema,
+  t.table_name as table_name,
   SUM(IF(tc.constraint_type='PRIMARY KEY' AND col.is_nullable='NO', 1, 0)) as num_pk,
   SUM(IF(tc.constraint_type='UNIQUE' AND col.is_nullable='NO', 1, 0)) as num_uk
 FROM
@@ -303,9 +308,9 @@ EOT
       include FlydataCore::CompatibilityCheck::PkOverrideCheck
       PK_OVERRIDE_QUERY_TMPLT = <<EOT
 SELECT
-  t.table_schema,
-  t.table_name,
-  col.column_name
+  t.table_schema as table_schema,
+  t.table_name as table_name,
+  col.column_name as column_name
 FROM
   (select * from information_schema.tables where table_schema = %{schema_name} AND table_name in (%{table_names})) t
   LEFT JOIN

data/flydata-core/lib/flydata-core/mysql/ssl.rb

@@ -2,7 +2,7 @@ module FlydataCore
   module Mysql
     module Ssl
       # ssl cipher list not including DH algorithm
-      NON_DH_SSL_CIPHER = "AES256-GCM-SHA384:AES256-SHA:AES256-SHA256:CAMELLIA256-SHA:DES-CBC3-SHA:PSK-3DES-EDE-CBC-SHA:PSK-AES256-CBC-SHA:SRP-DSS-3DES-EDE-CBC-SHA:SRP-DSS-AES-128-CBC-SHA:SRP-DSS-AES-256-CBC-SHA:SRP-RSA-3DES-EDE-CBC-SHA:SRP-RSA-AES-128-CBC-S:SRP-RSA-AES-256-CBC-SHA"
+      NON_DH_SSL_CIPHER = "DEFAULT:!DH"
     end
   end
 end

data/flydata-core/lib/flydata-core/postgresql/compatibility_checker.rb

@@ -18,9 +18,9 @@ module FlydataCore
       end
 
       def schema_and_table_in_query(option = @option)
-        schema = FlydataCore::Postgresql::QueryHelper.schema_as_value(option[:schema])
         {
-          schema_name: schema,
+          database: database_in_query(option[:database]),
+          schema_name: FlydataCore::Postgresql::QueryHelper.schema_as_value(option[:schema]),
           table_names: table_names_in_query(option[:tables]),
         }
       end
@@ -59,6 +59,8 @@ SELECT
 FROM
   information_schema.tables
 WHERE
+  table_catalog = %{database}
+  AND
   table_schema = %{schema_name}
   AND
   table_name in (%{table_names})
@@ -71,17 +73,31 @@ EOT
       include FlydataCore::CompatibilityCheck::PrimaryKeyCheck
       PK_CHECK_QUERY_TMPLT = <<EOT
 SELECT
-  t.table_schema,
-  t.table_name
+  c.table_schema,
+  c.table_name
 FROM
-  (select * from information_schema.tables where table_schema = %{schema_name} AND table_name in (%{table_names})) t
-  LEFT OUTER JOIN
-  (select * from information_schema.table_constraints where table_schema = %{schema_name} AND table_name in (%{table_names})) tc
-  USING (table_schema, table_name)
+  pg_index i
+  JOIN pg_attribute a ON a.attrelid = i.indrelid AND a.attnum = ANY(i.indkey)
+  RIGHT JOIN
+    (SELECT
+      (table_schema ||'.'|| table_name)::regclass AS regid,
+      *
+     FROM information_schema.columns
+     WHERE
+       table_catalog = %{database}
+       AND table_schema = %{schema_name}
+       AND table_name IN (%{table_names})
+    ) c
+  ON i.indrelid = c.regid AND a.attname = c.column_name
+WHERE
+  c.table_catalog = %{database}
+  AND c.table_schema = %{schema_name}
+  AND c.table_name IN (%{table_names})
 GROUP BY
-  t.table_schema, t.table_name
+  c.table_schema, c.table_name
 HAVING
-  SUM(CASE WHEN tc.constraint_type='PRIMARY KEY' THEN 1 ELSE 0 END) = 0;
+  SUM(CASE WHEN i.indisprimary='t' THEN 1 ELSE 0 END) = 0 AND
+  SUM(CASE WHEN i.indisunique='t' THEN 1 ELSE 0 END) = 0;
 EOT
     end
 
@@ -93,10 +109,10 @@ SELECT
   t.table_name,
   col.column_name
 FROM
-  (select * from information_schema.tables where table_schema = %{schema_name} AND table_name in (%{table_names})) t
+  (select * from information_schema.tables where table_catalog = %{database} AND table_schema = %{schema_name} AND table_name in (%{table_names})) t
   LEFT JOIN
-  (select * from information_schema.columns where table_schema = %{schema_name} AND table_name in (%{table_names})) col
-  ON t.table_schema = col.table_schema AND t.table_name = col.table_name
+  (select * from information_schema.columns where table_catalog = %{database} AND table_schema = %{schema_name} AND table_name in (%{table_names})) col
+  ON t.table_catalog = col.table_catalog AND t.table_schema = col.table_schema AND t.table_name = col.table_name
 ORDER BY
   t.table_name;
 EOT

data/flydata-core/lib/flydata-core/table_def/mysql_table_def.rb

@@ -49,6 +49,7 @@ class MysqlTableDef < Base
     'float' => {type: 'float4'},
     'int' => {type: 'int4', def_width: '11'},
     'integer' => {type: 'int4', def_width: '11'},
+    'json' => {type: 'json'},
     'longblob' => {type: 'varbinary(4294967295)'},
     'longtext' => {type: 'text'},
     'mediumblob' => {type: 'varbinary(16777215)'},

data/flydata-core/lib/flydata-core/table_def/redshift_table_def.rb

@@ -33,6 +33,7 @@ class RedshiftTableDef
     'int4 unsigned' => {type: 'int8', unsigned: true, default_value: '0'},
     'int8' => {type: 'int8', default_value: '0'},
     'int8 unsigned' => {type: 'numeric(20,0)', unsigned: true, default_value: '0'},
+    'json' => {type: 'varchar(max)', default_value: ''},
     'money' => {type: 'numeric', use_params: true, max_size: [38,37], default_value: '0'},
     'numeric' => {type: 'numeric', use_params: true, default_params: [18,8], max_size: [38,37], default_value: '0'},
     'numeric unsigned' => {type: 'numeric', use_params: true, default_params: [18,8], max_size: [38,37], default_value: '0'},

data/flydata-core/spec/mysql/compatibility_checker_spec.rb

@@ -87,8 +87,8 @@ module FlydataCore
           subject { subject_object.create_query }
           it { is_expected.to eq <<EOT
 SELECT
-  t.table_schema,
-  t.table_name
+  t.table_schema as table_schema,
+  t.table_name as table_name
 FROM
   information_schema.tables t
 WHERE
@@ -99,6 +99,13 @@ UNION
   SELECT 'test_db', '';
 EOT
           }
+
+          context 'when tables is empty' do
+            before do
+              option[:tables] = []
+            end
+            it { is_expected.to be_nil }
+          end
         end
 
         describe '#check_reesult' do
@@ -137,8 +144,8 @@ EOT
           subject { subject_object.create_query }
           it { is_expected.to eq <<EOT
 SELECT
-  t.table_schema,
-  t.table_name,
+  t.table_schema as table_schema,
+  t.table_name as table_name,
   SUM(IF(tc.constraint_type='PRIMARY KEY' AND col.is_nullable='NO', 1, 0)) as num_pk,
   SUM(IF(tc.constraint_type='UNIQUE' AND col.is_nullable='NO', 1, 0)) as num_uk
 FROM
@@ -167,8 +174,8 @@ EOT
             end
             it { is_expected.to eq <<EOT
 SELECT
-  t.table_schema,
-  t.table_name,
+  t.table_schema as table_schema,
+  t.table_name as table_name,
   SUM(IF(tc.constraint_type='PRIMARY KEY' AND col.is_nullable='NO', 1, 0)) as num_pk,
   SUM(IF(tc.constraint_type='UNIQUE' AND col.is_nullable='NO', 1, 0)) as num_uk
 FROM
@@ -243,9 +250,9 @@ EOT
             end
             it { is_expected.to eq <<EOT
 SELECT
-  t.table_schema,
-  t.table_name,
-  col.column_name
+  t.table_schema as table_schema,
+  t.table_name as table_name,
+  col.column_name as column_name
 FROM
   (select * from information_schema.tables where table_schema = 'test_db' AND table_name in ('table_1','table_2')) t
   LEFT JOIN

data/flydata-core/spec/postgresql/compatibility_checker_spec.rb

@@ -54,6 +54,8 @@ SELECT
 FROM
   information_schema.tables
 WHERE
+  table_catalog = 'test_db'
+  AND
   table_schema = (select current_schema)
   AND
   table_name in ('table_1','table_2','table_3')
@@ -71,6 +73,8 @@ SELECT
 FROM
   information_schema.tables
 WHERE
+  table_catalog = 'test_db'
+  AND
   table_schema = 'test_schema'
   AND
   table_name in ('table_1','table_2','table_3')
@@ -120,17 +124,31 @@ EOT
           context 'when schema is not set' do
             it { is_expected.to eq <<EOT
 SELECT
-  t.table_schema,
-  t.table_name
+  c.table_schema,
+  c.table_name
 FROM
-  (select * from information_schema.tables where table_schema = (select current_schema) AND table_name in ('table_1','table_2','table_3')) t
-  LEFT OUTER JOIN
-  (select * from information_schema.table_constraints where table_schema = (select current_schema) AND table_name in ('table_1','table_2','table_3')) tc
-  USING (table_schema, table_name)
+  pg_index i
+  JOIN pg_attribute a ON a.attrelid = i.indrelid AND a.attnum = ANY(i.indkey)
+  RIGHT JOIN
+    (SELECT
+      (table_schema ||'.'|| table_name)::regclass AS regid,
+      *
+     FROM information_schema.columns
+     WHERE
+       table_catalog = 'test_db'
+       AND table_schema = (select current_schema)
+       AND table_name IN ('table_1','table_2','table_3')
+    ) c
+  ON i.indrelid = c.regid AND a.attname = c.column_name
+WHERE
+  c.table_catalog = 'test_db'
+  AND c.table_schema = (select current_schema)
+  AND c.table_name IN ('table_1','table_2','table_3')
 GROUP BY
-  t.table_schema, t.table_name
+  c.table_schema, c.table_name
 HAVING
-  SUM(CASE WHEN tc.constraint_type='PRIMARY KEY' THEN 1 ELSE 0 END) = 0;
+  SUM(CASE WHEN i.indisprimary='t' THEN 1 ELSE 0 END) = 0 AND
+  SUM(CASE WHEN i.indisunique='t' THEN 1 ELSE 0 END) = 0;
 EOT
             }
           end
@@ -139,17 +157,31 @@ EOT
             before { option.merge!(schema: 'test_schema') }
             it { is_expected.to eq <<EOT
 SELECT
-  t.table_schema,
-  t.table_name
+  c.table_schema,
+  c.table_name
 FROM
-  (select * from information_schema.tables where table_schema = 'test_schema' AND table_name in ('table_1','table_2','table_3')) t
-  LEFT OUTER JOIN
-  (select * from information_schema.table_constraints where table_schema = 'test_schema' AND table_name in ('table_1','table_2','table_3')) tc
-  USING (table_schema, table_name)
+  pg_index i
+  JOIN pg_attribute a ON a.attrelid = i.indrelid AND a.attnum = ANY(i.indkey)
+  RIGHT JOIN
+    (SELECT
+      (table_schema ||'.'|| table_name)::regclass AS regid,
+      *
+     FROM information_schema.columns
+     WHERE
+       table_catalog = 'test_db'
+       AND table_schema = 'test_schema'
+       AND table_name IN ('table_1','table_2','table_3')
+    ) c
+  ON i.indrelid = c.regid AND a.attname = c.column_name
+WHERE
+  c.table_catalog = 'test_db'
+  AND c.table_schema = 'test_schema'
+  AND c.table_name IN ('table_1','table_2','table_3')
 GROUP BY
-  t.table_schema, t.table_name
+  c.table_schema, c.table_name
 HAVING
-  SUM(CASE WHEN tc.constraint_type='PRIMARY KEY' THEN 1 ELSE 0 END) = 0;
+  SUM(CASE WHEN i.indisprimary='t' THEN 1 ELSE 0 END) = 0 AND
+  SUM(CASE WHEN i.indisunique='t' THEN 1 ELSE 0 END) = 0;
 EOT
             }
           end
@@ -202,10 +234,10 @@ SELECT
   t.table_name,
   col.column_name
 FROM
-  (select * from information_schema.tables where table_schema = (select current_schema) AND table_name in ('table_1','table_2')) t
+  (select * from information_schema.tables where table_catalog = 'test_db' AND table_schema = (select current_schema) AND table_name in ('table_1','table_2')) t
   LEFT JOIN
-  (select * from information_schema.columns where table_schema = (select current_schema) AND table_name in ('table_1','table_2')) col
-  ON t.table_schema = col.table_schema AND t.table_name = col.table_name
+  (select * from information_schema.columns where table_catalog = 'test_db' AND table_schema = (select current_schema) AND table_name in ('table_1','table_2')) col
+  ON t.table_catalog = col.table_catalog AND t.table_schema = col.table_schema AND t.table_name = col.table_name
 ORDER BY
   t.table_name;
 EOT

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

@@ -44,6 +44,7 @@ describe MysqlTableDef do
             {:column=>"col_float_4_2", :type=>"float4(4,2)", :default=>nil},
             {:column=>"col_int", :type=>"int4(11)", :default=>nil},
             {:column=>"col_int_6", :type=>"int4(6)", :default=>nil},
+            {:column=>"col_json", :type=>"json", :default=>nil},
             {:column=>"col_longblob", :type=>"varbinary(4294967295)"},
             {:column=>"col_longtext", :type=>"text"},
             {:column=>"col_mediumblob", :type=>"varbinary(16777215)"},
@@ -88,6 +89,7 @@ describe MysqlTableDef do
   `col_float_4_2` float(4,2) DEFAULT NULL,
   `col_int` int(11) DEFAULT NULL,
   `col_int_6` int(6) DEFAULT NULL,
+  `col_json` json DEFAULT NULL,
   `col_longblob` longblob,
   `col_longtext` longtext,
   `col_mediumblob` mediumblob,

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

@@ -67,6 +67,7 @@ CREATE TABLE IF NOT EXISTS "test_table_all" (
   "col_float_4_2" float4 DEFAULT NULL,
   "col_int" int4 DEFAULT NULL,
   "col_int_6" int4 DEFAULT NULL,
+  "col_json" varchar(max) DEFAULT NULL,
   "col_longblob" varchar(65535),
   "col_longtext" varchar(max),
   "col_mediumblob" varchar(65535),
@@ -101,6 +102,7 @@ CREATE TABLE "test_table_all" (
   "col_float_4_2" float4 DEFAULT NULL,
   "col_int" int4 DEFAULT NULL,
   "col_int_6" int4 DEFAULT NULL,
+  "col_json" varchar(max) DEFAULT NULL,
   "col_longblob" varchar(65535),
   "col_longtext" varchar(max),
   "col_mediumblob" varchar(65535),
@@ -135,23 +137,24 @@ INSERT INTO "flydata_ctl_columns" (table_name, column_name, src_data_type, ordin
 ('test_table_all', 'col_float_4_2', 'float4(4,2)', 11),
 ('test_table_all', 'col_int', 'int4(11)', 12),
 ('test_table_all', 'col_int_6', 'int4(6)', 13),
-('test_table_all', 'col_longblob', 'varbinary(4294967295)', 14),
-('test_table_all', 'col_longtext', 'text', 15),
-('test_table_all', 'col_mediumblob', 'varbinary(16777215)', 16),
-('test_table_all', 'col_mediumint', 'int3(9)', 17),
-('test_table_all', 'col_mediumtext', 'text', 18),
-('test_table_all', 'col_smallint', 'int2(6)', 19),
-('test_table_all', 'col_text', 'text', 20),
-('test_table_all', 'col_time', 'time', 21),
-('test_table_all', 'col_timestamp', 'datetime', 22),
-('test_table_all', 'col_tinyblob', 'varbinary(255)', 23),
-('test_table_all', 'col_tinyint', 'int1(4)', 24),
-('test_table_all', 'col_tinytext', 'text', 25),
-('test_table_all', 'col_varbinary', 'varbinary(512)', 26),
-('test_table_all', 'col_varchar', 'varchar(372)', 27),
-('test_table_all', 'col_year', 'year', 28),
-('test_table_all', 'col_year_4', 'year(4)', 29),
-('test_table_all', 'col_year_2', 'year(2)', 30);
+('test_table_all', 'col_json', 'json', 14),
+('test_table_all', 'col_longblob', 'varbinary(4294967295)', 15),
+('test_table_all', 'col_longtext', 'text', 16),
+('test_table_all', 'col_mediumblob', 'varbinary(16777215)', 17),
+('test_table_all', 'col_mediumint', 'int3(9)', 18),
+('test_table_all', 'col_mediumtext', 'text', 19),
+('test_table_all', 'col_smallint', 'int2(6)', 20),
+('test_table_all', 'col_text', 'text', 21),
+('test_table_all', 'col_time', 'time', 22),
+('test_table_all', 'col_timestamp', 'datetime', 23),
+('test_table_all', 'col_tinyblob', 'varbinary(255)', 24),
+('test_table_all', 'col_tinyint', 'int1(4)', 25),
+('test_table_all', 'col_tinytext', 'text', 26),
+('test_table_all', 'col_varbinary', 'varbinary(512)', 27),
+('test_table_all', 'col_varchar', 'varchar(372)', 28),
+('test_table_all', 'col_year', 'year', 29),
+('test_table_all', 'col_year_4', 'year(4)', 30),
+('test_table_all', 'col_year_2', 'year(2)', 31);
 DELETE FROM "flydata_ctl_tables" WHERE table_name = 'test_table_all';
 INSERT INTO "flydata_ctl_tables" (table_name, attribute, value) VALUES
 ('test_table_all', 'cs', 'UTF_8'),
@@ -170,6 +173,7 @@ INSERT INTO "flydata_ctl_tables" (table_name, attribute, value) VALUES
   `col_float_4_2` float(4,2) DEFAULT NULL,
   `col_int` int(11) DEFAULT NULL,
   `col_int_6` int(6) DEFAULT NULL,
+  `col_json` json DEFAULT NULL,
   `col_longblob` longblob,
   `col_longtext` longtext,
   `col_mediumblob` mediumblob,

data/flydata-core/spec/table_def/mysqldump_test_table_all.dump

@@ -36,6 +36,7 @@ CREATE TABLE `test_table_all` (
   `col_float_4_2` float(4,2) DEFAULT NULL,
   `col_int` int(11) DEFAULT NULL,
   `col_int_6` int(6) DEFAULT NULL,
+  `col_json` json DEFAULT NULL,
   `col_longblob` longblob,
   `col_longtext` longtext,
   `col_mediumblob` mediumblob,

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

@@ -731,6 +731,21 @@ EOT
           it_behaves_like *examples
         end
       end
+
+      context 'with json column def' do
+        before do
+          column[:column] = "value_json"
+          column[:type] = "json"
+        end
+        let(:type_sql) { %Q|"value_json" varchar(max)| }
+        let(:not_null_default_sql) { " DEFAULT '{}'" }
+
+        context 'when default_value is normal' do
+          let(:default_value) { "{}" }
+          let(:default_value_sql) { "'{}'" }
+          it_behaves_like *examples
+        end
+      end
     end
 
     context 'for create table' do

data/flydata.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "flydata"
-  s.version = "0.7.13"
+  s.version = "0.7.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Koichi Fujikawa", "Masashi Miyazaki", "Matthew Luu", "Mak Inada", "Sriram NS"]
-  s.date = "2016-11-18"
+  s.date = "2016-12-02"
   s.description = "FlyData Agent"
   s.email = "sysadmin@flydata.com"
   s.executables = ["fdredshift", "flydata", "serverinfo", "split_sync_ddl.rb"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flydata
 version: !ruby/object:Gem::Version
-  version: 0.7.13
+  version: 0.7.14
 platform: ruby
 authors:
 - Koichi Fujikawa
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-18 00:00:00.000000000 Z
+date: 2016-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client