@strapi/database 5.50.1 → 5.51.0
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/connection.d.ts +8 -0
- package/dist/connection.d.ts.map +1 -1
- package/dist/connection.js +4 -3
- package/dist/connection.js.map +1 -1
- package/dist/connection.mjs +4 -4
- package/dist/connection.mjs.map +1 -1
- package/dist/dialects/mysql/index.d.ts +2 -1
- package/dist/dialects/mysql/index.d.ts.map +1 -1
- package/dist/dialects/mysql/index.js +2 -2
- package/dist/dialects/mysql/index.js.map +1 -1
- package/dist/dialects/mysql/index.mjs +2 -2
- package/dist/dialects/mysql/index.mjs.map +1 -1
- package/dist/entity-manager/index.d.ts.map +1 -1
- package/dist/entity-manager/index.js +14 -2
- package/dist/entity-manager/index.js.map +1 -1
- package/dist/entity-manager/index.mjs +14 -2
- package/dist/entity-manager/index.mjs.map +1 -1
- package/dist/entity-manager/relations-orderer.d.ts.map +1 -1
- package/dist/entity-manager/relations-orderer.js +36 -22
- package/dist/entity-manager/relations-orderer.js.map +1 -1
- package/dist/entity-manager/relations-orderer.mjs +30 -16
- package/dist/entity-manager/relations-orderer.mjs.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +1 -0
- package/dist/index.mjs.map +1 -1
- package/dist/query/query-builder.d.ts +3 -1
- package/dist/query/query-builder.d.ts.map +1 -1
- package/dist/query/query-builder.js +25 -1
- package/dist/query/query-builder.js.map +1 -1
- package/dist/query/query-builder.mjs +26 -2
- package/dist/query/query-builder.mjs.map +1 -1
- package/package.json +10 -6
|
@@ -765,6 +765,12 @@ const createEntityManager = (db)=>{
|
|
|
765
765
|
$in: compact(cleanRelationData.connect?.map((r)=>r.position?.after || r.position?.before))
|
|
766
766
|
}
|
|
767
767
|
},
|
|
768
|
+
{
|
|
769
|
+
[joinColumn.name]: id,
|
|
770
|
+
order: this.createQueryBuilder(joinTable.name).min('order').where({
|
|
771
|
+
[joinColumn.name]: id
|
|
772
|
+
}).where(joinTable.on || {}).transacting(trx).getKnexQuery()
|
|
773
|
+
},
|
|
768
774
|
{
|
|
769
775
|
[joinColumn.name]: id,
|
|
770
776
|
order: this.createQueryBuilder(joinTable.name).max('order').where({
|
|
@@ -772,7 +778,7 @@ const createEntityManager = (db)=>{
|
|
|
772
778
|
}).where(joinTable.on || {}).transacting(trx).getKnexQuery()
|
|
773
779
|
}
|
|
774
780
|
]
|
|
775
|
-
}).where(joinTable.on || {}).transacting(trx).execute();
|
|
781
|
+
}).where(joinTable.on || {}).orderBy('order').transacting(trx).execute();
|
|
776
782
|
if (!isEmpty(idsToDelete)) {
|
|
777
783
|
const where = {
|
|
778
784
|
$or: idsToDelete.map((item)=>{
|
|
@@ -1059,6 +1065,12 @@ const createEntityManager = (db)=>{
|
|
|
1059
1065
|
$in: compact(resolvedConnect.map((r)=>r.position?.after || r.position?.before))
|
|
1060
1066
|
}
|
|
1061
1067
|
},
|
|
1068
|
+
{
|
|
1069
|
+
[joinColumn.name]: id,
|
|
1070
|
+
[orderColumnName]: this.createQueryBuilder(joinTable.name).min(orderColumnName).where({
|
|
1071
|
+
[joinColumn.name]: id
|
|
1072
|
+
}).where(joinTable.on || {}).transacting(trx).getKnexQuery()
|
|
1073
|
+
},
|
|
1062
1074
|
{
|
|
1063
1075
|
[joinColumn.name]: id,
|
|
1064
1076
|
[orderColumnName]: this.createQueryBuilder(joinTable.name).max(orderColumnName).where({
|
|
@@ -1066,7 +1078,7 @@ const createEntityManager = (db)=>{
|
|
|
1066
1078
|
}).where(joinTable.on || {}).transacting(trx).getKnexQuery()
|
|
1067
1079
|
}
|
|
1068
1080
|
]
|
|
1069
|
-
}).where(joinTable.on || {}).transacting(trx).execute();
|
|
1081
|
+
}).where(joinTable.on || {}).orderBy(orderColumnName).transacting(trx).execute();
|
|
1070
1082
|
const orderMap = relationsOrderer(adjacentRelations, inverseJoinColumn.name, joinTable.orderColumnName, cleanRelationData.options?.strict).connect(resolvedConnect).getOrderMap();
|
|
1071
1083
|
insert.forEach((row)=>{
|
|
1072
1084
|
row[orderColumnName] = orderMap[row[inverseJoinColumn.name]];
|