flydata 0.7.10 → 0.7.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2dde125415d768ce91d31ba571250fcc82211a6c
-  data.tar.gz: 47de949761414acc3786397da03180e4f862cab8
+  metadata.gz: d5cb99d4fe2e890c02757c744e6c62f0946b2bf4
+  data.tar.gz: 5ca9a5c1618e2775b975adb6702d96399cb57ebf
 SHA512:
-  metadata.gz: 6f21358a59fb60e600a0a823a80574bd923b269093dc1d91618f9dc3e6ef7813ab385171666f62e8c86ad84a94e6db1d4c4dbad561acf9276b4ff4f94af12a32
-  data.tar.gz: 51daad9b9152816d384b367df2dbdffc3f3a0f3e9d07cf103759a8c2835d7b1bc71356961286f86da447a1dc0b2a218a9d9a669a6e4616f6da746ad8a4fb361d
+  metadata.gz: 634e6cee60de39ac8bdef5fe551095645b24adf5c54f9904499954b7682ee004feedcfa2d7d2a517b75ee2677706d2d9ab45430f17b67d99e0e3970b420d18d8
+  data.tar.gz: c03762c4bb3f013d349499ed50f6b4e9cbf4eb08d9943fdae5d8b6fb77eab53d9ce026813ee72122a03c8e79aa358e7c96e2aaedc49a5361615a6b99a607de22

data/VERSION

@@ -1 +1 @@
-0.7.10
+0.7.11

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

@@ -174,6 +174,9 @@ class PostgresqlTableDef < Base
     column[:default] = case column[:type]
       when 'boolean'
         to_boolean(information_schema_column["column_default"])
+      when '_unsupported'
+        # omit default value
+        nil
       else
         information_schema_column["column_default"] # TODO nil handling
       end

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

@@ -408,13 +408,17 @@ describe PostgresqlTableDef do
     subject {described_class.parse_one_column_def(information_schema_column)}
     let(:information_schema_column) { {} }
     let(:type) { double('type') }
+    let(:is_primary) { double('is_primary') }
+    let(:column_default) { double('column_default') }
     before do
       information_schema_column["is_primary"] = is_primary
+      information_schema_column["column_default"] = column_default
       allow(described_class).to receive(:convert_to_flydata_type).
         with(information_schema_column).
         and_return(type)
     end
 
+    # PRIMARY KEY
     context 'when the column is primary key' do
       let(:is_primary) { 't' }
       it { expect(subject[:primary_key]).to eq true}
@@ -429,6 +433,35 @@ describe PostgresqlTableDef do
       let(:is_primary) { nil }
       it { expect(subject[:primary_key]).to eq nil}
     end
+
+    # DEFAULT expression
+    context 'when the column type is a supported type' do
+      context 'when DEFAULT value is not specified' do
+        let(:type) { 'int4' }
+        let(:column_default) { nil }
+        it { expect(subject[:default]).to eq column_default }
+      end
+
+      context 'when DEFAULT value is specified' do
+        let(:type) { 'varchar(96)' }
+        let(:column_default) { "'FlyData, Inc.'"}
+        it { expect(subject[:default]).to eq column_default }
+      end
+    end
+
+    context 'when the column type is a unsupported' do
+      context 'when DEFAULT value is not specified' do
+        let(:type) { '_unsupported' }
+        let(:column_default) { nil }
+        it { expect(subject[:default]).to eq column_default }
+      end
+
+      context 'when DEFAULT value is specified' do
+        let(:type) { '_unsupported' }
+        let(:column_default) { "'{}'" }
+        it { expect(subject[:default]).to eq nil }
+      end
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flydata
 version: !ruby/object:Gem::Version
-  version: 0.7.10
+  version: 0.7.11
 platform: ruby
 authors:
 - Koichi Fujikawa
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-09 00:00:00.000000000 Z
+date: 2016-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -882,7 +882,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: FlyData Agent