fix(publications): update logic following #98

Probably better to specify `tables` using OIDs when creating
publications, but this'll do for now.

Author: soedirgo

package.json

@@ -21,7 +21,7 @@
     "build:server": "tsc -p tsconfig.server.json && cpy 'src/lib/sql/*.sql' bin/src/lib/sql",
     "start": "node bin/src/server/app.js | pino-pretty --colorize --levelFirst",
     "pkg": "NODE_ENV=production run-s build:server && pkg --out-path bin .pkg.config.json",
-    "dev": "NODE_ENV=development run-s build start",
+    "dev": "NODE_ENV=development run-s build:server start",
     "dev:watch": "nodemon",
     "test": "node -r esm ./node_modules/.bin/mocha 'test/**/*.js' --recursive "
   },

src/lib/PostgresMetaPublications.ts

@@ -68,7 +68,7 @@ export default class PostgresMetaPublications {
     } else if (tables.length === 0) {
       tableClause = ''
     } else {
-      tableClause = `FOR TABLE ${tables.map(ident).join(',')}`
+      tableClause = `FOR TABLE ${tables.join(',')}`
     }
 
     let publishOps = []
@@ -122,7 +122,7 @@ CREATE PUBLICATION ${ident(name)} ${tableClause}
     //             ---------|-----------|-----------------|
     //                 null |    ''     | 400 Bad Request |
     // old tables  ---------|-----------|-----------------|
-    //             string[] |    ''     |    See below    |
+    //             object[] |    ''     |    See below    |
     //
     //                              new tables
     //
@@ -138,12 +138,12 @@ CREATE PUBLICATION ${ident(name)} ${tableClause}
     } else if (old!.tables === null) {
       throw new Error('Tables cannot be added to or dropped from FOR ALL TABLES publications')
     } else if (tables.length > 0) {
-      tableSql = `ALTER PUBLICATION ${ident(old!.name)} SET TABLE ${tables.map(ident).join(',')};`
+      tableSql = `ALTER PUBLICATION ${ident(old!.name)} SET TABLE ${tables.join(',')};`
     } else if (old!.tables.length === 0) {
       tableSql = ''
     } else {
       tableSql = `ALTER PUBLICATION ${ident(old!.name)} DROP TABLE ${old!.tables
-        .map(ident)
+        .map((table) => `${ident(table.schema)}.${ident(table.name)}`)
         .join(',')};`
     }
 

src/lib/types.ts

@@ -110,7 +110,7 @@ export interface PostgresPublication {
   publish_update: boolean
   publish_delete: boolean
   publish_truncate: boolean
-  tables: string[] | null
+  tables: { id: number; name: string; schema: string }[] | null
 }
 
 export interface PostgresRelationship {

src/old/api/publications.ts

@@ -89,7 +89,7 @@ const createPublicationSqlize = ({
   publish_truncate?: boolean
   tables?: string[]
 }) => {
-  let tableClause: string = `FOR TABLE ${tables!.map(ident).join(',')}`
+  let tableClause: string = `FOR TABLE ${tables!.join(',')}`
   if (tables === undefined) {
     tableClause = 'FOR ALL TABLES'
   } else if (tables.length === 0) {
@@ -145,7 +145,7 @@ const alterPublicationSqlize = ({
   //             ---------|-----------|-----------------|
   //                 null |    ''     | 400 Bad Request |
   // old tables  ---------|-----------|-----------------|
-  //             string[] |    ''     |    See below    |
+  //             object[] |    ''     |    See below    |
   //
   //                              new tables
   //
@@ -161,15 +161,15 @@ const alterPublicationSqlize = ({
   } else if (oldPublication.tables === null) {
     throw Error('Tables cannot be added to or dropped from FOR ALL TABLES publications')
   } else if (tables.length > 0) {
-    tableSql = `ALTER PUBLICATION ${ident(oldPublication.name)} SET TABLE ${tables
-      .map(ident)
-      .join(',')}`
+    tableSql = `ALTER PUBLICATION ${ident(oldPublication.name)} SET TABLE ${tables.join(',')}`
   } else if (oldPublication.tables.length === 0) {
     tableSql = ''
   } else {
     tableSql = `ALTER PUBLICATION ${ident(
       oldPublication.name
-    )} DROP TABLE ${oldPublication.tables.map(ident).join(',')}`
+    )} DROP TABLE ${oldPublication.tables
+      .map((table: any) => `${ident(table.schema)}.${ident(table.name)}`)
+      .join(',')}`
   }
 
   let publishOps = []

test/integration/index.spec.js

@@ -661,7 +661,7 @@ describe('/publications', () => {
     assert.equal(newPublication.publish_update, publication.publish_update)
     assert.equal(newPublication.publish_delete, publication.publish_delete)
     assert.equal(newPublication.publish_truncate, publication.publish_truncate)
-    assert.equal(newPublication.tables.includes('users'), true)
+    assert.equal(newPublication.tables.some(table => `${table.schema}.${table.name}` === 'public.users'), true)
   })
   it('GET', async () => {
     const res = await axios.get(`${URL}/publications`)
@@ -679,7 +679,7 @@ describe('/publications', () => {
     })
     assert.equal(updated.name, 'b')
     assert.equal(updated.publish_insert, false)
-    assert.equal(updated.tables.includes('users'), false)
+    assert.equal(updated.tables.some(table => `${table.schema}.${table.name}` === 'public.users'), false)
   })
   it('DELETE', async () => {
     const res = await axios.get(`${URL}/publications`)