yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-25 16:29:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: use getConnection for raw query

Browse Source
This commit is contained in:
Marc-Roig 2023-08-09 12:15:25 +02:00
parent 9ea3b6990e
commit fd59fcea30
No known key found for this signature in database
GPG Key ID: FB4E2C43A0BEE249
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/actions/run-api-tests/script.sh vendored
View File

@ -7,7 +7,6 @@ fi
export ENV_PATH="$(pwd)/test-apps/api/.env" export ENV_PATH="$(pwd)/test-apps/api/.env"
export JWT_SECRET="aSecret" export JWT_SECRET="aSecret"
export DATABASE_SCHEMA="myschema"
opts=($DB_OPTIONS) opts=($DB_OPTIONS)

4
.github/workflows/tests.yml vendored
View File

@ -195,8 +195,6 @@ jobs:
- uses: ./.github/actions/run-api-tests - uses: ./.github/actions/run-api-tests
with: with:
dbOptions: '--dbclient=postgres --dbhost=localhost --dbport=5432 --dbname=strapi_test --dbusername=strapi --dbpassword=strapi' dbOptions: '--dbclient=postgres --dbhost=localhost --dbport=5432 --dbname=strapi_test --dbusername=strapi --dbpassword=strapi'
env:
DATABASE_SCHEMA: myschema
api_ce_mysql: api_ce_mysql:
if: needs.changes.outputs.backend == 'true' if: needs.changes.outputs.backend == 'true'
@ -334,8 +332,6 @@ jobs:
with: with:
dbOptions: '--dbclient=postgres --dbhost=localhost --dbport=5432 --dbname=strapi_test --dbusername=strapi --dbpassword=strapi' dbOptions: '--dbclient=postgres --dbhost=localhost --dbport=5432 --dbname=strapi_test --dbusername=strapi --dbpassword=strapi'
runEE: true runEE: true
env:
DATABASE_SCHEMA: myschema
api_ee_mysql: api_ee_mysql:
runs-on: ubuntu-latest runs-on: ubuntu-latest

6
packages/core/database/lib/entity-manager/regular-relations.js
View File

@ -248,7 +248,8 @@ const cleanOrderColumns = async ({ id, attribute, db, inverseRelIds, transaction
const joinTableName = addSchema(joinTable.name); const joinTableName = addSchema(joinTable.name);
// raw query as knex doesn't allow updating from a subquery // raw query as knex doesn't allow updating from a subquery
await db.connection await db
.getConnection()
.raw( .raw(
`UPDATE ?? as a `UPDATE ?? as a
SET ?? = b.src_order SET ?? = b.src_order
@ -300,7 +301,8 @@ const cleanOrderColumns = async ({ id, attribute, db, inverseRelIds, transaction
const joinTableName = addSchema(joinTable.name); const joinTableName = addSchema(joinTable.name);
// raw query as knex doesn't allow updating from a subquery // raw query as knex doesn't allow updating from a subquery
await db.connection await db
.getConnection()
.raw( .raw(
`UPDATE ?? as a `UPDATE ?? as a
SET ?? = b.inv_order SET ?? = b.inv_order