prostgles-server 4.2.2 → 4.2.4

package/lib/DboBuilder/TableHandler/insert.ts

@@ -36,8 +36,7 @@ export async function insert(this: TableHandler, rowOrRows: AnyObject | AnyObjec
         throw `Direct inserts not allowed. Only nested inserts from these tables: ${JSON.stringify(allowedNestedInserts)} `
       }
     }
-    const { conflict_query } = validateInsertParams(insertParams);
-
+    validateInsertParams(insertParams);
 
     /**
      * If media it will: upload file and continue insert
@@ -49,6 +48,7 @@ export async function insert(this: TableHandler, rowOrRows: AnyObject | AnyObjec
       return insertResult;
     }
 
+    const pkeyNames = this.columns.filter(c => c.is_pkey).map(c => c.name);
     const getInsertQuery = async (_rows: AnyObject[]) => {
       const validatedData = await Promise.all(_rows.map(async _row => {
 
@@ -66,6 +66,16 @@ export async function insert(this: TableHandler, rowOrRows: AnyObject | AnyObjec
       const allowedCols = Array.from( new Set(validatedData.flatMap(d => d.allowedCols)));
       const dbTx = finalDBtx || this.dboBuilder.dbo
       const query = await this.colSet.getInsertQuery(validatedRows, allowedCols, dbTx, validate, localParams);
+
+      const { onConflict } = insertParams ?? {};
+      let conflict_query = "";
+      if (onConflict === "DoNothing") {
+        conflict_query = " ON CONFLICT DO NOTHING ";
+      } else if(onConflict === "DoUpdate"){
+        if(!pkeyNames.length) throw "Cannot do DoUpdate on a table without a primary key";
+        const nonPkeyCols = allowedCols.filter(c => !pkeyNames.includes(c));
+        conflict_query = ` ON CONFLICT (${pkeyNames.join(", ")}) DO UPDATE SET ${nonPkeyCols.map(k => `${k} = EXCLUDED.${k}`).join(", ")}`;
+      }
       return query + conflict_query;
     };
     
@@ -108,10 +118,9 @@ export async function insert(this: TableHandler, rowOrRows: AnyObject | AnyObjec
 
 const validateInsertParams = (params: InsertParams | undefined) => {
 
-  const { onConflictDoNothing, returnType, returning } = params ?? {};
-  let conflict_query = "";
-  if (typeof onConflictDoNothing === "boolean" && onConflictDoNothing) {
-    conflict_query = " ON CONFLICT DO NOTHING ";
+  const { onConflict, returnType, returning } = params ?? {};
+  if(![undefined, "DoNothing", "DoUpdate"].includes(onConflict)){
+    throw `Invalid onConflict: ${onConflict}. Expecting one of: DoNothing, DoUpdate`;
   }
 
   const allowedReturnTypes: InsertParams["returnType"][] = ["row", "value", "values", "statement", undefined]
@@ -124,14 +133,11 @@ const validateInsertParams = (params: InsertParams | undefined) => {
   }
 
   if (params) {
-    const good_paramsObj: Record<keyof InsertParams, 1> = { returning: 1, returnType: 1, fixIssues: 1, onConflictDoNothing: 1 };
+    const good_paramsObj: Record<keyof InsertParams, 1> = { returning: 1, returnType: 1, fixIssues: 1, onConflict: 1 };
     const good_params = Object.keys(good_paramsObj);
     const bad_params = Object.keys(params).filter(k => !good_params.includes(k));
     if (bad_params && bad_params.length) throw "Invalid params: " + bad_params.join(", ") + " \n Expecting: " + good_params.join(", ");
   }
-
-  return { conflict_query }
-
 }
 
 // const removeBuffers = (o: any) => {

package/lib/DboBuilder/TableHandler/update.ts

@@ -29,11 +29,11 @@ export async function update(this: TableHandler, filter: Filter, _newData: AnyOb
     }
 
     const { fields, validateRow, forcedData,  returningFields, forcedFilter, filterFields } = parsedRules;
-    const { onConflictDoNothing = false, fixIssues = false } = params || {};
+    const { onConflict, fixIssues = false } = params || {};
     const { returnQuery = false } = localParams ?? {};
 
     if (params) {
-      const good_paramsObj: Record<keyof UpdateParams, 1> = { returning: 1, returnType: 1, fixIssues: 1, onConflictDoNothing: 1, multi: 1 };
+      const good_paramsObj: Record<keyof UpdateParams, 1> = { returning: 1, returnType: 1, fixIssues: 1, onConflict: 1, multi: 1 };
       const good_params = Object.keys(good_paramsObj);
       const bad_params = Object.keys(params).filter(k => !good_params.includes(k));
       if (bad_params && bad_params.length) throw "Invalid params: " + bad_params.join(", ") + " \n Expecting: " + good_params.join(", ");
@@ -107,8 +107,10 @@ export async function update(this: TableHandler, filter: Filter, _newData: AnyOb
 
     let query = await this.colSet.getUpdateQuery(nData, allowedCols, this.getFinalDbo(localParams), validateRow, localParams)
     query += "\n" + updateFilter.where;
-    if (onConflictDoNothing) query += " ON CONFLICT DO NOTHING ";
-
+    if (onConflict === "DoNothing") query += " ON CONFLICT DO NOTHING ";
+    if(onConflict === "DoUpdate"){
+      throw "onConflict 'DoUpdate' not possible for an update";
+    }
     const queryWithoutUserRLS = query;
     query = withUserRLS(localParams, query);
 

package/lib/Prostgles.ts

@@ -299,7 +299,6 @@ export class Prostgles {
 
   constructor(params: ProstglesInitOptions) {
     if (!params) throw "ProstglesInitOptions missing";
-    if (!params.io) console.warn("io missing. WebSockets will not be set up");
 
     const config: Record<keyof ProstglesInitOptions, 1> = {
       transactions: 1, joins: 1, tsGeneratedTypesDir: 1,

package/lib/initProstgles.ts

@@ -30,10 +30,10 @@ type OnReadyParamsCommon = {
   tables: DbTableInfo[];
   reason: OnInitReason;
 }
-type OnReadyParamsBasic = OnReadyParamsCommon & {
+export type OnReadyParamsBasic = OnReadyParamsCommon & {
   dbo: DBHandlerServer; 
 }
-type OnReadyParams<S> = OnReadyParamsCommon & {
+export type OnReadyParams<S> = OnReadyParamsCommon & {
   dbo: DBOFullyTyped<S>; 
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "4.2.2",
+  "version": "4.2.4",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -46,7 +46,7 @@
     "pg-cursor": "^2.10.3",
     "pg-promise": "^11.5.4",
     "prostgles-client": "^4.0.53",
-    "prostgles-types": "^4.0.67"
+    "prostgles-types": "^4.0.68"
   },
   "devDependencies": {
     "@types/bluebird": "^3.5.36",

package/tests/isomorphic_queries.ts

@@ -86,6 +86,16 @@ export default async function isomorphic(db: Required<DBHandlerServer> | DBHandl
     await db.sql("TRUNCATE files CASCADE");
   });
 
+  await tryRun("onConflict do update", async () => {
+    const initial = await db.items4.insert!({ id: -99, name: "onConflict", public: "onConflict" }, { returning: "*" });
+    const updated = await db.items4.insert!({ id: -99, name: "onConflict", public: "onConflict2" }, { onConflict: "DoUpdate", returning: "*" });
+    assert.equal(initial.id, -99);
+    assert.equal(initial.public, "onConflict");
+    assert.equal(updated.id, -99);
+    assert.equal(updated.public, "onConflict2");
+    await db.items4.delete!({ id: -99 });
+  });
+
   const fileFolder = `${__dirname}/../../server/dist/server/media/`;
   const fileName = "sample_file.txt";
   await tryRun("Local file upload", async () => {

package/tests/server/package-lock.json

@@ -21,7 +21,7 @@
     },
     "../..": {
       "name": "prostgles-server",
-      "version": "4.2.1",
+      "version": "4.2.3",
       "license": "MIT",
       "dependencies": {
         "@types/express": "^4.17.13",
@@ -35,7 +35,7 @@
         "pg-cursor": "^2.10.3",
         "pg-promise": "^11.5.4",
         "prostgles-client": "^4.0.53",
-        "prostgles-types": "^4.0.67"
+        "prostgles-types": "^4.0.68"
       },
       "devDependencies": {
         "@types/bluebird": "^3.5.36",
@@ -1548,7 +1548,7 @@
         "pg-cursor": "^2.10.3",
         "pg-promise": "^11.5.4",
         "prostgles-client": "^4.0.53",
-        "prostgles-types": "^4.0.67",
+        "prostgles-types": "^4.0.68",
         "typescript": "^5.2.2"
       }
     },