squcumber-postgres 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70197c6e99837cc7f6a50448932fbf35ec302afe947c4bfcd44a01e7f3932e92
-  data.tar.gz: 922ede0dc2311200bbc309d216237f9e79034642801503d837453c2c6a6ed183
+  metadata.gz: c74c69c04c7b06dc21cf98c9fc940036cd29fe30034295ea81e7dbf11af2a33b
+  data.tar.gz: edef6b6fb8b544916e05bbfa97d2057f6b5540234a38662304f73090f22e4a88
 SHA512:
-  metadata.gz: 0356e70c0657e311013139b44759f6b321ec16b31c8354e763892293d86e796dabc0e6cfb5e4c2f25a379abee5fc0af0a44f1036c497cccac2747ebb28358db8
-  data.tar.gz: 5cce4bb175805a4e90e34e248279885e012f092fb74eb94aa84825b159eea95976719e6ef04383d33b29a011e8281af46d7e861d831b1351f2297fa33e547754
+  metadata.gz: 5c54f1a70bc5f7d949e58686dedf27586372d353e8c032f99ddef7bb1f06c8cbff9cf0380cb78d06be75f693dc3ba97b540a73246d2f2d5970df7a39a015998f
+  data.tar.gz: bfeddaac3fc25e521fedc2eb3560843b7942c0dc1730a9782230f827c9d975678b91e8a30ac64716c95785428987e772849767106670e4a8a56b87a43b36d223

data/lib/squcumber-postgres/mock/database.rb

@@ -117,10 +117,31 @@ module Squcumber
 
         def _get_column_definitions(table_definition)
           table_definition.map do |definition|
-            if definition['data_type'].eql?('character')
-              definition['data_type'] = "#{definition['data_type']}(#{definition['character_maximum_length'].to_s})"
+            schema_column_type = ''
+            is_array = false
+            if definition['data_type'].eql?('ARRAY')
+                is_array = true
+                schema_column_type = definition['udt_name'].gsub(/^\_/, '')
+            else
+                schema_column_type = definition['data_type']
             end
-            "#{definition['column_name']} #{definition['data_type']} default null"
+
+            # Deal with (var)chars
+            if definition['character_maximum_length']
+                schema_column_type = schema_column_type + "(#{definition['character_maximum_length'].to_s})"
+            end
+
+            # Deal with decimals
+            if definition['udt_name'].eql?('numeric') and definition['numeric_precision'] and definition['numeric_scale']
+                schema_column_type = schema_column_type + "(#{definition['numeric_precision'].to_s},#{definition['numeric_scale'].to_s})"
+            end
+
+            # Deal with arrays
+            if is_array
+                schema_column_type = schema_column_type + '[]'
+            end
+
+            "#{definition['column_name']} #{schema_column_type} default null"
           end
         end
       end

data/spec/squcumber-postgres/mock/database_spec.rb

@@ -335,6 +335,139 @@ module Squcumber::Postgres::Mock
       end
     end
 
+    describe '#_get_column_definitions' do
+      let(:column_definition_integer) do
+        {
+          'table_schema' => 'some_schema',
+          'table_name' => 'some_table',
+          'column_name' => 'some_column',
+          'udt_name' => 'int4',
+          'data_type' => 'integer',
+          'character_maximum_length' => nil,
+          'numeric_precision' => 32,
+          'numeric_scale' => 0
+        }
+      end
+      let(:column_definition_varchar) do
+        {
+          'table_schema' => 'some_schema',
+          'table_name' => 'some_table',
+          'column_name' => 'some_column',
+          'udt_name' => 'varchar',
+          'data_type' => 'character varying',
+          'character_maximum_length' => 255,
+          'numeric_precision' => nil,
+          'numeric_scale' => nil
+        }
+      end
+      let(:column_definition_varchar_array) do
+        {
+          'table_schema' => 'some_schema',
+          'table_name' => 'some_table',
+          'column_name' => 'some_column',
+          'udt_name' => '_varchar',
+          'data_type' => 'ARRAY',
+          'character_maximum_length' => nil,
+          'numeric_precision' => nil,
+          'numeric_scale' => nil
+        }
+      end
+      let(:column_definition_char) do
+        {
+          'table_schema' => 'some_schema',
+          'table_name' => 'some_table',
+          'column_name' => 'some_column',
+          'udt_name' => '_bpchar',
+          'data_type' => 'character',
+          'character_maximum_length' => 50,
+          'numeric_precision' => nil,
+          'numeric_scale' => nil
+        }
+      end
+      let(:column_definition_jsonb) do
+        {
+          'table_schema' => 'some_schema',
+          'table_name' => 'some_table',
+          'column_name' => 'some_column',
+          'udt_name' => 'jsonb',
+          'data_type' => 'jsonb',
+          'character_maximum_length' => nil,
+          'numeric_precision' => nil,
+          'numeric_scale' => nil
+        }
+      end
+      let(:column_definition_timestamp) do
+        {
+          'table_schema' => 'some_schema',
+          'table_name' => 'some_table',
+          'column_name' => 'some_column',
+          'udt_name' => 'timestamp',
+          'data_type' => 'timestamp without time zone',
+          'character_maximum_length' => nil,
+          'numeric_precision' => nil,
+          'numeric_scale' => nil
+        }
+      end
+      let(:column_definition_numeric) do
+        {
+          'table_schema' => 'some_schema',
+          'table_name' => 'some_table',
+          'column_name' => 'some_column',
+          'udt_name' => 'numeric',
+          'data_type' => 'numeric',
+          'character_maximum_length' => nil,
+          'numeric_precision' => 6,
+          'numeric_scale' => 2
+        }
+      end
+
+      before(:each) do
+        @dummy = described_class.new(production_database)
+      end
+
+      it 'parses integer columns correctly' do
+        expect(@dummy.send(:_get_column_definitions, [column_definition_integer])).to match([
+          'some_column integer default null'
+        ])
+      end
+
+      it 'parses varchar columns correctly' do
+        expect(@dummy.send(:_get_column_definitions, [column_definition_varchar])).to match([
+          'some_column character varying(255) default null'
+        ])
+      end
+
+      it 'parses array varchar columns correctly' do
+        expect(@dummy.send(:_get_column_definitions, [column_definition_varchar_array])).to match([
+          'some_column varchar[] default null'
+        ])
+      end
+
+      it 'parses char columns correctly' do
+        expect(@dummy.send(:_get_column_definitions, [column_definition_char])).to match([
+          'some_column character(50) default null'
+        ])
+      end
+
+      it 'parses jsonb columns correctly' do
+        expect(@dummy.send(:_get_column_definitions, [column_definition_jsonb])).to match([
+          'some_column jsonb default null'
+        ])
+      end
+
+      it 'parses timestamp columns correctly' do
+        expect(@dummy.send(:_get_column_definitions, [column_definition_timestamp])).to match([
+          'some_column timestamp without time zone default null'
+        ])
+      end
+
+      it 'parses numeric columns correctly' do
+        expect(@dummy.send(:_get_column_definitions, [column_definition_numeric])).to match([
+          'some_column numeric(6,2) default null'
+        ])
+      end
+    end
+
     describe '#_get_create_table_statement' do
       let(:schema) { 'some_schema' }
       let(:table) { 'some_table' }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: squcumber-postgres
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Stefanie Grunwald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-03 00:00:00.000000000 Z
+date: 2018-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg