From 4ec63449fc4ecb17cca658bfdb96e125580e75b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ju=CC=88rg=20Lehni?= Date: Tue, 13 Feb 2024 11:21:52 +0100 Subject: [PATCH 1/3] v3.1.4 --- doc/release-notes/changelog.md | 9 +++++++++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/doc/release-notes/changelog.md b/doc/release-notes/changelog.md index 187db90a2..ba7155172 100644 --- a/doc/release-notes/changelog.md +++ b/doc/release-notes/changelog.md @@ -1,5 +1,14 @@ # Changelog +## 3.1.4 + +### What's new + +- Fix `upsertGraph()` `$beforeUpdate()` calls on empty relates [#2605](https://github.com/Vincit/objection.js/issues/2605) +- Don't call `onError()` with internal exceptions [#2603](https://github.com/Vincit/objection.js/issues/2603) +- Remove docs and typings for nonexistent `$pick()` +- Make `$omitFromJson()` + `$omitFromDatabaseJson()` compatible with old `$omit()` syntax + ## 3.1.3 ### What's new diff --git a/package-lock.json b/package-lock.json index 7a8b2a9a3..1b25d4c2c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "objection", - "version": "3.1.3", + "version": "3.1.4", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "objection", - "version": "3.1.3", + "version": "3.1.4", "license": "MIT", "dependencies": { "ajv": "^8.12.0", diff --git a/package.json b/package.json index 16b06520d..9ea93ad55 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "objection", - "version": "3.1.3", + "version": "3.1.4", "description": "An SQL-friendly ORM for Node.js", "main": "lib/objection.js", "license": "MIT", From ed88b90ece8dc92079b2fc8f9649a644963d7d84 Mon Sep 17 00:00:00 2001 From: Guillaume Robin Date: Wed, 28 Feb 2024 15:05:54 +0100 Subject: [PATCH 2/3] (#1898) Fix typings for Model.columnNameToPropertyName and Model.propertyNameToColumnName static methods --- package.json | 3 ++- typings/objection/index.d.ts | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 9ea93ad55..b716b8397 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,8 @@ "Mikael Lepistö (https://github.com/elhigu)", "Matthew McEachen (https://github.com/mceachen)", "Jürg Lehni (https://github.com/lehni)", - "Igor Savin (https://github.com/kibertoad)" + "Igor Savin (https://github.com/kibertoad)", + "Guillaume Robin (https://github.com/cesumilo)" ], "repository": { "type": "git", diff --git a/typings/objection/index.d.ts b/typings/objection/index.d.ts index 8fdd8eced..8ec8519c7 100644 --- a/typings/objection/index.d.ts +++ b/typings/objection/index.d.ts @@ -1473,6 +1473,9 @@ declare namespace Objection { fromJson(json: object, opt?: ModelOptions): M; fromDatabaseJson(json: object): M; + columnNameToPropertyName(columnName: string): string; + propertyNameToColumnName(propertyName: string): string; + createValidator(): Validator; createValidationError(args: CreateValidationErrorArgs): Error; createNotFoundError(queryContext: QueryContext, args: CreateNotFoundErrorArgs): Error; @@ -1583,6 +1586,9 @@ declare namespace Objection { static fromJson(this: Constructor, json: object, opt?: ModelOptions): M; static fromDatabaseJson(this: Constructor, json: object): M; + static columnNameToPropertyName(columnName: string): string; + static propertyNameToColumnName(propertyName: string): string; + static createValidator(): Validator; static createValidationError(args: CreateValidationErrorArgs): Error; static createNotFoundError(queryContext: QueryContext, args: CreateNotFoundErrorArgs): Error; From 43d0b9c338468454ca76f7da64a5b5628dc125d0 Mon Sep 17 00:00:00 2001 From: Guillaume Robin Date: Wed, 28 Feb 2024 19:16:21 +0100 Subject: [PATCH 3/3] Remove contributors changes in package.json --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index b716b8397..9ea93ad55 100644 --- a/package.json +++ b/package.json @@ -26,8 +26,7 @@ "Mikael Lepistö (https://github.com/elhigu)", "Matthew McEachen (https://github.com/mceachen)", "Jürg Lehni (https://github.com/lehni)", - "Igor Savin (https://github.com/kibertoad)", - "Guillaume Robin (https://github.com/cesumilo)" + "Igor Savin (https://github.com/kibertoad)" ], "repository": { "type": "git",