objection 3.3.0 → 3.4.1

package/lib/utils/assert.js

@@ -1,6 +1,14 @@
 'use strict';
 
+function assertHasIdColumn(modelClass) {
+  if (modelClass.getIdColumnArray().length === 0) {
+    throw new Error(`model ${modelClass.name} has no idColumn`);
+  }
+}
+
 function assertHasId(model) {
+  assertHasIdColumn(model.constructor);
+
   if (!model.$hasId()) {
     const modelClass = model.constructor;
     const ids = modelClass.getIdColumnArray().join(', ');
@@ -21,5 +29,6 @@ function assertIdNotUndefined(id, message) {
 
 module.exports = {
   assertHasId,
+  assertHasIdColumn,
   assertIdNotUndefined,
 };

package/lib/utils/wrapDbError.js

@@ -0,0 +1,36 @@
+'use strict';
+
+const { wrapError, DBError, UniqueViolationError } = require('db-errors');
+
+// db-errors only recognizes mssql unique key violations, but the same error
+// number (2627) is also used for primary key violations (#2688).
+const MSSQL_PRIMARY_KEY_REGEX =
+  /Violation of PRIMARY KEY constraint '(.+)'\. Cannot insert duplicate key in object '(.+)\.(.+)'\. The duplicate key value is \((.+)\)/;
+
+function wrapDbError(err) {
+  const wrapped = wrapError(err);
+
+  if (wrapped.constructor === DBError && wrapped.client === 'mssql') {
+    const { nativeError } = wrapped;
+    const match =
+      nativeError.info &&
+      nativeError.info.number === 2627 &&
+      MSSQL_PRIMARY_KEY_REGEX.exec(nativeError.message);
+
+    if (match) {
+      return new UniqueViolationError({
+        nativeError,
+        client: 'mssql',
+        table: match[3],
+        schema: match[2],
+        constraint: match[1],
+      });
+    }
+  }
+
+  return wrapped;
+}
+
+module.exports = {
+  wrapDbError,
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "objection",
-  "version": "3.3.0",
+  "version": "3.4.1",
   "description": "An SQL-friendly ORM for Node.js",
   "main": "lib/objection.js",
   "license": "MIT",
@@ -63,11 +63,10 @@
     "db-errors": "^0.2.3"
   },
   "peerDependencies": {
-    "knex": ">=1.0.1"
+    "knex": ">=2.3.0"
   },
   "devDependencies": {
     "@types/node": "^22.15.3",
-    "bluebird": "^3.7.2",
     "chai": "^4.3.10",
     "chai-subset": "^1.6.0",
     "eslint": "^8.54.0",
@@ -75,14 +74,12 @@
     "eslint-plugin-prettier": "^5.3.1",
     "expect.js": "^0.3.1",
     "knex": "^3.3.0",
-    "lodash": "^4.18.1",
     "mocha": "^11.2.2",
     "mysql": "^2.18.1",
     "pg": "^8.15.6",
     "prettier": "3.9.9",
     "sqlite3": "^5.1.7",
     "typescript": ">=5.8.3",
-    "uuid": "^9.0.1",
     "vitepress": "1.6.4"
   }
 }

package/typings/objection/index.d.ts

@@ -590,7 +590,7 @@ declare namespace Objection {
   }
 
   interface FromMethod<QB extends AnyQueryBuilder> {
-    (table: TableRef<QB>): QB;
+    (table: TableRef<QB>, options?: { only?: boolean }): QB;
   }
 
   interface FromRawMethod<QB extends AnyQueryBuilder> extends RawInterface<QB> {}