refs 3604 @12h all tests pass

3 files changed, 67 insertions, 16 deletions

diff --git a/spec/support/bare_sql.rb b/spec/support/bare_sql.rb
new file mode 100644
index 000000000..03a50ef77
--- /dev/null
+++ b/spec/support/bare_sql.rb
@@ -0,0 +1,58 @@
+module Support
+  module BareSQL
+
+    def insert(schema, table, values)
+      execute "INSERT INTO #{schema}.#{table} (#{_keys(values)}) VALUES (#{_values values})"
+    end
+
+    def execute(sql)
+      base_connection.execute(sql)
+    end
+
+    def expect_same_content(table_name)
+      expected_content = get_content(source_schema, table_name)
+      actual_content   = get_content(target_schema, table_name)
+      expect( actual_content ).to eq(expected_content)
+    end
+
+    def expect_same_sequence_params(sequence_name)
+      expected_seq = Hash.without(get_sequences(source_schema, sequence_name).first, 'log_cnt')
+      actual_seq   = Hash.without(get_sequences(target_schema, sequence_name).first, 'log_cnt')
+      expect( actual_seq ).to eq(expected_seq)
+    end
+
+    def get_content(schema_name, table_name)
+      execute("SELECT * FROM #{schema_name}.#{table_name}").to_a
+    end
+
+    private
+
+    def base_connection
+      ActiveRecord::Base.connection
+    end
+
+    def _keys(values)
+      values.keys.map(&:to_s).join(", ")
+    end
+
+    def _values(values)
+      values
+        .values
+        .map(&method(:_format))
+        .join(', ')
+    end
+
+    def _format(val)
+      case val
+      when String
+        "'#{val}'"
+      when TrueClass
+        "'t'"
+      when FalseClass
+        "'f'"
+      else
+        val.to_s
+      end
+    end
+  end
+end
diff --git a/spec/support/hash.rb b/spec/support/hash.rb
new file mode 100644
index 000000000..ec9a2f895
--- /dev/null
+++ b/spec/support/hash.rb
@@ -0,0 +1,6 @@
+class << Hash
+  def without(hash, *keys)
+    nk = hash.keys - keys
+    Hash[*nk.zip(hash.values_at(*nk)).flatten]
+  end
+end
diff --git a/spec/support/pg_catalog.rb b/spec/support/pg_catalog.rb
index b902acf82..38c75aabe 100644
--- a/spec/support/pg_catalog.rb
+++ b/spec/support/pg_catalog.rb
@@ -1,17 +1,11 @@
 module Support
   module PGCatalog
-    # TODO: Check what of the follwowing can be done with ActiveRecord. E.g.
-    # @connection.foreign_keys(table)...
-
-    def expect_same_sequence_params(sequence_name)
-      expected_seq = get_sequences(source_schema, sequence_name)
-      actual_seq   = get_sequences(target_schema, sequence_name)
-      expect( actual_seq ).to eq(expected_seq)
-    end
+    include BareSQL
 
     def get_columns(schema_name, table_name)
-      execute("SELECT * from information_schema.columns WHERE table_name = '#{table_name}' AND table_schema = '#{schema_name}'")
+      execute("SELECT column_name, column_default FROM information_schema.columns WHERE table_name = '#{table_name}' AND table_schema = '#{schema_name}'").to_a
     end
+
     def get_foreign_keys(schema_oid, table_name)
       schema_oid = get_schema_oid(schema_oid) unless Integer === schema_oid
       return [] unless schema_oid
@@ -41,13 +35,6 @@ module Support
 
 
     private
-    def base_connection
-      ActiveRecord::Base.connection
-    end
-
-    def execute(sql)
-      base_connection.execute(sql)
-    end
 
     def foreign_key_query(schema_oid, table_name)
       <<-EOQ