From fd59fcea30dcff400a79cff08e59319956509124 Mon Sep 17 00:00:00 2001 From: Marc-Roig Date: Wed, 9 Aug 2023 12:15:25 +0200 Subject: [PATCH] fix: use getConnection for raw query --- .github/actions/run-api-tests/script.sh | 1 - .github/workflows/tests.yml | 4 ---- .../core/database/lib/entity-manager/regular-relations.js | 6 ++++-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/actions/run-api-tests/script.sh b/.github/actions/run-api-tests/script.sh index 0193dd8483..94c3196212 100755 --- a/.github/actions/run-api-tests/script.sh +++ b/.github/actions/run-api-tests/script.sh @@ -7,7 +7,6 @@ fi export ENV_PATH="$(pwd)/test-apps/api/.env" export JWT_SECRET="aSecret" -export DATABASE_SCHEMA="myschema" opts=($DB_OPTIONS) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7486d41088..4fd788af93 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -195,8 +195,6 @@ jobs: - uses: ./.github/actions/run-api-tests with: dbOptions: '--dbclient=postgres --dbhost=localhost --dbport=5432 --dbname=strapi_test --dbusername=strapi --dbpassword=strapi' - env: - DATABASE_SCHEMA: myschema api_ce_mysql: if: needs.changes.outputs.backend == 'true' @@ -334,8 +332,6 @@ jobs: with: dbOptions: '--dbclient=postgres --dbhost=localhost --dbport=5432 --dbname=strapi_test --dbusername=strapi --dbpassword=strapi' runEE: true - env: - DATABASE_SCHEMA: myschema api_ee_mysql: runs-on: ubuntu-latest diff --git a/packages/core/database/lib/entity-manager/regular-relations.js b/packages/core/database/lib/entity-manager/regular-relations.js index 1171f33304..8526a49212 100644 --- a/packages/core/database/lib/entity-manager/regular-relations.js +++ b/packages/core/database/lib/entity-manager/regular-relations.js @@ -248,7 +248,8 @@ const cleanOrderColumns = async ({ id, attribute, db, inverseRelIds, transaction const joinTableName = addSchema(joinTable.name); // raw query as knex doesn't allow updating from a subquery - await db.connection + await db + .getConnection() .raw( `UPDATE ?? as a SET ?? = b.src_order @@ -300,7 +301,8 @@ const cleanOrderColumns = async ({ id, attribute, db, inverseRelIds, transaction const joinTableName = addSchema(joinTable.name); // raw query as knex doesn't allow updating from a subquery - await db.connection + await db + .getConnection() .raw( `UPDATE ?? as a SET ?? = b.inv_order