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

fix: use correct table schema

Browse Source
This commit is contained in:
Marc-Roig 2023-08-10 09:39:27 +02:00
parent fd59fcea30
commit 814b6f01bd
No known key found for this signature in database
GPG Key ID: FB4E2C43A0BEE249
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -222,8 +222,10 @@ const cleanOrderColumns = async ({ id, attribute, db, inverseRelIds, transaction
const updateOrderColumn = async () => { const updateOrderColumn = async () => {
if (!hasOrderColumn(attribute) || !id) return; if (!hasOrderColumn(attribute) || !id) return;
const joinTableName = addSchema(joinTable.name);
const select = db const select = db
.connection(joinTable.name) .connection(joinTableName)
.select('id') .select('id')
.rowNumber('src_order', orderColumnName, joinColumn.name) .rowNumber('src_order', orderColumnName, joinColumn.name)
.where(joinColumn.name, id) .where(joinColumn.name, id)
@ -245,11 +247,8 @@ const cleanOrderColumns = async ({ id, attribute, db, inverseRelIds, transaction
break; break;
default: { default: {
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 await db.connection
.getConnection()
.raw( .raw(
`UPDATE ?? as a `UPDATE ?? as a
SET ?? = b.src_order SET ?? = b.src_order
@ -276,8 +275,11 @@ const cleanOrderColumns = async ({ id, attribute, db, inverseRelIds, transaction
*/ */
const updateInverseOrderColumn = async () => { const updateInverseOrderColumn = async () => {
if (!hasInverseOrderColumn(attribute) || isEmpty(inverseRelIds)) return; if (!hasInverseOrderColumn(attribute) || isEmpty(inverseRelIds)) return;
const joinTableName = addSchema(joinTable.name);
const select = db const select = db
.connection(joinTable.name) .connection(joinTableName)
.select('id') .select('id')
.rowNumber('inv_order', inverseOrderColumnName, inverseJoinColumn.name) .rowNumber('inv_order', inverseOrderColumnName, inverseJoinColumn.name)
.where(inverseJoinColumn.name, 'in', inverseRelIds) .where(inverseJoinColumn.name, 'in', inverseRelIds)
@ -298,11 +300,8 @@ const cleanOrderColumns = async ({ id, attribute, db, inverseRelIds, transaction
break; break;
default: { default: {
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 await db.connection
.getConnection()
.raw( .raw(
`UPDATE ?? as a `UPDATE ?? as a
SET ?? = b.inv_order SET ?? = b.inv_order