@strapi/database 5.0.0-rc.2 → 5.0.0-rc.20

package/dist/index.mjs

@@ -2315,7 +2315,7 @@ const createMorphToOne = (attributeName, attribute) => {
   });
 };
 const createMorphToMany = (attributeName, attribute, meta, metadata) => {
-  if ("joinTable" in attribute && attribute.joinTable) {
+  if ("joinTable" in attribute && attribute.joinTable && !attribute.joinTable.__internal__) {
     return;
   }
   const joinTableName = identifiers.getMorphTableName(meta.tableName, attributeName);
@@ -2385,6 +2385,7 @@ const createMorphToMany = (attributeName, attribute, meta, metadata) => {
     columnToAttribute: {}
   });
   const joinTable = {
+    __internal__: true,
     name: joinTableName,
     joinColumn: {
       name: joinColumnName,
@@ -2454,7 +2455,7 @@ const createJoinTable = (metadata, { attributeName, attribute, meta }) => {
   if (!targetMeta) {
     throw new Error(`Unknown target ${attribute.target}`);
   }
-  if ("joinTable" in attribute && attribute.joinTable) {
+  if ("joinTable" in attribute && attribute.joinTable && !attribute.joinTable.__internal__) {
     return;
   }
   const joinTableName = identifiers.getJoinTableName(
@@ -2538,6 +2539,7 @@ const createJoinTable = (metadata, { attributeName, attribute, meta }) => {
     columnToAttribute: {}
   };
   const joinTable = {
+    __internal__: true,
     name: joinTableName,
     joinColumn: {
       name: joinColumnName,
@@ -2557,7 +2559,8 @@ const createJoinTable = (metadata, { attributeName, attribute, meta }) => {
       column: {
         unsigned: true,
         defaultTo: null
-      }
+      },
+      columnName: orderColumnName
     };
     metadataSchema.indexes.push({
       name: identifiers.getOrderFkIndexName(joinTableName),
@@ -2572,7 +2575,8 @@ const createJoinTable = (metadata, { attributeName, attribute, meta }) => {
       column: {
         unsigned: true,
         defaultTo: null
-      }
+      },
+      columnName: inverseOrderColumnName
     };
     metadataSchema.indexes.push({
       name: identifiers.getOrderInverseFkIndexName(joinTableName),
@@ -2595,6 +2599,7 @@ const createJoinTable = (metadata, { attributeName, attribute, meta }) => {
       );
     }
     inverseAttribute.joinTable = {
+      __internal__: true,
       name: joinTableName,
       joinColumn: joinTable.inverseJoinColumn,
       inverseJoinColumn: joinTable.joinColumn,
@@ -2743,12 +2748,22 @@ class StringField extends Field {
 }
 class JSONField extends Field {
   toDB(value) {
-    return JSON.stringify(value);
+    if (value == null) {
+      return null;
+    }
+    if (typeof value === "object") {
+      return JSON.stringify(value);
+    }
+    return value;
   }
   fromDB(value) {
     try {
       if (typeof value === "string") {
-        return JSON.parse(value);
+        const parsedValue = JSON.parse(value);
+        if (typeof parsedValue === "string") {
+          return JSON.parse(parsedValue);
+        }
+        return parsedValue;
       }
     } catch (error) {
       return value;
@@ -3426,7 +3441,11 @@ const oneToMany = async (input, ctx) => {
   const { db, qb } = ctx;
   const fromTargetRow = (rowOrRows) => fromRow(targetMeta, rowOrRows);
   if ("joinColumn" in attribute && attribute.joinColumn) {
-    const { name: joinColumnName, referencedColumn: referencedColumnName } = attribute.joinColumn;
+    const {
+      name: joinColumnName,
+      referencedColumn: referencedColumnName,
+      on
+    } = attribute.joinColumn;
     const referencedValues = _.uniq(
       results.map((r) => r[joinColumnName]).filter((value) => !_.isNil(value))
     );
@@ -3436,7 +3455,10 @@ const oneToMany = async (input, ctx) => {
       });
       return;
     }
-    const rows = await db.entityManager.createQueryBuilder(targetMeta.uid).init(populateValue).addSelect(`${qb.alias}.${referencedColumnName}`).where({ [referencedColumnName]: referencedValues }).execute({ mapResults: false });
+    const rows = await db.entityManager.createQueryBuilder(targetMeta.uid).init(populateValue).addSelect(`${qb.alias}.${referencedColumnName}`).where({
+      [referencedColumnName]: referencedValues,
+      ...on && typeof on === "function" ? on({ populateValue, results }) : {}
+    }).execute({ mapResults: false });
     const map2 = _.groupBy(referencedColumnName)(rows);
     results.forEach((result) => {
       result[attributeName] = fromTargetRow(map2[result[joinColumnName]] || []);
@@ -5243,8 +5265,10 @@ const processData = (metadata, data = {}, { withDefaults = false } = {}) => {
       if ("joinColumn" in attribute && attribute.joinColumn && attribute.owner) {
         const joinColumnName = attribute.joinColumn.name;
         const attrValue = !isUndefined(data[attributeName]) ? data[attributeName] : data[joinColumnName];
-        if (!isUndefined(attrValue)) {
+        if (isNull(attrValue)) {
           obj[joinColumnName] = attrValue;
+        } else if (!isUndefined(attrValue)) {
+          obj[joinColumnName] = toId(attrValue);
         }
         continue;
       }
@@ -6132,15 +6156,15 @@ const getNextIdsToCreateDocumentId = async (db, knex2, {
 };
 const migrateDocumentIdsWithLocalizations = async (db, knex2, meta) => {
   const singularName = meta.singularName.toLowerCase();
-  const joinColumn = identifiers.getJoinColumnAttributeIdName(singularName);
-  const inverseJoinColumn = identifiers.getInverseJoinColumnAttributeIdName(singularName);
+  const joinColumn = snakeCase(`${singularName}_id`);
+  const inverseJoinColumn = snakeCase(`inv_${singularName}_id`);
   let ids;
   do {
     ids = await getNextIdsToCreateDocumentId(db, knex2, {
       joinColumn,
       inverseJoinColumn,
       tableName: meta.tableName,
-      joinTableName: identifiers.getJoinTableName(meta.tableName, `localizations`)
+      joinTableName: snakeCase(`${meta.tableName}_localizations_links`)
     });
     if (ids.length > 0) {
       await knex2(meta.tableName).update({ document_id: createId() }).whereIn("id", ids);
@@ -6162,7 +6186,7 @@ const createDocumentIdColumn = async (knex2, tableName) => {
   });
 };
 const hasLocalizationsJoinTable = async (knex2, tableName) => {
-  const joinTableName = identifiers.getJoinTableName(tableName, "localizations");
+  const joinTableName = snakeCase(`${tableName}_localizations_links`);
   return knex2.schema.hasTable(joinTableName);
 };
 const createdDocumentId = {