fix: support schemas query param for listing tables

sweatybridge · sweatybridge · commit 95992c97acfc · 2022-12-23T07:58:37.000+08:00
diff --git a/src/lib/PostgresMetaTables.ts b/src/lib/PostgresMetaTables.ts
@@ -13,15 +13,19 @@ export default class PostgresMetaTables {
 
   async list({
     includeSystemSchemas = false,
+    schemas,
     limit,
     offset,
   }: {
     includeSystemSchemas?: boolean
+    schemas?: string[]
     limit?: number
     offset?: number
   } = {}): Promise<PostgresMetaResult<PostgresTable[]>> {
     let sql = enrichedTablesSql
-    if (!includeSystemSchemas) {
+    if (schemas) {
+      sql = `${sql} WHERE (schema IN (${schemas.map(literal).join(',')}))`
+    } else if (!includeSystemSchemas) {
       sql = `${sql} WHERE NOT (schema IN (${DEFAULT_SYSTEM_SCHEMAS.map(literal).join(',')}))`
     }
     if (limit) {
diff --git a/src/server/routes/tables.ts b/src/server/routes/tables.ts
@@ -8,17 +8,17 @@ export default async (fastify: FastifyInstance) => {
     Headers: { pg: string }
     Querystring: {
       include_system_schemas?: string
+      schemas?: string[]
       limit?: number
       offset?: number
     }
   }>('/', async (request, reply) => {
     const connectionString = request.headers.pg
     const includeSystemSchemas = request.query.include_system_schemas === 'true'
-    const limit = request.query.limit
-    const offset = request.query.offset
+    const { schemas, limit, offset } = request.query
 
     const pgMeta = new PostgresMeta({ ...DEFAULT_POOL_CONFIG, connectionString })
-    const { data, error } = await pgMeta.tables.list({ includeSystemSchemas, limit, offset })
+    const { data, error } = await pgMeta.tables.list({ includeSystemSchemas, schemas, limit, offset })
     await pgMeta.end()
     if (error) {
       request.log.error({ error, request: extractRequestForLogging(request) })
