@strapi/database 5.0.0-rc.9 → 5.0.1

package/dist/index.mjs

@@ -1152,10 +1152,6 @@ const createHelpers = (db) => {
         debug$2(`Dropping updated foreign key ${updatedForeignKey.name} on ${table.name}`);
         dropForeignKey(tableBuilder, updatedForeignKey.object);
       }
-      for (const removedColumn of table.columns.removed) {
-        debug$2(`Dropping column ${removedColumn.name} on ${table.name}`);
-        dropColumn(tableBuilder, removedColumn);
-      }
       const isMySQL = db.config.connection.client === "mysql";
       const ignoreForeignKeyNames = isMySQL ? [
         ...table.foreignKeys.removed.map((fk) => fk.name),
@@ -1173,6 +1169,10 @@ const createHelpers = (db) => {
           dropIndex2(tableBuilder, updatedIndex.object);
         }
       }
+      for (const removedColumn of table.columns.removed) {
+        debug$2(`Dropping column ${removedColumn.name} on ${table.name}`);
+        dropColumn(tableBuilder, removedColumn);
+      }
       for (const updatedColumn of table.columns.updated) {
         debug$2(`Updating column ${updatedColumn.name} on ${table.name}`);
         const { object } = updatedColumn;
@@ -1182,14 +1182,6 @@ const createHelpers = (db) => {
           createColumn2(tableBuilder, object).alter();
         }
       }
-      for (const updatedForeignKey of table.foreignKeys.updated) {
-        debug$2(`Recreating updated foreign key ${updatedForeignKey.name} on ${table.name}`);
-        createForeignKey(tableBuilder, updatedForeignKey.object);
-      }
-      for (const updatedIndex of table.indexes.updated) {
-        debug$2(`Recreating updated index ${updatedIndex.name} on ${table.name}`);
-        createIndex(tableBuilder, updatedIndex.object);
-      }
       for (const addedColumn of table.columns.added) {
         debug$2(`Creating column ${addedColumn.name} on ${table.name}`);
         if (addedColumn.type === "increments" && !db.dialect.canAddIncrements()) {
@@ -1199,6 +1191,14 @@ const createHelpers = (db) => {
           createColumn2(tableBuilder, addedColumn);
         }
       }
+      for (const updatedForeignKey of table.foreignKeys.updated) {
+        debug$2(`Recreating updated foreign key ${updatedForeignKey.name} on ${table.name}`);
+        createForeignKey(tableBuilder, updatedForeignKey.object);
+      }
+      for (const updatedIndex of table.indexes.updated) {
+        debug$2(`Recreating updated index ${updatedIndex.name} on ${table.name}`);
+        createIndex(tableBuilder, updatedIndex.object);
+      }
       for (const addedForeignKey of table.foreignKeys.added) {
         debug$2(`Creating foreign keys ${addedForeignKey.name} on ${table.name}`);
         createForeignKey(tableBuilder, addedForeignKey);
@@ -2261,7 +2261,7 @@ const createOneToOne = (attributeName, attribute, meta, metadata) => {
   }
 };
 const createOneToMany = (attributeName, attribute, meta, metadata) => {
-  if (!isBidirectional(attribute)) {
+  if (shouldUseJoinTable(attribute) && !isBidirectional(attribute)) {
     createJoinTable(metadata, {
       attribute,
       attributeName,
@@ -2290,7 +2290,7 @@ const createManyToOne = (attributeName, attribute, meta, metadata) => {
   }
 };
 const createManyToMany = (attributeName, attribute, meta, metadata) => {
-  if (!isBidirectional(attribute) || isOwner(attribute)) {
+  if (shouldUseJoinTable(attribute) && (!isBidirectional(attribute) || isOwner(attribute))) {
     createJoinTable(metadata, {
       attribute,
       attributeName,
@@ -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,
@@ -2450,11 +2451,14 @@ const createJoinColumn = (metadata, { attribute, attributeName }) => {
   }
 };
 const createJoinTable = (metadata, { attributeName, attribute, meta }) => {
+  if (!shouldUseJoinTable(attribute)) {
+    throw new Error("Attempted to create join table when useJoinTable is false");
+  }
   const targetMeta = metadata.get(attribute.target);
   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 +2542,7 @@ const createJoinTable = (metadata, { attributeName, attribute, meta }) => {
     columnToAttribute: {}
   };
   const joinTable = {
+    __internal__: true,
     name: joinTableName,
     joinColumn: {
       name: joinColumnName,
@@ -2597,6 +2602,7 @@ const createJoinTable = (metadata, { attributeName, attribute, meta }) => {
       );
     }
     inverseAttribute.joinTable = {
+      __internal__: true,
       name: joinTableName,
       joinColumn: joinTable.inverseJoinColumn,
       inverseJoinColumn: joinTable.joinColumn,
@@ -2682,6 +2688,9 @@ class Metadata extends Map {
     for (const meta of this.values()) {
       for (const [attributeName, attribute] of Object.entries(meta.attributes)) {
         try {
+          if (attribute.unstable_virtual) {
+            continue;
+          }
           if (isRelationalAttribute(attribute)) {
             createRelation(attributeName, attribute, meta, this);
             continue;
@@ -3438,7 +3447,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))
     );
@@ -3448,7 +3461,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]] || []);
@@ -5255,8 +5271,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;
       }
@@ -6144,15 +6162,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);
@@ -6174,7 +6192,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 = {
@@ -6246,21 +6264,24 @@ const renameIndex = async (knex2, db, diff) => {
     debug(`not renaming index ${full.indexName} because name hasn't changed`);
     return;
   }
-  if (short.indexName.includes("_lnk_") || full.indexName.includes("_lnk_") || short.indexName.endsWith("fk") || full.indexName.endsWith("fk")) {
+  if (short.indexName.endsWith("fk") || full.indexName.endsWith("fk")) {
     return;
   }
   debug(`renaming index from ${full.indexName} to ${short.indexName}`);
   try {
     await knex2.transaction(async (trx) => {
       if (client === "mysql" || client === "mariadb") {
-        await knex2.raw(
-          `ALTER TABLE \`${full.tableName}\` RENAME INDEX \`${full.indexName}\` TO \`${short.indexName}\``
-        ).transacting(trx);
+        await knex2.raw("ALTER TABLE ?? RENAME INDEX ?? TO ??", [
+          full.tableName,
+          full.indexName,
+          short.indexName
+        ]).transacting(trx);
       } else if (client === "pg" || client === "postgres") {
-        await knex2.raw(`ALTER INDEX "${full.indexName}" RENAME TO "${short.indexName}"`).transacting(trx);
-      } else if (client === "sqlite" || client === "better") {
+        await knex2.raw("ALTER INDEX ?? RENAME TO ??", [full.indexName, short.indexName]).transacting(trx);
+      } else if (["sqlite", "sqlite3", "better-sqlite3"].includes(client)) {
+        debug(`SQLite does not support index renaming, not renaming index ${full.indexName}`);
       } else {
-        debug("No db client name matches, not creating index");
+        debug(`No db client name matches, not renaming index ${full.indexName}`);
       }
     });
   } catch (err) {