Fix #129 - Fix schemas option in MSSQL.

rmp135 · May 25, 2023 · fc12c6e · fc12c6e
1 parent ccf8f16
commit fc12c6e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Adapters/mssql.ts b/src/Adapters/mssql.ts
@@ -20,8 +20,8 @@ export default class implements AdapterInterface {
           UNION
           SELECT TOP 1 value FROM fn_listextendedproperty (NULL, 'schema', TABLE_SCHEMA, 'view', TABLE_NAME, null, null) EP WHERE EP.name = 'MS_Description'
         ) EP 
-      ${schemas.length > 0 ? `WHERE TABLE_SCHEMA IN (:schemas)` : ''}`
-    return await db.raw(sql, { schemas })
+      ${schemas.length > 0 ? `WHERE TABLE_SCHEMA IN (${schemas.map(_ => '?').join(',')})` : ''}`
+    return await db.raw(sql, schemas)
   }
 
   async getAllColumns(db: Knex, config: Config, table: string, schema: string): Promise<ColumnDefinition[]> {

diff --git a/src/specs/Adapters/mssql.spec.ts b/src/specs/Adapters/mssql.spec.ts
@@ -47,8 +47,8 @@ describe('mssql', () => {
       const mockdb = { raw: mockRaw }
       const adapter = new Mockmssql.default()
       const res = await adapter.getAllTables(mockdb as any, ['schema1', 'schema2'])
-      expect(mockRaw.calls.first().args[0]).toContain('WHERE TABLE_SCHEMA IN (:schemas)')
-      expect(mockRaw.calls.first().args[1]).toEqual({ schemas: ['schema1', 'schema2'] })
+      expect(mockRaw.calls.first().args[0]).toContain('WHERE TABLE_SCHEMA IN (?,?)')
+      expect(mockRaw.calls.first().args[1]).toEqual(['schema1', 'schema2'])
       expect(res).toEqual(mockRawReturn as any)
     })
   })