fix: handling of type identifier in column create() and update()

Author: DukeManh

src/lib/PostgresMetaColumns.ts

@@ -4,9 +4,6 @@ import { DEFAULT_SYSTEM_SCHEMAS } from './constants'
 import { columnsSql } from './sql'
 import { PostgresMetaResult, PostgresColumn } from './types'
 
-// TODO: Fix handling of `type` in `create()` and `update()`.
-// `type` on its own is not enough, e.g. `1::my type` should be `1::"my type"`.
-// `ident(type)` is not enough, e.g. `"int2[]"` should be `"int2"[]`.
 export default class PostgresMetaColumns {
   query: (sql: string) => Promise<PostgresMetaResult<any>>
   metaTables: PostgresMetaTables
@@ -163,7 +160,7 @@ export default class PostgresMetaColumns {
 
     const sql = `
 BEGIN;
-  ALTER TABLE ${ident(schema)}.${ident(table)} ADD COLUMN ${ident(name)} ${type}
+  ALTER TABLE ${ident(schema)}.${ident(table)} ADD COLUMN ${ident(name)} ${typeIdent(type)}
     ${defaultValueClause}
     ${isNullableClause}
     ${isPrimaryKeyClause}
@@ -223,7 +220,7 @@ COMMIT;`
         ? ''
         : `ALTER TABLE ${ident(old!.schema)}.${ident(old!.table)} ALTER COLUMN ${ident(
             old!.name
-          )} SET DATA TYPE ${ident(type)} USING ${ident(old!.name)}::${ident(type)};`
+          )} SET DATA TYPE ${typeIdent(type)} USING ${ident(old!.name)}::${typeIdent(type)};`
 
     let defaultValueSql: string
     if (drop_default) {
@@ -349,3 +346,7 @@ COMMIT;`
     return { data: column!, error: null }
   }
 }
+
+const typeIdent = (type: string) => {
+  return type.endsWith('[]') ? `${ident(type.slice(0, -2))}[]` : ident(type)
+}

test/lib/columns.ts

@@ -444,6 +444,53 @@ test('update with name unchanged', async () => {
   await pgMeta.tables.remove(testTable!.id)
 })
 
+test('update with array types', async () => {
+  const { data: testTable } = await pgMeta.tables.create({ name: 't' })
+
+  let res = await pgMeta.columns.create({
+    table_id: testTable!.id,
+    name: 'c',
+    type: 'text',
+  })
+  res = await pgMeta.columns.update(res.data!.id, {
+    type: 'text[]',
+  })
+  expect(res).toMatchInlineSnapshot(
+    {
+      data: {
+        id: expect.stringMatching(/^\d+\.1$/),
+        table_id: expect.any(Number),
+      },
+    },
+    `
+    Object {
+      "data": Object {
+        "comment": null,
+        "data_type": "ARRAY",
+        "default_value": null,
+        "enums": Array [],
+        "format": "_text",
+        "id": StringMatching /\\^\\\\d\\+\\\\\\.1\\$/,
+        "identity_generation": null,
+        "is_generated": false,
+        "is_identity": false,
+        "is_nullable": true,
+        "is_unique": false,
+        "is_updatable": true,
+        "name": "c",
+        "ordinal_position": 1,
+        "schema": "public",
+        "table": "t",
+        "table_id": Any<Number>,
+      },
+      "error": null,
+    }
+  `
+  )
+
+  await pgMeta.tables.remove(testTable!.id)
+})
+
 test('update with incompatible types', async () => {
   const { data: testTable } = await pgMeta.tables.create({ name: 't' })