@strapi/database 5.0.0-beta.7 → 5.0.0-beta.9

package/dist/index.mjs

@@ -3180,6 +3180,7 @@ const processOrderBy = (orderBy, ctx) => {
   }
   throw new Error("Invalid orderBy syntax");
 };
+const joinColPrefix = "__strapi";
 const XtoOne = async (input, ctx) => {
   const { attribute, attributeName, results, populateValue, targetMeta, isCount } = input;
   const { db, qb } = ctx;
@@ -3208,6 +3209,8 @@ const XtoOne = async (input, ctx) => {
     const { name: joinColumnName, referencedColumn: referencedColumnName } = joinTable.joinColumn;
     const alias = qb2.getAlias();
     const joinColAlias = `${alias}.${joinColumnName}`;
+    const joinColRenameAs = `${joinColPrefix}${joinColumnName}`;
+    const joinColSelect = `${joinColAlias} as ${joinColRenameAs}`;
     const referencedValues = _.uniq(
       results.map((r) => r[referencedColumnName]).filter((value) => !_.isNil(value))
     );
@@ -3252,8 +3255,8 @@ const XtoOne = async (input, ctx) => {
       rootTable: qb2.alias,
       on: joinTable.on,
       orderBy: joinTable.orderBy
-    }).addSelect(joinColAlias).where({ [joinColAlias]: referencedValues }).execute({ mapResults: false });
-    const map2 = _.groupBy(joinColumnName)(rows);
+    }).addSelect(joinColSelect).where({ [joinColAlias]: referencedValues }).execute({ mapResults: false });
+    const map2 = _.groupBy(joinColRenameAs)(rows);
     results.forEach((result) => {
       result[attributeName] = fromTargetRow(_.first(map2[result[referencedColumnName]]));
     });
@@ -3287,6 +3290,8 @@ const oneToMany = async (input, ctx) => {
     const { name: joinColumnName, referencedColumn: referencedColumnName } = joinTable.joinColumn;
     const alias = qb2.getAlias();
     const joinColAlias = `${alias}.${joinColumnName}`;
+    const joinColRenameAs = `${joinColPrefix}${joinColumnName}`;
+    const joinColSelect = `${joinColAlias} as ${joinColRenameAs}`;
     const referencedValues = _.uniq(
       results.map((r) => r[referencedColumnName]).filter((value) => !_.isNil(value))
     );
@@ -3304,10 +3309,10 @@ const oneToMany = async (input, ctx) => {
         rootColumn: joinTable.inverseJoinColumn.referencedColumn,
         rootTable: qb2.alias,
         on: joinTable.on
-      }).select([joinColAlias, qb2.raw("count(*) AS count")]).where({ [joinColAlias]: referencedValues }).groupBy(joinColAlias).execute({ mapResults: false });
+      }).select([joinColSelect, qb2.raw("count(*) AS count")]).where({ [joinColAlias]: referencedValues }).groupBy(joinColAlias).execute({ mapResults: false });
       const map22 = rows2.reduce(
         (map3, row) => {
-          map3[row[joinColumnName]] = { count: Number(row.count) };
+          map3[row[joinColRenameAs]] = { count: Number(row.count) };
           return map3;
         },
         {}
@@ -3331,8 +3336,8 @@ const oneToMany = async (input, ctx) => {
       rootTable: qb2.alias,
       on: joinTable.on,
       orderBy: _.mapValues((v) => populateValue.ordering || v, joinTable.orderBy)
-    }).addSelect(joinColAlias).where({ [joinColAlias]: referencedValues }).execute({ mapResults: false });
-    const map2 = _.groupBy(joinColumnName)(rows);
+    }).addSelect(joinColSelect).where({ [joinColAlias]: referencedValues }).execute({ mapResults: false });
+    const map2 = _.groupBy(joinColRenameAs)(rows);
     results.forEach((r) => {
       r[attributeName] = fromTargetRow(map2[r[referencedColumnName]] || []);
     });
@@ -3347,6 +3352,8 @@ const manyToMany = async (input, ctx) => {
   const { name: joinColumnName, referencedColumn: referencedColumnName } = joinTable.joinColumn;
   const alias = populateQb.getAlias();
   const joinColAlias = `${alias}.${joinColumnName}`;
+  const joinColRenameAs = `${joinColPrefix}${joinColumnName}`;
+  const joinColSelect = `${joinColAlias} as ${joinColRenameAs}`;
   const referencedValues = _.uniq(
     results.map((r) => r[referencedColumnName]).filter((value) => !_.isNil(value))
   );
@@ -3391,8 +3398,8 @@ const manyToMany = async (input, ctx) => {
     rootTable: populateQb.alias,
     on: joinTable.on,
     orderBy: _.mapValues((v) => populateValue.ordering || v, joinTable.orderBy)
-  }).addSelect(joinColAlias).where({ [joinColAlias]: referencedValues }).execute({ mapResults: false });
-  const map2 = _.groupBy(joinColumnName)(rows);
+  }).addSelect(joinColSelect).where({ [joinColAlias]: referencedValues }).execute({ mapResults: false });
+  const map2 = _.groupBy(joinColRenameAs)(rows);
   results.forEach((result) => {
     result[attributeName] = fromTargetRow(map2[result[referencedColumnName]] || []);
   });
@@ -3763,6 +3770,9 @@ const processRelationWhere = (where, ctx) => {
   }
   if (operatorKeys.length === 1) {
     const operator = operatorKeys[0];
+    if (isOperatorOfType("group", operator)) {
+      return processWhere(where, ctx);
+    }
     return { [idAlias]: { [operator]: processNested(where[operator], ctx) } };
   }
   return processWhere(where, ctx);
@@ -6183,9 +6193,37 @@ const findDiffs = (shortMap) => {
   });
   return diffs;
 };
+const createLocaleColumn = async (db, tableName) => {
+  await db.schema.alterTable(tableName, (table) => {
+    table.string("locale");
+  });
+};
+const createdLocale = {
+  name: "5.0.0-03-created-locale",
+  async up(knex2, db) {
+    for (const meta of db.metadata.values()) {
+      const hasTable = await knex2.schema.hasTable(meta.tableName);
+      if (!hasTable) {
+        continue;
+      }
+      const uid = meta.uid;
+      const model = strapi.getModel(uid);
+      if (!model) {
+        continue;
+      }
+      if (isNil(meta.attributes.locale)) {
+        await createLocaleColumn(knex2, meta.tableName);
+      }
+    }
+  },
+  async down() {
+    throw new Error("not implemented");
+  }
+};
 const internalMigrations = [
   renameIdentifiersLongerThanMaxLength,
-  createdDocumentId
+  createdDocumentId,
+  createdLocale
 ];
 const createInternalMigrationProvider = (db) => {
   const context = { db };