flydata 0.7.2 → 0.7.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4388aaa10ad1cba39ffe66fa6b6db2fed3e5268
-  data.tar.gz: 91dfd8a833cc5f3b4b8e47d72e9276e58fc8212a
+  metadata.gz: 041b42f8c7a79544e1075015c40b5f4d617eb983
+  data.tar.gz: 18a938ab66c2754e67821cdb93178f0450991d8d
 SHA512:
-  metadata.gz: 0f88c6786e5ab53a363c486d2d43def69b4b861f8da830de2cad0dd884f27f9b328792c8633c32b76fedc245979cc660977b59840434e3ef3ec3ddafa4c10547
-  data.tar.gz: 4db0d551a501458a49c7386919f827ed6961dddd737ac82c20eb096f6c3d192c125e7045e027f462d8caf1ea106c84db8711a66abae024929382bb8888cba627
+  metadata.gz: 0afce08535788fde831998db168317d125ab4e4249f36dd9d10fee443ca3e62bb3dfce478bc3953e04d5d57dd7fa560e4ba2a1948c517021378f52a0686abc58
+  data.tar.gz: e7af6dd1ec9470fd25a5c853858123112deb8f90c1a7543d09dc99c5564d75398c63f934125906f29bbf91b53d8cc8fa923f014b32c7b164f7554bf0058b44bd

data/VERSION

@@ -1 +1 @@
-0.7.2
+0.7.2.1

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

@@ -56,7 +56,7 @@ class RedshiftTableDef
       options[:backup_postfix] = "_flydata#{Time.now.strftime('%Y%m%d%H%M%S')}"
       tabledef += "BEGIN;\n"
       tabledef += remove_table_sql(flydata_tabledef, schema_name, options) unless options[:ctl_only]
-      tabledef += create_table_sql(flydata_tabledef, schema_name) unless options[:ctl_only]
+      tabledef += create_table_sql(flydata_tabledef, schema_name, options) unless options[:ctl_only]
       tabledef += comment_sql(flydata_tabledef, schema_name) unless options[:ctl_only]
       tabledef += flydata_ctl_sql(flydata_tabledef, schema_name)
       tabledef += "COMMIT;\n"
@@ -167,7 +167,7 @@ EOS
       sql += drop_backup_table_sql(flydata_tabledef, schema_name, options)
       # create an empty table to prevent RENAME TABLE query from failing
       sql += create_table_sql(flydata_tabledef, schema_name,
-                       create_table_sql: CREATE_TABLE_IF_NOT_EXISTS_SQL)
+                       options.merge(create_table_sql: CREATE_TABLE_IF_NOT_EXISTS_SQL))
       backup_tbl = table_name_for_ddl(
                      "#{table_name}#{options[:backup_postfix]}", nil)
       sql += RENAME_TABLE_SQL % [redshift_tbl, backup_tbl]
@@ -194,6 +194,13 @@ EOS
     ct_sql = options[:create_table_sql] || CREATE_TABLE_SQL
     lines = flydata_tabledef[:columns].collect{|column| column_def_sql(column) }
     pk_def = primary_key_sql(flydata_tabledef)
+
+    unless options[:skip_primary_key_check]
+      unless pk_def
+        $log.error "no primary key defined in table: #{flydata_tabledef[:table_name]}"
+        raise "no primary key defined"
+      end
+    end
     lines << pk_def if pk_def
 
     contents = lines.join(",\n")

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

@@ -403,6 +403,33 @@ describe PostgresqlTableDef do
       end
     end
   end
+
+  describe '.parse_one_column_def' do
+    subject {described_class.parse_one_column_def(information_schema_column)}
+    let(:information_schema_column) { {} }
+    let(:type) { double('type') }
+    before do
+      information_schema_column["is_primary"] = is_primary
+      allow(described_class).to receive(:convert_to_flydata_type).
+        with(information_schema_column).
+        and_return(type)
+    end
+
+    context 'when the column is primary key' do
+      let(:is_primary) { 't' }
+      it { expect(subject[:primary_key]).to eq true}
+    end
+
+    context 'when the column is index key' do
+      let(:is_primary) { 'f' }
+      it { expect(subject[:primary_key]).to eq nil}
+    end
+
+    context 'when the column is not primary key or index key' do
+      let(:is_primary) { nil }
+      it { expect(subject[:primary_key]).to eq nil}
+    end
+  end
 end
 
 end

data/lib/flydata/command/sync.rb

@@ -1184,7 +1184,7 @@ EOM
         flydata_tabledefs.each do |flydata_tabledef|
           skip_drop_table = opts.drop_append_only? ? false : append_only.include?(flydata_tabledef[:table_name])
           puts FlydataCore::TableDef::SyncRedshiftTableDef.from_flydata_tabledef(flydata_tabledef,
-            flydata_ctl_table: create_flydata_ctl_table, schema_name: schema_name, ctl_only: opts.ctl_only?, skip_drop_table: skip_drop_table)
+            flydata_ctl_table: create_flydata_ctl_table, schema_name: schema_name, ctl_only: opts.ctl_only?, skip_drop_table: skip_drop_table, skip_primary_key_check: opts.skip_primary_key_check?)
           create_flydata_ctl_table = false
         end
         table_validity_hash = {}

metadata

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