@strapi/database 5.60.0 → 5.61.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/entity-manager/index.d.ts.map +1 -1
- package/dist/entity-manager/index.js +82 -53
- package/dist/entity-manager/index.js.map +1 -1
- package/dist/entity-manager/index.mjs +84 -55
- package/dist/entity-manager/index.mjs.map +1 -1
- package/dist/entity-manager/morph-relations.d.ts +10 -1
- package/dist/entity-manager/morph-relations.d.ts.map +1 -1
- package/dist/entity-manager/morph-relations.js +36 -0
- package/dist/entity-manager/morph-relations.js.map +1 -1
- package/dist/entity-manager/morph-relations.mjs +36 -1
- package/dist/entity-manager/morph-relations.mjs.map +1 -1
- package/package.json +8 -8
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { pick, has, isEmpty,
|
|
1
|
+
import { pick, has, isEmpty, differenceWith, uniqBy, difference, map, isPlainObject, isString, isNumber, castArray, compact, isObject, uniqWith, isEqual } from 'lodash';
|
|
2
2
|
import { isScalarAttribute, isRelationalAttribute } from '../utils/types.mjs';
|
|
3
3
|
import { createField } from '../fields/index.mjs';
|
|
4
4
|
import createQueryBuilder from '../query/query-builder.mjs';
|
|
5
5
|
import { createRepository } from './entity-repository.mjs';
|
|
6
|
-
import { deleteRelatedMorphOneRelationsAfterMorphToManyUpdate, encodePolymorphicRelation, encodePolymorphicId } from './morph-relations.mjs';
|
|
6
|
+
import { cleanMorphToManyOrderColumn, deleteRelatedMorphOneRelationsAfterMorphToManyUpdate, encodePolymorphicRelation, encodePolymorphicId } from './morph-relations.mjs';
|
|
7
7
|
import { hasInverseOrderColumn, hasOrderColumn, isAnyToOne, isBidirectional, isOneToAny } from '../metadata/relations.mjs';
|
|
8
8
|
import '../utils/identifiers/index.mjs';
|
|
9
9
|
import { deleteRelations, cleanOrderColumns, deletePreviousOneToAnyRelations, deletePreviousAnyToOneRelations } from './regular-relations.mjs';
|
|
@@ -764,28 +764,53 @@ const createEntityManager = (db)=>{
|
|
|
764
764
|
order: idx + 1
|
|
765
765
|
}))
|
|
766
766
|
];
|
|
767
|
-
const
|
|
768
|
-
|
|
769
|
-
|
|
770
|
-
|
|
771
|
-
|
|
772
|
-
|
|
767
|
+
const computeOrderMap = async ()=>{
|
|
768
|
+
const adjacentRelations = await this.createQueryBuilder(joinTable.name).where({
|
|
769
|
+
$or: [
|
|
770
|
+
{
|
|
771
|
+
[joinColumn.name]: id,
|
|
772
|
+
[idColumn.name]: {
|
|
773
|
+
$in: compact(cleanRelationData.connect?.map((r)=>r.position?.after || r.position?.before))
|
|
774
|
+
}
|
|
775
|
+
},
|
|
776
|
+
{
|
|
777
|
+
[joinColumn.name]: id,
|
|
778
|
+
order: this.createQueryBuilder(joinTable.name).min('order').where({
|
|
779
|
+
[joinColumn.name]: id
|
|
780
|
+
}).where(joinTable.on || {}).transacting(trx).getKnexQuery()
|
|
781
|
+
},
|
|
782
|
+
{
|
|
783
|
+
[joinColumn.name]: id,
|
|
784
|
+
order: this.createQueryBuilder(joinTable.name).max('order').where({
|
|
785
|
+
[joinColumn.name]: id
|
|
786
|
+
}).where(joinTable.on || {}).transacting(trx).getKnexQuery()
|
|
773
787
|
}
|
|
774
|
-
|
|
775
|
-
|
|
776
|
-
|
|
777
|
-
|
|
778
|
-
|
|
779
|
-
|
|
780
|
-
|
|
781
|
-
|
|
782
|
-
|
|
783
|
-
|
|
784
|
-
|
|
785
|
-
|
|
786
|
-
|
|
787
|
-
|
|
788
|
-
|
|
788
|
+
]
|
|
789
|
+
}).where(joinTable.on || {}).orderBy('order').transacting(trx).execute();
|
|
790
|
+
return relationsOrderer(// Merge id & __type to get a single id key
|
|
791
|
+
adjacentRelations.map(encodePolymorphicRelation({
|
|
792
|
+
idColumn: idColumn.name,
|
|
793
|
+
typeColumn: typeColumn.name
|
|
794
|
+
})), idColumn.name, 'order', cleanRelationData.options?.strict).connect(// Merge id & __type to get a single id key
|
|
795
|
+
(cleanRelationData.connect || []).map(encodePolymorphicRelation({
|
|
796
|
+
idColumn: 'id',
|
|
797
|
+
typeColumn: '__type'
|
|
798
|
+
}))).getOrderMap();
|
|
799
|
+
};
|
|
800
|
+
let orderMap = {};
|
|
801
|
+
if (hasConnect) {
|
|
802
|
+
orderMap = await computeOrderMap();
|
|
803
|
+
// The order column is unsigned on MySQL/MariaDB, so renumber from 1 to make room at the start
|
|
804
|
+
if (Object.values(orderMap).some((order)=>order < 0)) {
|
|
805
|
+
await cleanMorphToManyOrderColumn({
|
|
806
|
+
id,
|
|
807
|
+
joinTable,
|
|
808
|
+
db,
|
|
809
|
+
transaction: trx
|
|
810
|
+
});
|
|
811
|
+
orderMap = await computeOrderMap();
|
|
812
|
+
}
|
|
813
|
+
}
|
|
789
814
|
if (!isEmpty(idsToDelete)) {
|
|
790
815
|
const where = {
|
|
791
816
|
$or: idsToDelete.map((item)=>{
|
|
@@ -818,15 +843,6 @@ const createEntityManager = (db)=>{
|
|
|
818
843
|
...data.__pivot,
|
|
819
844
|
field: attributeName
|
|
820
845
|
}));
|
|
821
|
-
const orderMap = relationsOrderer(// Merge id & __type to get a single id key
|
|
822
|
-
adjacentRelations.map(encodePolymorphicRelation({
|
|
823
|
-
idColumn: idColumn.name,
|
|
824
|
-
typeColumn: typeColumn.name
|
|
825
|
-
})), idColumn.name, 'order', cleanRelationData.options?.strict).connect(// Merge id & __type to get a single id key
|
|
826
|
-
dataset.map(encodePolymorphicRelation({
|
|
827
|
-
idColumn: 'id',
|
|
828
|
-
typeColumn: '__type'
|
|
829
|
-
}))).getOrderMap();
|
|
830
846
|
rows.forEach((row)=>{
|
|
831
847
|
const rowId = row[idColumn.name];
|
|
832
848
|
const rowType = row[typeColumn.name];
|
|
@@ -1063,30 +1079,43 @@ const createEntityManager = (db)=>{
|
|
|
1063
1079
|
...relToAdd.__pivot
|
|
1064
1080
|
}));
|
|
1065
1081
|
if (hasOrderColumn(attribute)) {
|
|
1066
|
-
|
|
1067
|
-
|
|
1068
|
-
|
|
1069
|
-
|
|
1070
|
-
|
|
1071
|
-
|
|
1072
|
-
|
|
1082
|
+
const computeOrderMap = async ()=>{
|
|
1083
|
+
// Get all adjacent relations and the one with the highest order
|
|
1084
|
+
const adjacentRelations = await this.createQueryBuilder(joinTable.name).where({
|
|
1085
|
+
$or: [
|
|
1086
|
+
{
|
|
1087
|
+
[joinColumn.name]: id,
|
|
1088
|
+
[inverseJoinColumn.name]: {
|
|
1089
|
+
$in: compact(resolvedConnect.map((r)=>r.position?.after || r.position?.before))
|
|
1090
|
+
}
|
|
1091
|
+
},
|
|
1092
|
+
{
|
|
1093
|
+
[joinColumn.name]: id,
|
|
1094
|
+
[orderColumnName]: this.createQueryBuilder(joinTable.name).min(orderColumnName).where({
|
|
1095
|
+
[joinColumn.name]: id
|
|
1096
|
+
}).where(joinTable.on || {}).transacting(trx).getKnexQuery()
|
|
1097
|
+
},
|
|
1098
|
+
{
|
|
1099
|
+
[joinColumn.name]: id,
|
|
1100
|
+
[orderColumnName]: this.createQueryBuilder(joinTable.name).max(orderColumnName).where({
|
|
1101
|
+
[joinColumn.name]: id
|
|
1102
|
+
}).where(joinTable.on || {}).transacting(trx).getKnexQuery()
|
|
1073
1103
|
}
|
|
1074
|
-
|
|
1075
|
-
|
|
1076
|
-
|
|
1077
|
-
|
|
1078
|
-
|
|
1079
|
-
|
|
1080
|
-
|
|
1081
|
-
|
|
1082
|
-
|
|
1083
|
-
|
|
1084
|
-
|
|
1085
|
-
|
|
1086
|
-
|
|
1087
|
-
|
|
1088
|
-
}
|
|
1089
|
-
const orderMap = relationsOrderer(adjacentRelations, inverseJoinColumn.name, joinTable.orderColumnName, cleanRelationData.options?.strict).connect(resolvedConnect).getOrderMap();
|
|
1104
|
+
]
|
|
1105
|
+
}).where(joinTable.on || {}).orderBy(orderColumnName).transacting(trx).execute();
|
|
1106
|
+
return relationsOrderer(adjacentRelations, inverseJoinColumn.name, joinTable.orderColumnName, cleanRelationData.options?.strict).connect(resolvedConnect).getOrderMap();
|
|
1107
|
+
};
|
|
1108
|
+
let orderMap = await computeOrderMap();
|
|
1109
|
+
// Order columns are unsigned on MySQL/MariaDB, so renumber from 1 to make room at the start
|
|
1110
|
+
if (Object.values(orderMap).some((order)=>order < 0)) {
|
|
1111
|
+
await cleanOrderColumns({
|
|
1112
|
+
attribute,
|
|
1113
|
+
db,
|
|
1114
|
+
id,
|
|
1115
|
+
transaction: trx
|
|
1116
|
+
});
|
|
1117
|
+
orderMap = await computeOrderMap();
|
|
1118
|
+
}
|
|
1090
1119
|
insert.forEach((row)=>{
|
|
1091
1120
|
row[orderColumnName] = orderMap[row[inverseJoinColumn.name]];
|
|
1092
1121
|
});
|