From e1fb1fb76dd14dc9ed2e802cf317ae7f49680894 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ju=CC=88rg=20Lehni?= <juerg@scratchdisk.com>
Date: Tue, 13 Feb 2024 11:21:52 +0100
Subject: [PATCH 1/3] v3.1.4

---
 doc/release-notes/changelog.md | 9 +++++++++
 package.json                   | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

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.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 10671a2ada79873bbbc22abd083d8d16856c81da Mon Sep 17 00:00:00 2001
From: Guillaume Robin <guillaume@inarix.com>
Date: Wed, 28 Feb 2024 19:37:29 +0100
Subject: [PATCH 2/3] Specify which platform in docker-compose.yml to run
 services on ARM architecture

---
 docker-compose.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index 889e7a068..f2e479e11 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,6 +2,7 @@ version: '3'
 services:
   postgres:
     image: 'postgres'
+    platform: linux/arm64
     container_name: 'objection_postgres'
     command: postgres -c fsync=off -c synchronous_commit=off -c full_page_writes=off -c random_page_cost=1.0
     ports:
@@ -10,6 +11,7 @@ services:
       - POSTGRES_HOST_AUTH_METHOD=trust
   mysql:
     image: 'mysql:5'
+    platform: linux/arm64
     container_name: 'objection_mysql'
     ports:
       - '3306:3306'

From 3b826e39af68d3b54f7ad82d608d49140ae60bad Mon Sep 17 00:00:00 2001
From: Guillaume Robin <guillaume@inarix.com>
Date: Wed, 28 Feb 2024 19:41:31 +0100
Subject: [PATCH 3/3] Fix typo in docker-compose.yml arm -> amd

---
 docker-compose.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index f2e479e11..d6d3eb0d1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
 services:
   postgres:
     image: 'postgres'
-    platform: linux/arm64
+    platform: linux/amd64
     container_name: 'objection_postgres'
     command: postgres -c fsync=off -c synchronous_commit=off -c full_page_writes=off -c random_page_cost=1.0
     ports:
@@ -11,7 +11,7 @@ services:
       - POSTGRES_HOST_AUTH_METHOD=trust
   mysql:
     image: 'mysql:5'
-    platform: linux/arm64
+    platform: linux/amd64
     container_name: 'objection_mysql'
     ports:
       - '3306:3306'