fix: default_value can be literals or expressions

Literals: 'hello', 123

Expressions: NULL, NOW()

Author: soedirgo

src/api/columns.ts

@@ -102,6 +102,7 @@ const addColumnSqlize = ({
   name,
   type,
   default_value,
+  default_value_format = 'literal',
   is_identity = false,
   is_nullable = true,
   is_primary_key = false,
@@ -113,6 +114,7 @@ const addColumnSqlize = ({
   name: string
   type: string
   default_value?: any
+  default_value_format?: 'expression' | 'literal'
   is_identity?: boolean
   is_nullable?: boolean
   is_primary_key?: boolean
@@ -122,10 +124,10 @@ const addColumnSqlize = ({
   let defaultValueSql: string
   if (default_value === undefined) {
     defaultValueSql = ''
-  } else if (typeof default_value === 'string') {
-    defaultValueSql = `DEFAULT ${literal(default_value)}`
-  } else {
+  } else if (default_value_format === 'expression') {
     defaultValueSql = `DEFAULT ${default_value}`
+  } else {
+    defaultValueSql = `DEFAULT ${literal(default_value)}`
   }
   const isIdentitySql = is_identity ? 'GENERATED BY DEFAULT AS IDENTITY' : ''
   const isNullableSql = is_nullable ? 'NULL' : 'NOT NULL'
@@ -167,6 +169,7 @@ const alterColumnSqlize = ({
   type,
   drop_default = false,
   default_value,
+  default_value_format = 'literal',
   is_nullable,
   comment,
 }: {
@@ -177,6 +180,7 @@ const alterColumnSqlize = ({
   type?: string
   drop_default?: boolean
   default_value?: any
+  default_value_format?: 'expression' | 'literal'
   is_nullable?: boolean
   comment?: string
 }) => {
@@ -206,8 +210,10 @@ const alterColumnSqlize = ({
       oldName
     )
   } else if (default_value !== undefined) {
+    let defaultValue =
+      default_value_format === 'expression' ? default_value : literal(default_value)
     defaultValueSql = format(
-      `ALTER TABLE %I.%I ALTER COLUMN %I SET DEFAULT ${default_value};`,
+      `ALTER TABLE %I.%I ALTER COLUMN %I SET DEFAULT ${defaultValue};`,
       schema,
       table,
       oldName

test/integration/index.spec.js

@@ -313,23 +313,24 @@ describe('/tables', async () => {
       (column) =>
         column.id === `${newTable.id}.1` && column.name === 'foo bar' && column.format === 'int2'
     )
-    assert.equal(newColumn.default_value, 42)
+    assert.equal(newColumn.default_value, "'42'::smallint")
     assert.equal(newColumn.is_nullable, false)
     assert.equal(newColumn.comment, 'foo')
 
     await axios.delete(`${URL}/columns/${newTable.id}.1`)
     await axios.delete(`${URL}/tables/${newTable.id}`)
   })
-  it('/columns default_value for type text', async () => {
+  it('/columns default_value with expressions', async () => {
     const { data: newTable } = await axios.post(`${URL}/tables`, { name: 'a' })
     const { data: newColumn } = await axios.post(`${URL}/columns`, {
       table_id: newTable.id,
       name: 'a',
-      type: 'text',
-      default_value: 'a',
+      type: 'timestamptz',
+      default_value: 'NOW()',
+      default_value_format: 'expression',
     })
 
-    assert.equal(newColumn.default_value, `'a'::text`)
+    assert.equal(newColumn.default_value, 'now()')
 
     await axios.delete(`${URL}/columns/${newTable.id}.1`)
     await axios.delete(`${URL}/tables/${newTable.id}`)