Fixing setting comments on columns

lib/operations/tables.js

@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import { escapeValue, template, quote, applyType, applyTypeAdapters, comment } from '../utils';
+import { escapeValue, template, quote, applyType, applyTypeAdapters, comment, schemalize } from '../utils';
 
 const formatLines = (lines, replace, separator = ',') =>
   lines
@@ -61,7 +61,7 @@ const parseColumns = (tableName, columns, extendingTypeShorthands = {}) => {
   }
 
   const comments = _.chain(columnsWithOptions)
-    .map((options, columnName) => typeof options.comment !== 'undefined' && comment('COLUMN', `${tableName}"."${columnName}`, options.comment))
+    .map((options, columnName) => typeof options.comment !== 'undefined' && comment('COLUMN', `${schemalize(tableName)}"."${columnName}`, options.comment))
     .filter()
     .value();
 

lib/utils.js

@@ -133,16 +133,13 @@ export const applyTypeAdapters = type => (typeAdapters[type] ? typeAdapters[type
 
 export const applyType = (type, extendingTypeShorthands = {}) => {
   const typeShorthands = { ...defaultTypeShorthands, ...extendingTypeShorthands };
-  let options = type;
-  if (typeof type === 'string') {
-    options = typeShorthands[type] // eslint-disable-line no-param-reassign
-      ? typeShorthands[type]
-      : { type };
-  }
-
-  options.type = applyTypeAdapters(options.type); // eslint-disable-line no-param-reassign
-
-  return options;
+  const options = typeof type === 'string' ? { type } : type;
+  const ext = typeShorthands[options.type] || { type: options.type };
+  return {
+    ...ext,
+    ...options,
+    type: applyTypeAdapters(ext.type),
+  };
 };
 
 const formatParam = typeShorthands => (param) => {

test/migrations/060_column_comment.js

@@ -0,0 +1,7 @@
+exports.comment = 'comment on column id';
+
+exports.up = (pgm) => {
+  pgm.createTable({ schema: 'circle_test', name: 'tcc' }, {
+    id: { type: 'id', comment: exports.comment },
+  });
+};

test/migrations/061_column_comment_test.js

@@ -0,0 +1,16 @@
+const column = require('./060_column_comment');
+
+exports.up = pgm =>
+  new Promise((resolve, reject) =>
+    pgm.db.select(`SELECT d.description as "comment"
+                FROM pg_description d join information_schema.columns c on (d.objsubid = c.ordinal_position)
+                WHERE c.table_schema = 'circle_test' and c.table_name = 'tcc';`)
+      .then(([{ comment }]) => (
+        comment === column.comment
+          ? null
+          : reject(new Error('Comment not set'))
+      ))
+      .then(resolve)
+  );
+
+exports.down = () => null;