Alter column comment (#292)

* Ability to alter only comment on column * test fix
salsita · Jun 29, 2018 · d88f694 · d88f694
1 parent b3ee05a
commit d88f694
Show file tree

Hide file tree

Showing 6 changed files with 68 additions and 21 deletions.
diff --git a/lib/operations/tables.js b/lib/operations/tables.js
@@ -312,12 +312,17 @@ function alterColumn(tableName, columnName, options) {
     actions.push("DROP NOT NULL");
   }
 
-  const columnsStr = formatLines(actions, `  ALTER "${columnName}" `);
-  const columnCommentStr =
-    typeof columnComment !== "undefined"
-      ? `\n${comment("TABLE ", columnName, columnComment)}`
-      : "";
-  return template`ALTER TABLE "${tableName}"\n${columnsStr};${columnCommentStr}`;
+  const queries = [];
+  if (actions.length > 0) {
+    const columnsStr = formatLines(actions, `  ALTER "${columnName}" `);
+    queries.push(template`ALTER TABLE "${tableName}"\n${columnsStr};`);
+  }
+  if (typeof columnComment !== "undefined") {
+    queries.push(
+      comment("COLUMN ", template`${tableName}"."${columnName}`, columnComment)
+    );
+  }
+  return queries.join("\n");
 }
 
 function renameTable(tableName, newName) {

diff --git a/test/migrations/060_column_comment.js b/test/migrations/060_column_comment.js
@@ -1,11 +1,10 @@
 exports.comment = "comment on column id";
+const schema = "test";
+exports.table = { schema: "test", name: "tcc" };
 
 exports.up = pgm => {
-  pgm.createSchema("test");
-  pgm.createTable(
-    { schema: "test", name: "tcc" },
-    {
-      id: { type: "id", comment: exports.comment }
-    }
-  );
+  pgm.createSchema(schema);
+  pgm.createTable(exports.table, {
+    id: { type: "id", comment: exports.comment }
+  });
 };
diff --git a/test/migrations/061_column_comment_test.js b/test/migrations/061_column_comment_test.js
@@ -1,18 +1,22 @@
-const column = require("./060_column_comment");
+const {
+  comment,
+  table: { schema, name }
+} = 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 = 'test' and c.table_name = 'tcc';`
+        `SELECT d.description
+            FROM pg_description d
+            join information_schema.columns c on (d.objsubid = c.ordinal_position)
+            join pg_class t ON (t.relname = c.table_name and t.relkind = 'r' and d.objoid = t.oid)
+            join pg_namespace n ON (t.relnamespace = n.oid and n.nspname = c.table_schema)
+            WHERE c.column_name = 'id' and c.table_schema = '${schema}' and c.table_name = '${name}';`
       )
       .then(
-        ([{ comment }]) =>
-          comment === column.comment
-            ? null
-            : reject(new Error("Comment not set"))
+        ([{ description }]) =>
+          description === comment ? null : reject(new Error("Comment not set"))
       )
       .then(resolve)
   );

diff --git a/.../migrations/066_materialized_view._testjs → .../migrations/066_materialized_view_test.js b/.../migrations/066_materialized_view._testjs → .../migrations/066_materialized_view_test.js
diff --git a/test/migrations/072_alter_column_comment.js b/test/migrations/072_alter_column_comment.js
@@ -0,0 +1,15 @@
+exports.comment = "This is my comment";
+const schema = "comment_schema";
+exports.table = { schema, name: "t" };
+
+exports.up = pgm => {
+  pgm.createSchema(schema);
+  pgm.createTable(exports.table, { id: "id" });
+  pgm.alterColumn(exports.table, "id", { type: "text" });
+  pgm.alterColumn(exports.table, "id", { comment: exports.comment });
+};
+
+exports.down = pgm => {
+  pgm.dropTable(exports.table);
+  pgm.dropSchema(schema);
+};
diff --git a/test/migrations/073_alter_column_comment_test.js b/test/migrations/073_alter_column_comment_test.js
@@ -0,0 +1,24 @@
+const {
+  table: { schema, name },
+  comment
+} = require("./072_alter_column_comment");
+
+exports.up = pgm =>
+  new Promise((resolve, reject) =>
+    pgm.db
+      .select(
+        `SELECT d.description
+            FROM pg_description d
+            join information_schema.columns c on (d.objsubid = c.ordinal_position)
+            join pg_class t ON (t.relname = c.table_name and t.relkind = 'r' and d.objoid = t.oid)
+            join pg_namespace n ON (t.relnamespace = n.oid and n.nspname = c.table_schema)
+            WHERE c.column_name = 'id' and c.table_schema = '${schema}' and c.table_name = '${name}';`
+      )
+      .then(
+        ([{ description }]) =>
+          description === comment ? null : reject(new Error("Comment not set"))
+      )
+      .then(resolve)
+  );
+
+exports.down = () => null;