From 46b45c8ab64fb6837a532c4f8342167e4fd794bb Mon Sep 17 00:00:00 2001
From: Fabio Di Stasio <fabio286@gmail.com>
Date: Mon, 17 Jan 2022 09:15:18 +0100
Subject: [PATCH] fix(PostgreSQL): schema different than public not
 automatically selected, closes #172

---
 src/main/libs/clients/PostgreSQLClient.js | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/main/libs/clients/PostgreSQLClient.js b/src/main/libs/clients/PostgreSQLClient.js
index bd9ea56b..a5a7865c 100644
--- a/src/main/libs/clients/PostgreSQLClient.js
+++ b/src/main/libs/clients/PostgreSQLClient.js
@@ -131,15 +131,23 @@ export class PostgreSQLClient extends AntaresCore {
    }
 
    /**
-    * Executes an "USE" query
+    * Executes an 'SET search_path TO "${schema}"' query
     *
     * @param {String} schema
+    * @param {Object?} connection optional
     * @memberof PostgreSQLClient
     */
-   use (schema) {
+   use (schema, connection) {
       this._schema = schema;
-      if (schema)
-         return this.raw(`SET search_path TO "${schema}"`);
+
+      if (schema) {
+         const sql = `SET search_path TO "${schema}"`;
+
+         if (connection === undefined)
+            return this.raw(sql);
+         else
+            return connection.query(sql);
+      }
    }
 
    /**
@@ -1441,7 +1449,7 @@ export class PostgreSQLClient extends AntaresCore {
          this._runningConnections.set(args.tabUid, connection.processID);
 
       if (args.schema && args.schema !== 'public')
-         await this.use(args.schema);
+         await this.use(args.schema, connection);
 
       for (const query of queries) {
          if (!query) continue;