Merge pull request #6 from moertel/special-col-support

Add support for jsonb and arrays

Author: Stefanie Grunwald

lib/squcumber-postgres/mock/database.rb

@@ -117,10 +117,31 @@ def _get_create_table_statement(schema, table)
 
         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

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' }

squcumber-postgres.gemspec

@@ -1,13 +1,13 @@
 Gem::Specification.new do |s|
   s.name               = 'squcumber-postgres'
-  s.version            = '0.0.4'
+  s.version            = '0.0.5'
   s.default_executable = 'squcumber-postgres'
 
   s.licenses = ['MIT']
   s.required_ruby_version = '>= 2.0'
   s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
   s.authors = ['Stefanie Grunwald']
-  s.date = %q{2018-09-03}
+  s.date = %q{2018-09-05}
   s.email = %q{steffi@physics.org}
   s.files = [
     'Rakefile',