From b1c7f1801f2fbb8a1912ae4229a8748bfdc5407f Mon Sep 17 00:00:00 2001
From: Euclides dos Reis Silva Junior <euclides.silva@media4care.de>
Date: Tue, 3 Dec 2019 17:01:12 +0100
Subject: [PATCH] Check schema when checking for migrations table.

---
 src/migrate.ts | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/migrate.ts b/src/migrate.ts
index fd01e15..78a17e8 100644
--- a/src/migrate.ts
+++ b/src/migrate.ts
@@ -75,11 +75,13 @@ function runMigrations(
   return async (client: pg.Client) => {
     try {
       const migrationTableName = "migrations"
+      const schema = "public"
 
       log("Will run migrations...")
 
       const appliedMigrations = await fetchAppliedMigrationFromDB(
         migrationTableName,
+        schema,
         client,
         log,
       )
@@ -144,11 +146,12 @@ function withConnection<T>(
 /** Queries the database for migrations table and retrieve it rows if exists */
 async function fetchAppliedMigrationFromDB(
   migrationTableName: string,
+  schema: string,
   client: pg.Client,
   log: Logger,
 ) {
   let appliedMigrations = []
-  if (await doesTableExist(client, migrationTableName)) {
+  if (await doesTableExist(client, migrationTableName, schema)) {
     log(`
 Migrations table with name '${migrationTableName}' exists,
 filtering not applied migrations.`)
@@ -221,12 +224,18 @@ function logResult(completedMigrations: Array<Migration>, log: Logger) {
 }
 
 /** Check whether table exists in postgres - http://stackoverflow.com/a/24089729 */
-async function doesTableExist(client: pg.Client, tableName: string) {
+async function doesTableExist(
+  client: pg.Client,
+  tableName: string,
+  schema: string,
+) {
   const result = await client.query(SQL`
       SELECT EXISTS (
         SELECT 1
         FROM   pg_catalog.pg_class c
-        WHERE  c.relname = ${tableName}
+        JOIN   pg_catalog.pg_namespace n ON n.oid = c.relnamespace
+        WHERE  n.nspname = ${schema}
+        AND    c.relname = ${tableName}
         AND    c.relkind = 'r'
       );
     `)