prostgles-server 2.0.184 → 2.0.187

package/lib/TableConfig.ts

@@ -1,5 +1,6 @@
+import { doesNotMatch } from "assert";
 import { getKeys, asName, AnyObject, TableInfo } from "prostgles-types";
-import { isPlainObject, JoinInfo } from "./DboBuilder";
+import { DboBuilder, isPlainObject, JoinInfo } from "./DboBuilder";
 import { ALLOWED_EXTENSION, ALLOWED_CONTENT_TYPE } from "./FileManager";
 import { DB, DBHandlerServer, Prostgles } from "./Prostgles";
 import { asValue } from "./PubSubManager";
@@ -429,8 +430,11 @@ export default class TableConfigurator<LANG_IDS = { en: 1 }> {
         }
       }
       if ("constraints" in tableConf && tableConf.constraints) {
+        const constraints = await getTableConstraings(this.db, tableName);
         getKeys(tableConf.constraints).map(constraintName => {
-          queries.push(`ALTER TABLE ${asName(tableName)} ADD CONSTRAINT ${asName(constraintName)} ${tableConf.constraints![constraintName]} ;`);
+          if(!constraints.some(c => c.conname === constraintName)){
+            queries.push(`ALTER TABLE ${asName(tableName)} ADD CONSTRAINT ${asName(constraintName)} ${tableConf.constraints![constraintName]} ;`);
+          }
         });
       }
       if ("indexes" in tableConf && tableConf.indexes) {
@@ -461,4 +465,17 @@ async function columnExists(args: { tableName: string; colName: string; db: DB }
         WHERE table_name=${asValue(tableName)} and column_name=${asValue(colName)}
         LIMIT 1;
     `))?.column_name);
+}
+
+function getTableConstraings(db: DB, tableName: string): Promise<{ oid: number; conname: string; definition: string; }[]>{
+  return db.any(`
+    SELECT con.*, pg_get_constraintdef(con.oid)
+    FROM pg_catalog.pg_constraint con
+        INNER JOIN pg_catalog.pg_class rel
+            ON rel.oid = con.conrelid
+        INNER JOIN pg_catalog.pg_namespace nsp
+            ON nsp.oid = connamespace
+    WHERE 1=1
+    AND nsp.nspname = current_schema
+    AND rel.relname = ` + "${tableName}", { tableName })
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "2.0.184",
+  "version": "2.0.187",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -29,7 +29,7 @@
     "bluebird": "^3.7.2",
     "file-type": "^16.5.3",
     "pg-promise": "^10.11.1",
-    "prostgles-types": "^1.5.158",
+    "prostgles-types": "^1.5.160",
     "sharp": "^0.30.5"
   },
   "devDependencies": {

package/tests/client/PID.txt

@@ -1 +1 @@
-10213
+3011

package/tests/client/package-lock.json

@@ -10,7 +10,7 @@
       "license": "ISC",
       "dependencies": {
         "@types/node": "^14.14.16",
-        "prostgles-client": "^1.5.155",
+        "prostgles-client": "^1.5.161",
         "prostgles-types": "^1.5.68",
         "socket.io-client": "^4.5.1"
       }
@@ -67,17 +67,17 @@
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
     "node_modules/prostgles-client": {
-      "version": "1.5.155",
-      "resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-1.5.155.tgz",
-      "integrity": "sha512-orBcUdhUN3Y2RUnNWPqlZEQ123UJIQQ59e3cx873Tx58UlKnSKzRiY2Gi9WVaUF4fW157Rvfay3Rsb0qRRgbeQ==",
+      "version": "1.5.161",
+      "resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-1.5.161.tgz",
+      "integrity": "sha512-/1NHXfyKtoPLquNjv8eWIvk0ezjogaL3QRJrGpUiH6vt74MFVQ5FRwtrct37fj0fBwsKS4HrHduwh33Ohv1ycw==",
       "dependencies": {
-        "prostgles-types": "^1.5.157"
+        "prostgles-types": "^1.5.160"
       }
     },
     "node_modules/prostgles-types": {
-      "version": "1.5.157",
-      "resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-1.5.157.tgz",
-      "integrity": "sha512-+EyjDatAoAFlEglsBH7wjzIQMixRgyJB/ST3/ibH2/+EOr6RQFzTt4maJUVborcUhlQCj7MKjl/ddYcbch6vTQ=="
+      "version": "1.5.160",
+      "resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-1.5.160.tgz",
+      "integrity": "sha512-ycX5dqkrf73qAvAylhn6jHsL0eBq3/Fmky3YEIm7vTqJFJfS+5EmFPxF4CdjPWs3WHZEhuGCoXlZZo/rWFK0eQ=="
     },
     "node_modules/socket.io-client": {
       "version": "4.5.1",
@@ -176,17 +176,17 @@
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
     "prostgles-client": {
-      "version": "1.5.155",
-      "resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-1.5.155.tgz",
-      "integrity": "sha512-orBcUdhUN3Y2RUnNWPqlZEQ123UJIQQ59e3cx873Tx58UlKnSKzRiY2Gi9WVaUF4fW157Rvfay3Rsb0qRRgbeQ==",
+      "version": "1.5.161",
+      "resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-1.5.161.tgz",
+      "integrity": "sha512-/1NHXfyKtoPLquNjv8eWIvk0ezjogaL3QRJrGpUiH6vt74MFVQ5FRwtrct37fj0fBwsKS4HrHduwh33Ohv1ycw==",
       "requires": {
-        "prostgles-types": "^1.5.157"
+        "prostgles-types": "^1.5.160"
       }
     },
     "prostgles-types": {
-      "version": "1.5.157",
-      "resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-1.5.157.tgz",
-      "integrity": "sha512-+EyjDatAoAFlEglsBH7wjzIQMixRgyJB/ST3/ibH2/+EOr6RQFzTt4maJUVborcUhlQCj7MKjl/ddYcbch6vTQ=="
+      "version": "1.5.160",
+      "resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-1.5.160.tgz",
+      "integrity": "sha512-ycX5dqkrf73qAvAylhn6jHsL0eBq3/Fmky3YEIm7vTqJFJfS+5EmFPxF4CdjPWs3WHZEhuGCoXlZZo/rWFK0eQ=="
     },
     "socket.io-client": {
       "version": "4.5.1",

package/tests/client/package.json

@@ -13,7 +13,7 @@
   "license": "ISC",
   "dependencies": {
     "@types/node": "^14.14.16",
-    "prostgles-client": "^1.5.155",
+    "prostgles-client": "^1.5.161",
     "prostgles-types": "^1.5.68",
     "socket.io-client": "^4.5.1"
   }

package/tests/isomorphic_queries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"isomorphic_queries.d.ts","sourceRoot":"","sources":["isomorphic_queries.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAC,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAGjD,wBAAsB,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,EAAE,GAAG,CAAC,EAAE,QAAQ,iBAWzE;AACD,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,KAAK,GAAG,EAAE,GAAG,CAAC,EAAE,QAAQ,oBAW7F;AAED,wBAA8B,UAAU,CAAC,EAAE,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC,iBAurB/F"}
+{"version":3,"file":"isomorphic_queries.d.ts","sourceRoot":"","sources":["isomorphic_queries.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAC,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAGjD,wBAAsB,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,EAAE,GAAG,CAAC,EAAE,QAAQ,iBAWzE;AACD,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,KAAK,GAAG,EAAE,GAAG,CAAC,EAAE,QAAQ,oBAW7F;AAED,wBAA8B,UAAU,CAAC,EAAE,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC,iBAwrB/F"}

package/tests/isomorphic_queries.js

@@ -295,6 +295,7 @@ async function isomorphic(db) {
     });
     await tryRunP("subscribe", async (resolve, reject) => {
         await db.various.insert({ id: 99 });
+        console.log("subscribing");
         const sub = await db.various.subscribe({ id: 99 }, {}, async (items) => {
             const item = items[0];
             if (item && item.name === "zz3zz3") {

package/tests/isomorphic_queries.ts

@@ -327,6 +327,7 @@ export default async function isomorphic(db: Partial<DBHandlerServer> | Partial<
 
   await tryRunP("subscribe", async (resolve, reject) => {
     await db.various.insert({ id: 99 });
+    console.log("subscribing")
     const sub = await db.various.subscribe({ id: 99  }, {  }, async items => {
       const item = items[0];
       

package/tests/server/package-lock.json

@@ -21,7 +21,7 @@
     },
     "../..": {
       "name": "prostgles-server",
-      "version": "2.0.183",
+      "version": "2.0.186",
       "license": "MIT",
       "dependencies": {
         "@aws-sdk/client-s3": "^3.95.0",
@@ -29,7 +29,7 @@
         "bluebird": "^3.7.2",
         "file-type": "^16.5.3",
         "pg-promise": "^10.11.1",
-        "prostgles-types": "^1.5.158",
+        "prostgles-types": "^1.5.160",
         "sharp": "^0.30.5"
       },
       "devDependencies": {
@@ -1371,7 +1371,7 @@
         "bluebird": "^3.7.2",
         "file-type": "^16.5.3",
         "pg-promise": "^10.11.1",
-        "prostgles-types": "^1.5.158",
+        "prostgles-types": "^1.5.160",
         "sharp": "^0.30.5",
         "typescript": "^4.7.3"
       }