@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.
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/entity-manager/index.ts"],"names":[],"mappings":"AAyCA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAGnC,OAAO,EAAE,aAAa,EAAsB,MAAM,SAAS,CAAC;AAE5D,cAAc,SAAS,CAAC;AA2OxB,eAAO,MAAM,mBAAmB,GAAI,IAAI,QAAQ,KAAG,aAwlDlD,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/entity-manager/index.ts"],"names":[],"mappings":"AA0CA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAGnC,OAAO,EAAE,aAAa,EAAsB,MAAM,SAAS,CAAC;AAE5D,cAAc,SAAS,CAAC;AA2OxB,eAAO,MAAM,mBAAmB,GAAI,IAAI,QAAQ,KAAG,aAmnDlD,CAAC"}
@@ -766,28 +766,53 @@ const createEntityManager = (db)=>{
766
766
  order: idx + 1
767
767
  }))
768
768
  ];
769
- const adjacentRelations = await this.createQueryBuilder(joinTable.name).where({
770
- $or: [
771
- {
772
- [joinColumn.name]: id,
773
- [idColumn.name]: {
774
- $in: _.compact(cleanRelationData.connect?.map((r)=>r.position?.after || r.position?.before))
769
+ const computeOrderMap = async ()=>{
770
+ const adjacentRelations = await this.createQueryBuilder(joinTable.name).where({
771
+ $or: [
772
+ {
773
+ [joinColumn.name]: id,
774
+ [idColumn.name]: {
775
+ $in: _.compact(cleanRelationData.connect?.map((r)=>r.position?.after || r.position?.before))
776
+ }
777
+ },
778
+ {
779
+ [joinColumn.name]: id,
780
+ order: this.createQueryBuilder(joinTable.name).min('order').where({
781
+ [joinColumn.name]: id
782
+ }).where(joinTable.on || {}).transacting(trx).getKnexQuery()
783
+ },
784
+ {
785
+ [joinColumn.name]: id,
786
+ order: this.createQueryBuilder(joinTable.name).max('order').where({
787
+ [joinColumn.name]: id
788
+ }).where(joinTable.on || {}).transacting(trx).getKnexQuery()
775
789
  }
776
- },
777
- {
778
- [joinColumn.name]: id,
779
- order: this.createQueryBuilder(joinTable.name).min('order').where({
780
- [joinColumn.name]: id
781
- }).where(joinTable.on || {}).transacting(trx).getKnexQuery()
782
- },
783
- {
784
- [joinColumn.name]: id,
785
- order: this.createQueryBuilder(joinTable.name).max('order').where({
786
- [joinColumn.name]: id
787
- }).where(joinTable.on || {}).transacting(trx).getKnexQuery()
788
- }
789
- ]
790
- }).where(joinTable.on || {}).orderBy('order').transacting(trx).execute();
790
+ ]
791
+ }).where(joinTable.on || {}).orderBy('order').transacting(trx).execute();
792
+ return relationsOrderer.relationsOrderer(// Merge id & __type to get a single id key
793
+ adjacentRelations.map(morphRelations.encodePolymorphicRelation({
794
+ idColumn: idColumn.name,
795
+ typeColumn: typeColumn.name
796
+ })), idColumn.name, 'order', cleanRelationData.options?.strict).connect(// Merge id & __type to get a single id key
797
+ (cleanRelationData.connect || []).map(morphRelations.encodePolymorphicRelation({
798
+ idColumn: 'id',
799
+ typeColumn: '__type'
800
+ }))).getOrderMap();
801
+ };
802
+ let orderMap = {};
803
+ if (hasConnect) {
804
+ orderMap = await computeOrderMap();
805
+ // The order column is unsigned on MySQL/MariaDB, so renumber from 1 to make room at the start
806
+ if (Object.values(orderMap).some((order)=>order < 0)) {
807
+ await morphRelations.cleanMorphToManyOrderColumn({
808
+ id,
809
+ joinTable,
810
+ db,
811
+ transaction: trx
812
+ });
813
+ orderMap = await computeOrderMap();
814
+ }
815
+ }
791
816
  if (!_.isEmpty(idsToDelete)) {
792
817
  const where = {
793
818
  $or: idsToDelete.map((item)=>{
@@ -820,15 +845,6 @@ const createEntityManager = (db)=>{
820
845
  ...data.__pivot,
821
846
  field: attributeName
822
847
  }));
823
- const orderMap = relationsOrderer.relationsOrderer(// Merge id & __type to get a single id key
824
- adjacentRelations.map(morphRelations.encodePolymorphicRelation({
825
- idColumn: idColumn.name,
826
- typeColumn: typeColumn.name
827
- })), idColumn.name, 'order', cleanRelationData.options?.strict).connect(// Merge id & __type to get a single id key
828
- dataset.map(morphRelations.encodePolymorphicRelation({
829
- idColumn: 'id',
830
- typeColumn: '__type'
831
- }))).getOrderMap();
832
848
  rows.forEach((row)=>{
833
849
  const rowId = row[idColumn.name];
834
850
  const rowType = row[typeColumn.name];
@@ -1065,30 +1081,43 @@ const createEntityManager = (db)=>{
1065
1081
  ...relToAdd.__pivot
1066
1082
  }));
1067
1083
  if (relations.hasOrderColumn(attribute)) {
1068
- // Get all adjacent relations and the one with the highest order
1069
- const adjacentRelations = await this.createQueryBuilder(joinTable.name).where({
1070
- $or: [
1071
- {
1072
- [joinColumn.name]: id,
1073
- [inverseJoinColumn.name]: {
1074
- $in: _.compact(resolvedConnect.map((r)=>r.position?.after || r.position?.before))
1084
+ const computeOrderMap = async ()=>{
1085
+ // Get all adjacent relations and the one with the highest order
1086
+ const adjacentRelations = await this.createQueryBuilder(joinTable.name).where({
1087
+ $or: [
1088
+ {
1089
+ [joinColumn.name]: id,
1090
+ [inverseJoinColumn.name]: {
1091
+ $in: _.compact(resolvedConnect.map((r)=>r.position?.after || r.position?.before))
1092
+ }
1093
+ },
1094
+ {
1095
+ [joinColumn.name]: id,
1096
+ [orderColumnName]: this.createQueryBuilder(joinTable.name).min(orderColumnName).where({
1097
+ [joinColumn.name]: id
1098
+ }).where(joinTable.on || {}).transacting(trx).getKnexQuery()
1099
+ },
1100
+ {
1101
+ [joinColumn.name]: id,
1102
+ [orderColumnName]: this.createQueryBuilder(joinTable.name).max(orderColumnName).where({
1103
+ [joinColumn.name]: id
1104
+ }).where(joinTable.on || {}).transacting(trx).getKnexQuery()
1075
1105
  }
1076
- },
1077
- {
1078
- [joinColumn.name]: id,
1079
- [orderColumnName]: this.createQueryBuilder(joinTable.name).min(orderColumnName).where({
1080
- [joinColumn.name]: id
1081
- }).where(joinTable.on || {}).transacting(trx).getKnexQuery()
1082
- },
1083
- {
1084
- [joinColumn.name]: id,
1085
- [orderColumnName]: this.createQueryBuilder(joinTable.name).max(orderColumnName).where({
1086
- [joinColumn.name]: id
1087
- }).where(joinTable.on || {}).transacting(trx).getKnexQuery()
1088
- }
1089
- ]
1090
- }).where(joinTable.on || {}).orderBy(orderColumnName).transacting(trx).execute();
1091
- const orderMap = relationsOrderer.relationsOrderer(adjacentRelations, inverseJoinColumn.name, joinTable.orderColumnName, cleanRelationData.options?.strict).connect(resolvedConnect).getOrderMap();
1106
+ ]
1107
+ }).where(joinTable.on || {}).orderBy(orderColumnName).transacting(trx).execute();
1108
+ return relationsOrderer.relationsOrderer(adjacentRelations, inverseJoinColumn.name, joinTable.orderColumnName, cleanRelationData.options?.strict).connect(resolvedConnect).getOrderMap();
1109
+ };
1110
+ let orderMap = await computeOrderMap();
1111
+ // Order columns are unsigned on MySQL/MariaDB, so renumber from 1 to make room at the start
1112
+ if (Object.values(orderMap).some((order)=>order < 0)) {
1113
+ await regularRelations.cleanOrderColumns({
1114
+ attribute,
1115
+ db,
1116
+ id,
1117
+ transaction: trx
1118
+ });
1119
+ orderMap = await computeOrderMap();
1120
+ }
1092
1121
  insert.forEach((row)=>{
1093
1122
  row[orderColumnName] = orderMap[row[inverseJoinColumn.name]];
1094
1123
  });