yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-14 01:02:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

use connection instead of getConnection

Browse Source
This commit is contained in:
Pierre Noël 2022-11-15 18:42:18 +01:00
parent 887ea1ae59
commit e2234ed9f1
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -295,8 +295,7 @@ const cleanOrderColumnsForOldDatabases = async ({
if (hasOrderColumn(attribute) && id) { if (hasOrderColumn(attribute) && id) {
const tempOrderTableName = `tempOrderTableName_${now}`; const tempOrderTableName = `tempOrderTableName_${now}`;
await db await db.connection
.getConnection()
.raw( .raw(
` `
CREATE TEMPORARY TABLE :tempOrderTableName: CREATE TEMPORARY TABLE :tempOrderTableName:
@ -317,8 +316,7 @@ const cleanOrderColumnsForOldDatabases = async ({
} }
) )
.transacting(trx); .transacting(trx);
await db await db.connection
.getConnection()
.raw( .raw(
`UPDATE ?? as a, (SELECT * FROM ??) AS b `UPDATE ?? as a, (SELECT * FROM ??) AS b
SET ?? = b.src_order SET ?? = b.src_order
@ -326,12 +324,11 @@ const cleanOrderColumnsForOldDatabases = async ({
[joinTable.name, tempOrderTableName, orderColumnName] [joinTable.name, tempOrderTableName, orderColumnName]
) )
.transacting(trx); .transacting(trx);
await db.getConnection().raw(`DROP TEMPORARY TABLE ${tempOrderTableName}`).transacting(trx); await db.connection.raw(`DROP TEMPORARY TABLE ${tempOrderTableName}`).transacting(trx);
} }
if (hasInverseOrderColumn(attribute) && !isEmpty(inverseRelIds)) { if (hasInverseOrderColumn(attribute) && !isEmpty(inverseRelIds)) {
const tempInvOrderTableName = `tempInvOrderTableName_${now}`; const tempInvOrderTableName = `tempInvOrderTableName_${now}`;
await db await db.connection
.getConnection()
.raw( .raw(
` `
CREATE TEMPORARY TABLE ?? CREATE TEMPORARY TABLE ??
@ -358,8 +355,7 @@ const cleanOrderColumnsForOldDatabases = async ({
] ]
) )
.transacting(trx); .transacting(trx);
await db await db.connection
.getConnection()
.raw( .raw(
`UPDATE ?? as a, (SELECT * FROM ??) AS b `UPDATE ?? as a, (SELECT * FROM ??) AS b
SET ?? = b.inv_order SET ?? = b.inv_order
@ -367,7 +363,7 @@ const cleanOrderColumnsForOldDatabases = async ({
[joinTable.name, tempInvOrderTableName, inverseOrderColumnName] [joinTable.name, tempInvOrderTableName, inverseOrderColumnName]
) )
.transacting(trx); .transacting(trx);
await db.getConnection().raw(`DROP TEMPORARY TABLE ${tempInvOrderTableName}`).transacting(trx); await db.connection.raw(`DROP TEMPORARY TABLE ${tempInvOrderTableName}`).transacting(trx);
} }
}; };