Update Postgres dependency

2026-08-29 15:44:00 +00:00 · 2021-11-04 17:22:04 +01:00
parent 562b56f4bb
commit 4be4f03033
6 changed files with 65 additions and 74 deletions
--- a/classes/postgres.js
+++ b/classes/postgres.js
@@ -5,8 +5,10 @@ var connectionString = process.env.DATABASE_URL + "?ssl=true";
 var client = new Client({
    connectionString: connectionString
 });
-client.connect();
-console.log(client);
+client.connect(function (err, client, done) {
+    console.log(err);
+    console.log(done);
+});
 console.log("Successfully connected to Postgres");
 client.query("SELECT NOW()", function (err, res) {
    console.log(err, res);
--- a/classes/postgres.ts
+++ b/classes/postgres.ts
@@ -6,9 +6,11 @@ const connectionString = process.env.DATABASE_URL + "?ssl=true";
 const client = new Client({
  connectionString: connectionString
 });
-client.connect();
+client.connect(function(err, client, done){
+  console.log(err)
+  console.log(done)
+});

-console.log(client);
 console.log("Successfully connected to Postgres");

 client.query("SELECT NOW()", (err, res) => {
--- a/package-lock.json
+++ b/package-lock.json
@@ -7,7 +7,7 @@
            "dependencies": {
                "moment": "^2.24.0",
                "needle": "^2.3.3",
-                "pg": "^7.0.0",
+                "pg": "^8.7.1",
                "prettier": "^1.19.1",
                "telegraf": "^3.36.0",
                "typescript": "^3.8.3"
@@ -110,27 +110,34 @@
            "integrity": "sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ=="
        },
        "node_modules/pg": {
-            "version": "7.18.2",
-            "resolved": "https://registry.npmjs.org/pg/-/pg-7.18.2.tgz",
-            "integrity": "sha512-Mvt0dGYMwvEADNKy5PMQGlzPudKcKKzJds/VbOeZJpb6f/pI3mmoXX0JksPgI3l3JPP/2Apq7F36O63J7mgveA==",
+            "version": "8.7.1",
+            "resolved": "https://registry.npmjs.org/pg/-/pg-8.7.1.tgz",
+            "integrity": "sha512-7bdYcv7V6U3KAtWjpQJJBww0UEsWuh4yQ/EjNf2HeO/NnvKjpvhEIe/A/TleP6wtmSKnUnghs5A9jUoK6iDdkA==",
            "dependencies": {
                "buffer-writer": "2.0.0",
                "packet-reader": "1.0.0",
-                "pg-connection-string": "0.1.3",
-                "pg-packet-stream": "^1.1.0",
-                "pg-pool": "^2.0.10",
+                "pg-connection-string": "^2.5.0",
+                "pg-pool": "^3.4.1",
+                "pg-protocol": "^1.5.0",
                "pg-types": "^2.1.0",
-                "pgpass": "1.x",
-                "semver": "4.3.2"
+                "pgpass": "1.x"
            },
            "engines": {
-                "node": ">= 4.5.0"
+                "node": ">= 8.0.0"
+            },
+            "peerDependencies": {
+                "pg-native": ">=2.0.0"
+            },
+            "peerDependenciesMeta": {
+                "pg-native": {
+                    "optional": true
+                }
            }
        },
        "node_modules/pg-connection-string": {
-            "version": "0.1.3",
-            "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-0.1.3.tgz",
-            "integrity": "sha1-2hhHsglA5C7hSSvq9l1J2RskXfc="
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.5.0.tgz",
+            "integrity": "sha512-r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ=="
        },
        "node_modules/pg-int8": {
            "version": "1.0.1",
@@ -140,10 +147,18 @@
                "node": ">=4.0.0"
            }
        },
-        "node_modules/pg-packet-stream": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/pg-packet-stream/-/pg-packet-stream-1.1.0.tgz",
-            "integrity": "sha512-kRBH0tDIW/8lfnnOyTwKD23ygJ/kexQVXZs7gEyBljw4FYqimZFxnMMx50ndZ8In77QgfGuItS5LLclC2TtjYg=="
+        "node_modules/pg-pool": {
+            "version": "3.4.1",
+            "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.4.1.tgz",
+            "integrity": "sha512-TVHxR/gf3MeJRvchgNHxsYsTCHQ+4wm3VIHSS19z8NC0+gioEhq1okDY1sm/TYbfoP6JLFx01s0ShvZ3puP/iQ==",
+            "peerDependencies": {
+                "pg": ">=8.0"
+            }
+        },
+        "node_modules/pg-protocol": {
+            "version": "1.5.0",
+            "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.5.0.tgz",
+            "integrity": "sha512-muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ=="
        },
        "node_modules/pg-types": {
            "version": "2.2.0",
@@ -160,14 +175,6 @@
                "node": ">=4"
            }
        },
-        "node_modules/pg/node_modules/pg-pool": {
-            "version": "2.0.10",
-            "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-2.0.10.tgz",
-            "integrity": "sha512-qdwzY92bHf3nwzIUcj+zJ0Qo5lpG/YxchahxIN8+ZVmXqkahKXsnl2aiJPHLYN9o5mB/leG+Xh6XKxtP7e0sjg==",
-            "peerDependencies": {
-                "pg": ">5.0"
-            }
-        },
        "node_modules/pgpass": {
            "version": "1.0.4",
            "resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.4.tgz",
@@ -272,14 +279,6 @@
            "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
            "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
        },
-        "node_modules/semver": {
-            "version": "4.3.2",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.2.tgz",
-            "integrity": "sha1-x6BxWKgL7dBSNVt3DYLWZA+AO+c=",
-            "bin": {
-                "semver": "bin/semver"
-            }
-        },
        "node_modules/split2": {
            "version": "3.2.2",
            "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz",
@@ -463,42 +462,39 @@
            "integrity": "sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ=="
        },
        "pg": {
-            "version": "7.18.2",
-            "resolved": "https://registry.npmjs.org/pg/-/pg-7.18.2.tgz",
-            "integrity": "sha512-Mvt0dGYMwvEADNKy5PMQGlzPudKcKKzJds/VbOeZJpb6f/pI3mmoXX0JksPgI3l3JPP/2Apq7F36O63J7mgveA==",
+            "version": "8.7.1",
+            "resolved": "https://registry.npmjs.org/pg/-/pg-8.7.1.tgz",
+            "integrity": "sha512-7bdYcv7V6U3KAtWjpQJJBww0UEsWuh4yQ/EjNf2HeO/NnvKjpvhEIe/A/TleP6wtmSKnUnghs5A9jUoK6iDdkA==",
            "requires": {
                "buffer-writer": "2.0.0",
                "packet-reader": "1.0.0",
-                "pg-connection-string": "0.1.3",
-                "pg-packet-stream": "^1.1.0",
-                "pg-pool": "^2.0.10",
+                "pg-connection-string": "^2.5.0",
+                "pg-pool": "^3.4.1",
+                "pg-protocol": "^1.5.0",
                "pg-types": "^2.1.0",
-                "pgpass": "1.x",
-                "semver": "4.3.2"
-            },
-            "dependencies": {
-                "pg-pool": {
-                    "version": "2.0.10",
-                    "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-2.0.10.tgz",
-                    "integrity": "sha512-qdwzY92bHf3nwzIUcj+zJ0Qo5lpG/YxchahxIN8+ZVmXqkahKXsnl2aiJPHLYN9o5mB/leG+Xh6XKxtP7e0sjg==",
-                    "requires": {}
-                }
+                "pgpass": "1.x"
            }
        },
        "pg-connection-string": {
-            "version": "0.1.3",
-            "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-0.1.3.tgz",
-            "integrity": "sha1-2hhHsglA5C7hSSvq9l1J2RskXfc="
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.5.0.tgz",
+            "integrity": "sha512-r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ=="
        },
        "pg-int8": {
            "version": "1.0.1",
            "resolved": "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz",
            "integrity": "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw=="
        },
-        "pg-packet-stream": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/pg-packet-stream/-/pg-packet-stream-1.1.0.tgz",
-            "integrity": "sha512-kRBH0tDIW/8lfnnOyTwKD23ygJ/kexQVXZs7gEyBljw4FYqimZFxnMMx50ndZ8In77QgfGuItS5LLclC2TtjYg=="
+        "pg-pool": {
+            "version": "3.4.1",
+            "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.4.1.tgz",
+            "integrity": "sha512-TVHxR/gf3MeJRvchgNHxsYsTCHQ+4wm3VIHSS19z8NC0+gioEhq1okDY1sm/TYbfoP6JLFx01s0ShvZ3puP/iQ==",
+            "requires": {}
+        },
+        "pg-protocol": {
+            "version": "1.5.0",
+            "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.5.0.tgz",
+            "integrity": "sha512-muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ=="
        },
        "pg-types": {
            "version": "2.2.0",
@@ -578,11 +574,6 @@
            "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
            "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
        },
-        "semver": {
-            "version": "4.3.2",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.2.tgz",
-            "integrity": "sha1-x6BxWKgL7dBSNVt3DYLWZA+AO+c="
-        },
        "split2": {
            "version": "3.2.2",
            "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz",
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
    "dependencies": {
        "moment": "^2.24.0",
        "needle": "^2.3.3",
-        "pg": "^7.0.0",
+        "pg": "^8.7.1",
        "prettier": "^1.19.1",
        "telegraf": "^3.36.0",
        "typescript": "^3.8.3"
--- a/web.js
+++ b/web.js
@@ -9,11 +9,11 @@ function loadCurrentData(key) {
    var query;
    if (key == "gym" || key == "meditated") {
        query =
-            "SELECT * FROM raw_data WHERE key = '$1' AND value != '0' ORDER BY timestamp DESC LIMIT 1";
+            "SELECT * FROM raw_data WHERE key = $1 AND value != '0' ORDER BY timestamp DESC LIMIT 1";
    }
    else {
        query =
-            "SELECT * FROM raw_data WHERE key = '$1' ORDER BY timestamp DESC LIMIT 1";
+            "SELECT * FROM raw_data WHERE key = $1 ORDER BY timestamp DESC LIMIT 1";
    }
    console.log(query);
    postgres.client.query({
@@ -46,7 +46,6 @@ var keys = [
    "macrosProtein",
    "macrosFat",
    "weeklyComputerTime",
-    "dexaFatPercent",
    "meditated"
 ];
 var _loop_1 = function (i) {
--- a/web.ts
+++ b/web.ts
@@ -1,5 +1,3 @@
-declare var require: any;
-
 // Third party dependencies
 var http = require("http");
 const moment = require("moment");
@@ -14,10 +12,10 @@ function loadCurrentData(key) {
  let query;
  if (key == "gym" || key == "meditated") {
    query =
-      "SELECT * FROM raw_data WHERE key = '$1' AND value != '0' ORDER BY timestamp DESC LIMIT 1";
+      "SELECT * FROM raw_data WHERE key = $1 AND value != '0' ORDER BY timestamp DESC LIMIT 1";
  } else {
    query =
-      "SELECT * FROM raw_data WHERE key = '$1' ORDER BY timestamp DESC LIMIT 1";
+      "SELECT * FROM raw_data WHERE key = $1 ORDER BY timestamp DESC LIMIT 1";
  }

  console.log(query);
@@ -59,7 +57,6 @@ let keys = [
  "macrosProtein",
  "macrosFat",
  "weeklyComputerTime",
-  "dexaFatPercent",
  "meditated"
 ];
 for (let i = 0; i < keys.length; i++) {