From fa8920bf4e5c67b59402b64d27aee6c207718a50 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 18 Feb 2024 18:34:48 +0100
Subject: [PATCH] chore(deps): bump knex from 2.5.1 to 3.1.0 (#1404)

Bumps [knex](https://github.com/knex/knex) from 2.5.1 to 3.1.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/knex/knex/releases">knex's
releases</a>.</em></p>
<blockquote>
<h1>3.1.0 - 8 December, 2023</h1>
<h3>Bug fixes</h3>
<ul>
<li>andWhereNotJsonObject calling wrong function (<a
href="https://redirect.github.com/knex/knex/issues/5683">#5683</a>)</li>
<li>PostgreSQL: fix error when setting query_timeout (<a
href="https://redirect.github.com/knex/knex/issues/5673">#5673</a>)</li>
<li>MySQL: Missing comments on delete, update and insert (<a
href="https://redirect.github.com/knex/knex/issues/5738">#5738</a>)</li>
<li>MySQL: Fixed issue with bigincrements not working with composite
primary key - <a
href="https://redirect.github.com/knex/knex/issues/5341">#5341</a> (<a
href="https://redirect.github.com/knex/knex/issues/5343">#5343</a>)</li>
</ul>
<h3>New features</h3>
<ul>
<li>Add transactor.parentTransaction (<a
href="https://redirect.github.com/knex/knex/issues/5567">#5567</a>)</li>
<li>MySQL: Added implementation for upsert (<a
href="https://redirect.github.com/knex/knex/issues/5743">#5743</a>)</li>
<li>Oracle: Support Object Names Greater than 30 Characters for Oracle
DB Versions 12.2 and Greater (<a
href="https://redirect.github.com/knex/knex/issues/5197">#5197</a>)</li>
</ul>
<h3>Types</h3>
<ul>
<li>Add type definitions for orHavingNull and orHavingNotNull (<a
href="https://redirect.github.com/knex/knex/issues/5669">#5669</a>)</li>
<li>Import knex as type in TS migration template (<a
href="https://redirect.github.com/knex/knex/issues/5741">#5741</a>)</li>
<li>Fix conditional constraint error (<a
href="https://redirect.github.com/knex/knex/issues/5747">#5747</a>)</li>
<li>PostgreSQL: Fix typing to reflect pg typing change (<a
href="https://redirect.github.com/knex/knex/issues/5647">#5647</a>)</li>
</ul>
<h2>3.0.1</h2>
<ul>
<li>Fix broken release</li>
</ul>
<h1>3.0.0 - 6 October, 2023</h1>
<ul>
<li>Fix raw bindings typing (<a
href="https://redirect.github.com/knex/knex/issues/5401">#5401</a>)</li>
<li>Fix migrate:unlock when used with custom identifier wrapping. (<a
href="https://redirect.github.com/knex/knex/issues/5353">#5353</a>)</li>
<li>Fix driver options specified with .options() method being ignored
for oracledb dialect (<a
href="https://redirect.github.com/knex/knex/issues/5123">#5123</a>)</li>
<li>Drop compatibility for Node &lt; 16</li>
<li>Fix knex d.ts to work with mixed modules (<a
href="https://redirect.github.com/knex/knex/issues/5659">#5659</a>)</li>
<li>Fix Lexical error from &quot;Instaed&quot; to &quot;Instead&quot;
(<a
href="https://redirect.github.com/knex/knex/issues/5655">#5655</a>)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/knex/knex/blob/master/CHANGELOG.md">knex's
changelog</a>.</em></p>
<blockquote>
<h1>3.1.0 - 8 December, 2023</h1>
<h3>Bug fixes</h3>
<ul>
<li>andWhereNotJsonObject calling wrong function (<a
href="https://redirect.github.com/knex/knex/issues/5683">#5683</a>)</li>
<li>PostgreSQL: fix error when setting query_timeout (<a
href="https://redirect.github.com/knex/knex/issues/5673">#5673</a>)</li>
<li>MySQL: Missing comments on delete, update and insert (<a
href="https://redirect.github.com/knex/knex/issues/5738">#5738</a>)</li>
<li>MySQL: Fixed issue with bigincrements not working with composite
primary key - <a
href="https://redirect.github.com/knex/knex/issues/5341">#5341</a> (<a
href="https://redirect.github.com/knex/knex/issues/5343">#5343</a>)</li>
</ul>
<h3>Types</h3>
<ul>
<li>Add type definitions for orHavingNull and orHavingNotNull (<a
href="https://redirect.github.com/knex/knex/issues/5669">#5669</a>)</li>
<li>Import knex as type in TS migration template (<a
href="https://redirect.github.com/knex/knex/issues/5741">#5741</a>)</li>
<li>Fix conditional constraint error (<a
href="https://redirect.github.com/knex/knex/issues/5747">#5747</a>)</li>
<li>PostgreSQL: Fix typing to reflect pg typing change (<a
href="https://redirect.github.com/knex/knex/issues/5647">#5647</a>)</li>
</ul>
<h3>New features</h3>
<ul>
<li>Add transactor.parentTransaction (<a
href="https://redirect.github.com/knex/knex/issues/5567">#5567</a>)</li>
<li>MySQL: Added implementation for upsert (<a
href="https://redirect.github.com/knex/knex/issues/5743">#5743</a>)</li>
<li>Oracle: Support Object Names Greater than 30 Characters for Oracle
DB Versions 12.2 and Greater (<a
href="https://redirect.github.com/knex/knex/issues/5197">#5197</a>)</li>
</ul>
<h1>3.0.1 - 6 October, 2023</h1>
<ul>
<li>Build fix</li>
</ul>
<h1>3.0.0 - 6 October, 2023</h1>
<ul>
<li>Fix raw bindings typing (<a
href="https://redirect.github.com/knex/knex/issues/5401">#5401</a>)</li>
<li>Fix migrate:unlock when used with custom identifier wrapping. (<a
href="https://redirect.github.com/knex/knex/issues/5353">#5353</a>)</li>
<li>Fix driver options specified with .options() method being ignored
for oracledb dialect (<a
href="https://redirect.github.com/knex/knex/issues/5123">#5123</a>)</li>
<li>Drop compatibility for Node &lt; 16</li>
<li>Fix knex d.ts to work with mixed modules (<a
href="https://redirect.github.com/knex/knex/issues/5659">#5659</a>)</li>
<li>Fix Lexical error from &quot;Instaed&quot; to &quot;Instead&quot;
(<a
href="https://redirect.github.com/knex/knex/issues/5655">#5655</a>)</li>
</ul>
<h3>Bug fixes</h3>
<ul>
<li>Fix Linting <a
href="https://redirect.github.com/knex/knex/issues/5455">#5455</a> - <a
href="https://redirect.github.com/knex/knex/issues/5460">#5460</a></li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/knex/knex/commit/4ca3dd5bc28e0665c5bed55026fac2ec45489d81"><code>4ca3dd5</code></a>
Prepare to release 3.1.0</li>
<li><a
href="https://github.com/knex/knex/commit/ca3dd19f4f87b8e3646f9b190ed2738742133949"><code>ca3dd19</code></a>
Commit compiled files</li>
<li><a
href="https://github.com/knex/knex/commit/6243f6cbd5421c9db046979b60fe8661b523581f"><code>6243f6c</code></a>
Bump rimraf from 3.0.2 to 5.0.5 (<a
href="https://redirect.github.com/knex/knex/issues/5699">#5699</a>)</li>
<li><a
href="https://github.com/knex/knex/commit/8bc07c75a26908d692afa773a436468a1dcc63b1"><code>8bc07c7</code></a>
Include Node 20 in CI (<a
href="https://redirect.github.com/knex/knex/issues/5760">#5760</a>)</li>
<li><a
href="https://github.com/knex/knex/commit/0f2aea01c661608fbb24f3204c65708a7202e473"><code>0f2aea0</code></a>
Bump pg-connection-string from 2.6.1 to 2.6.2 (<a
href="https://redirect.github.com/knex/knex/issues/5753">#5753</a>)</li>
<li><a
href="https://github.com/knex/knex/commit/e1898bfded4ae26fa5e8c170498540c2a28a0617"><code>e1898bf</code></a>
Fix linting</li>
<li><a
href="https://github.com/knex/knex/commit/9d951320d099c0af00e15f55c73f277b0b87bb23"><code>9d95132</code></a>
Only run user experience flow on 18.x</li>
<li><a
href="https://github.com/knex/knex/commit/2063b552c188c0282d2ac760d4debfa3853e623d"><code>2063b55</code></a>
Bump tedious from 14.7.0 to 16.6.1 (<a
href="https://redirect.github.com/knex/knex/issues/5754">#5754</a>)</li>
<li><a
href="https://github.com/knex/knex/commit/07589e9c3af9d656c94389890e1f356bf88b1c3e"><code>07589e9</code></a>
Fix pg typing to reflect pg typing change (<a
href="https://redirect.github.com/knex/knex/issues/5647">#5647</a>)</li>
<li><a
href="https://github.com/knex/knex/commit/7b7fef55e8229a000496ee0e7819f9f00d8d23d6"><code>7b7fef5</code></a>
fix error on postgres when setting query_timeout (<a
href="https://redirect.github.com/knex/knex/issues/5673">#5673</a>)</li>
<li>Additional commits viewable in <a
href="https://github.com/knex/knex/compare/2.5.1...3.1.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=knex&package-manager=npm_and_yarn&previous-version=2.5.1&new-version=3.1.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 23 +++++++++--------------
 package.json      |  2 +-
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1c9576338..fdd74ffdd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -27,7 +27,7 @@
         "html-to-text": "^9.0.4",
         "jsonwebtoken": "^9.0.0",
         "jszip": "^3.10.1",
-        "knex": "^2.5.1",
+        "knex": "^3.1.0",
         "metascraper": "^5.34.7",
         "metascraper-description": "^5.39.0",
         "metascraper-image": "^5.34.7",
@@ -8762,9 +8762,9 @@
       }
     },
     "node_modules/knex": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/knex/-/knex-2.5.1.tgz",
-      "integrity": "sha512-z78DgGKUr4SE/6cm7ku+jHvFT0X97aERh/f0MUKAKgFnwCYBEW4TFBqtHWFYiJFid7fMrtpZ/gxJthvz5mEByA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/knex/-/knex-3.1.0.tgz",
+      "integrity": "sha512-GLoII6hR0c4ti243gMs5/1Rb3B+AjwMOfjYm97pu0FOQa7JH56hgBxYf5WK2525ceSbBY1cjeZ9yk99GPMB6Kw==",
       "dependencies": {
         "colorette": "2.0.19",
         "commander": "^10.0.0",
@@ -8775,7 +8775,7 @@
         "getopts": "2.3.0",
         "interpret": "^2.2.0",
         "lodash": "^4.17.21",
-        "pg-connection-string": "2.6.1",
+        "pg-connection-string": "2.6.2",
         "rechoir": "^0.8.0",
         "resolve-from": "^5.0.0",
         "tarn": "^3.0.2",
@@ -8785,7 +8785,7 @@
         "knex": "bin/cli.js"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=16"
       },
       "peerDependenciesMeta": {
         "better-sqlite3": {
@@ -10499,9 +10499,9 @@
       "optional": true
     },
     "node_modules/pg-connection-string": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.6.1.tgz",
-      "integrity": "sha512-w6ZzNu6oMmIzEAYVw+RLK0+nqHPt8K3ZnknKi+g48Ak2pr3dtljJW3o+D/n2zzCG07Zoe9VOX3aiKpj+BN0pjg=="
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.6.2.tgz",
+      "integrity": "sha512-ch6OwaeaPYcova4kKZ15sbJ2hKb/VP48ZD2gE7i1J+L4MspCtBMAx8nMgz7bksc7IojCIIWuEhHibSMFH8m8oA=="
     },
     "node_modules/pg-int8": {
       "version": "1.0.1",
@@ -10533,11 +10533,6 @@
         "postgres-interval": "^1.1.0"
       }
     },
-    "node_modules/pg/node_modules/pg-connection-string": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.6.2.tgz",
-      "integrity": "sha512-ch6OwaeaPYcova4kKZ15sbJ2hKb/VP48ZD2gE7i1J+L4MspCtBMAx8nMgz7bksc7IojCIIWuEhHibSMFH8m8oA=="
-    },
     "node_modules/pgpass": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.4.tgz",
diff --git a/package.json b/package.json
index 214fd3eaf..6d65c3afd 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
     "html-to-text": "^9.0.4",
     "jsonwebtoken": "^9.0.0",
     "jszip": "^3.10.1",
-    "knex": "^2.5.1",
+    "knex": "^3.1.0",
     "metascraper": "^5.34.7",
     "metascraper-description": "^5.39.0",
     "metascraper-image": "^5.34.7",