v2.25.2: Disable coalescing in $cas updates on concurrent updates, even if the $cas values are the same

Author: dimikot

.gitignore

@@ -2,6 +2,7 @@ dist
 
 # Common in both .gitignore and .npmignore
 node_modules
+coverage
 yarn.lock
 pnpm-lock.yaml
 .DS_Store

.npmignore

@@ -5,6 +5,7 @@ dist/*.tsbuildinfo
 
 # Common in both .gitignore and .npmignore
 node_modules
+coverage
 package-lock.json
 yarn.lock
 pnpm-lock.yaml

docs/classes/PgQueryUpdate.md

@@ -6,7 +6,7 @@
 
 # Class: PgQueryUpdate\<TTable\>
 
-Defined in: [src/pg/PgQueryUpdate.ts:11](https://github.com/clickup/ent-framework/blob/master/src/pg/PgQueryUpdate.ts#L11)
+Defined in: [src/pg/PgQueryUpdate.ts:10](https://github.com/clickup/ent-framework/blob/master/src/pg/PgQueryUpdate.ts#L10)
 
 A very lean interface for a Query. In practice each query is so different
 that this interface is the only common part of them all.
@@ -27,7 +27,7 @@ that this interface is the only common part of them all.
 
 > **new PgQueryUpdate**\<`TTable`\>(`schema`, `id`, `input`): [`PgQueryUpdate`](PgQueryUpdate.md)\<`TTable`\>
 
-Defined in: [src/pg/PgQueryUpdate.ts:16](https://github.com/clickup/ent-framework/blob/master/src/pg/PgQueryUpdate.ts#L16)
+Defined in: [src/pg/PgQueryUpdate.ts:15](https://github.com/clickup/ent-framework/blob/master/src/pg/PgQueryUpdate.ts#L15)
 
 #### Parameters
 
@@ -55,7 +55,7 @@ Defined in: [src/pg/PgQueryUpdate.ts:16](https://github.com/clickup/ent-framewor
 
 > **run**(`client`, `annotation`): `Promise`\<`boolean`\>
 
-Defined in: [src/pg/PgQueryUpdate.ts:26](https://github.com/clickup/ent-framework/blob/master/src/pg/PgQueryUpdate.ts#L26)
+Defined in: [src/pg/PgQueryUpdate.ts:25](https://github.com/clickup/ent-framework/blob/master/src/pg/PgQueryUpdate.ts#L25)
 
 #### Parameters
 

eslint.base.config.mjs

@@ -594,6 +594,11 @@ export default function createConfig({
                 message:
                   "Please use react-router-dom instead, since react-router's useLocation() doesn't work properly with StaticRouter on server side.",
               },
+              {
+                group: ["braintrust/loadPrompt"],
+                message:
+                  "You should use DynamicPromptsRepository to load prompts from braintrust.",
+              }
             ],
           },
         ],

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "@clickup/ent-framework",
   "description": "A PostgreSQL graph-database-alike library with microsharding and row-level security",
-  "version": "2.25.1",
+  "version": "2.25.2",
   "license": "MIT",
   "keywords": [
     "postgresql",

package.json

@@ -2,7 +2,6 @@ import uniq from "lodash/uniq";
 import type { Query } from "../abstract/Query";
 import type { QueryAnnotation } from "../abstract/QueryAnnotation";
 import type { Schema } from "../abstract/Schema";
-import { stringHash } from "../internal/misc";
 import type { Field, Table, UpdateInput } from "../types";
 import { ID } from "../types";
 import type { PgClient } from "./PgClient";
@@ -143,10 +142,12 @@ class PgRunnerUpdate<TTable extends Table> extends PgRunner<
   }
 
   override key(input: UpdateInput<TTable> & { [ID]: string }): string {
-    return (
-      input[ID] +
-      (input.$cas ? ":" + stringHash(JSON.stringify(input.$cas)) : "")
-    );
+    // If we have $cas, then we disable coalescing entirely. E.g. when a client
+    // sends 2 updates for the same ID even for the same $cas values from the
+    // same Node process, we want only the 1st update to succeed and the 2nd one
+    // to skip (same behavior as if those 2 updates were run in different Node
+    // processes: coalescing must not change the concurrency guarantees).
+    return input.$cas ? super.key(input) : input[ID];
   }
 
   async runSingle(