yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-27 23:24:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17620 from strapi/fix/update-entity-with-postgres-schema

Browse Source
This commit is contained in:
Marc Roig 2023-08-14 11:50:02 +02:00 committed by GitHub
commit 3a01852244
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -222,16 +222,19 @@ const cleanOrderColumns = async ({ id, attribute, db, inverseRelIds, transaction
const updateOrderColumn = async () => {
if (!hasOrderColumn(attribute) || !id) return;
const select = db
.connection(joinTable.name)
.select('id')
.rowNumber('src_order', orderColumnName, joinColumn.name)
.where(joinColumn.name, id)
.toSQL();
const selectRowsToOrder = (joinTableName) =>
db
.connection(joinTableName)
.select('id')
.rowNumber('src_order', orderColumnName, joinColumn.name)
.where(joinColumn.name, id)
.toSQL();
switch (strapi.db.dialect.client) {
case 'mysql':
case 'mysql': {
// Here it's MariaDB and MySQL 8
const select = selectRowsToOrder(joinTable.name);
await db
.getConnection()
.raw(
@ -243,9 +246,10 @@ const cleanOrderColumns = async ({ id, attribute, db, inverseRelIds, transaction
.transacting(trx);
break;
}
default: {
const joinTableName = addSchema(joinTable.name);
const select = selectRowsToOrder(joinTableName);
// raw query as knex doesn't allow updating from a subquery
await db.connection
@ -275,16 +279,20 @@ const cleanOrderColumns = async ({ id, attribute, db, inverseRelIds, transaction
*/
const updateInverseOrderColumn = async () => {
if (!hasInverseOrderColumn(attribute) || isEmpty(inverseRelIds)) return;
const select = db
.connection(joinTable.name)
.select('id')
.rowNumber('inv_order', inverseOrderColumnName, inverseJoinColumn.name)
.where(inverseJoinColumn.name, 'in', inverseRelIds)
.toSQL();
const selectRowsToOrder = (joinTableName) =>
db
.connection(joinTableName)
.select('id')
.rowNumber('inv_order', inverseOrderColumnName, inverseJoinColumn.name)
.where(inverseJoinColumn.name, 'in', inverseRelIds)
.toSQL();
switch (strapi.db.dialect.client) {
case 'mysql':
case 'mysql': {
// Here it's MariaDB and MySQL 8
const select = selectRowsToOrder(joinTable.name);
await db
.getConnection()
.raw(
@ -295,9 +303,10 @@ const cleanOrderColumns = async ({ id, attribute, db, inverseRelIds, transaction
)
.transacting(trx);
break;
}
default: {
const joinTableName = addSchema(joinTable.name);
const select = selectRowsToOrder(joinTableName);
// raw query as knex doesn't allow updating from a subquery
await db.connection