From 19b3b3bd3ef7e58d432e2895e55c57c4f5b62f6a Mon Sep 17 00:00:00 2001
From: Yu Sun <suny226@mail2.sysu.edu.cn>
Date: Sat, 16 Jul 2022 14:16:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=89=8B=E8=AF=AF=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E9=9C=80=E8=A6=81=E8=87=AA=E5=8A=A8=E7=BB=91=E5=AE=9A?=
 =?UTF-8?q?connector=E5=AF=B9=E8=B1=A1=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 EdgeManager/EDataCapture/ENodeConfigure.php | 8 ++++----
 EdgeManager/Init.php                        | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/EdgeManager/EDataCapture/ENodeConfigure.php b/EdgeManager/EDataCapture/ENodeConfigure.php
index 7c7c68b..eadd182 100644
--- a/EdgeManager/EDataCapture/ENodeConfigure.php
+++ b/EdgeManager/EDataCapture/ENodeConfigure.php
@@ -9,7 +9,7 @@ class ENodeConfigure {
     ) {}
 
     function add_node() {
-        $exists = pg_query(sprintf(
+        $exists = pg_query($this -> dbconn, sprintf(
             "SELECT EXISTS(
                 SELECT 1 FROM hf_mes_scada_data_capture_node_configure WHERE code='%s'
             )", $this -> post -> code
@@ -39,7 +39,7 @@ class ENodeConfigure {
             (array) $this -> post
         );
         // 检查一下，如果超表已经有了就不要尝试重复创建了
-        $table_exists = pg_query(sprintf(
+        $table_exists = pg_query($this -> dbconn, sprintf(
             "SELECT *
             FROM timescaledb_information.hypertables
             WHERE hypertable_name = '%s'
@@ -70,13 +70,13 @@ class ENodeConfigure {
             'hf_mes_scada_data_capture_node_configure',
             (array) $this -> post,
         );
-        $exists = pg_query(sprintf(
+        $exists = pg_query($this -> dbconn, sprintf(
             "SELECT EXISTS(
                 SELECT 1 FROM hf_mes_scada_data_capture_node_configure WHERE working_subclass = '%s'
             )", $this -> post -> working_subclass
         ));
         if (pg_fetch_assoc($exists)['exists'] == 'f') {
-            $res[] = pg_query(sprintf(
+            $res[] = pg_query($this -> dbconn, sprintf(
                 'DROP TABLE "hf_mes_scada_data_capture_node_data_%s"',
                 $this -> post -> working_subclass
             ));
diff --git a/EdgeManager/Init.php b/EdgeManager/Init.php
index ea4c2dd..a1f6bf2 100644
--- a/EdgeManager/Init.php
+++ b/EdgeManager/Init.php
@@ -1,14 +1,14 @@
 <?php
 function init_db($server_name, $user, $password) {
     $dbconn = pg_connect(sprintf("host=%s user=%s password=%s", $server_name, $user, $password));
-    $res = pg_query("select datname from pg_database");
+    $res = pg_query($dbconn, "select datname from pg_database");
     
     if (!in_array('scada', pg_fetch_all_columns($res, 0)))
-        pg_query("CREATE DATABASE scada");
+        pg_query($dbconn, "CREATE DATABASE scada");
     pg_close($dbconn);
 
     $dbconn = pg_connect(sprintf("host=%s dbname=scada user=%s password=%s", $server_name, $user, $password));
-    pg_query("CREATE TABLE IF NOT EXISTS hf_mes_scada_data_capture_node_configure (
+    pg_query($dbconn, "CREATE TABLE IF NOT EXISTS hf_mes_scada_data_capture_node_configure (
         id serial2,
         code text primary key NOT NULL,
         name text NOT NULL,