1 files changed, 25 insertions, 16 deletions
diff --git a/query-executor.js b/query-executor.js
index 871da9e..0c5b440 100644
--- a/query-executor.js
+++ b/query-executor.js
@@ -1,30 +1,39 @@
 "use strict";
 
-const { ipcRenderer } = require("electron");
+const { remote, ipcRenderer } = require("electron");
 const { Pool } = require("pg");
 
+const executorId = require("uuid/v1")();
+
+const connectionConfig = remote.getCurrentWindow().connectionConfig;
+
 const connectionPool = new Pool({
-  user: "postgres",
-  host: "localhost",
+  user: connectionConfig.username,
+  host: connectionConfig.host,
   database: "postgres",
-  password: "",
-  port: 5432
+  password: connectionConfig.password,
+  port: connectionConfig.port
 });
 
-ipcRenderer.on("queryExecutor.runQuery", (event, payload) => {
-
-  connectionPool.query(payload.query, (err, res) => {
+// Initialisation completed
+ipcRenderer.send("queryExecutor.initialiseConnectionCallback", executorId);
 
-    console.log(err, res)
+ipcRenderer.on("queryExecutor.runQuery", (event, payload) => {
 
-    ipcRenderer.send("queryExecutor.runQueryComplete", {
-      "error": err,
-      "result": res,
-      "editorInstanceId": payload.editorInstanceId
+  if(payload.queryExecutorId === executorId) {
+    connectionPool.query(payload.query, (err, res) => {
+
+      console.log(err, res)
+  
+      ipcRenderer.send("queryExecutor.runQueryComplete", {
+        "error": err,
+        "result": res,
+        "editorInstanceId": payload.editorInstanceId
+      });
+  
     });
-
-  });
-
+  }
+  
 });
 
 ipcRenderer.on("queryExecutor.queryTableMetadata", (event, payload) => {