@strapi/database 4.5.0-beta.0 → 4.5.1

package/lib/entity-manager/index.js

@@ -982,7 +982,7 @@ const createEntityManager = (db) => {
             }
 
             // Delete the previous relations for anyToOne relations
-            if (isBidirectional(attribute) && isAnyToOne(attribute)) {
+            if (isAnyToOne(attribute)) {
               await deletePreviousAnyToOneRelations({
                 id,
                 attribute,

package/lib/entity-manager/regular-relations.js

@@ -65,10 +65,8 @@ const deletePreviousAnyToOneRelations = async ({
   const { joinTable } = attribute;
   const { joinColumn, inverseJoinColumn } = joinTable;
 
-  if (!(isBidirectional(attribute) && isAnyToOne(attribute))) {
-    throw new Error(
-      'deletePreviousAnyToOneRelations can only be called for bidirectional anyToOne relations'
-    );
+  if (!isAnyToOne(attribute)) {
+    throw new Error('deletePreviousAnyToOneRelations can only be called for anyToOne relations');
   }
   // handling manyToOne
   if (isManyToAny(attribute)) {
@@ -228,8 +226,7 @@ const cleanOrderColumns = async ({ id, attribute, db, inverseRelIds, transaction
   // https://github.com/knex/knex/issues/2504
   switch (strapi.db.dialect.client) {
     case 'mysql':
-      await db
-        .getConnection()
+      await db.connection
         .raw(
           `UPDATE
             ?? as a,
@@ -245,17 +242,16 @@ const cleanOrderColumns = async ({ id, attribute, db, inverseRelIds, transaction
         .transacting(trx);
       break;
     default:
-      await db
-        .getConnection()
+      await db.connection
         .raw(
           `UPDATE ?? as a
-            SET ${update.join(', ')}
-            FROM (
-              SELECT ${select.join(', ')}
-              FROM ??
-              WHERE ${where.join(' OR ')}
-            ) AS b
-            WHERE b.id = a.id`,
+              SET ${update.join(', ')}
+              FROM (
+                SELECT ${select.join(', ')}
+                FROM ??
+                WHERE ${where.join(' OR ')}
+              ) AS b
+              WHERE b.id = a.id`,
           [joinTable.name, ...updateBinding, ...selectBinding, joinTable.name, ...whereBinding]
         )
         .transacting(trx);

package/lib/index.d.ts

@@ -1,6 +1,6 @@
 import { LifecycleProvider } from './lifecycles';
 import { MigrationProvider } from './migrations';
-import { SchemaProvideer } from './schema';
+import { SchemaProvider } from './schema';
 
 type LogicalOperators<T> = {
   $and?: WhereParams<T>[];
@@ -154,7 +154,7 @@ interface DatabaseConfig {
   models: ModelConfig[];
 }
 export interface Database {
-  schema: SchemaProvideer;
+  schema: SchemaProvider;
   lifecycles: LifecycleProvider;
   migrations: MigrationProvider;
   entityManager: EntityManager;

package/lib/metadata/index.js

@@ -9,6 +9,21 @@ class Metadata extends Map {
   add(meta) {
     return this.set(meta.uid, meta);
   }
+
+  /**
+   * Validate the DB metadata, throwing an error if a duplicate DB table name is detected
+   */
+  validate() {
+    const seenTables = new Map();
+    for (const meta of this.values()) {
+      if (seenTables.get(meta.tableName)) {
+        throw new Error(
+          `DB table "${meta.tableName}" already exists. Change the collectionName of the related content type.`
+        );
+      }
+      seenTables.set(meta.tableName, true);
+    }
+  }
 }
 
 // TODO: check if there isn't an attribute with an id already
@@ -81,6 +96,7 @@ const createMetadata = (models = []) => {
     meta.columnToAttribute = columnToAttribute;
   }
 
+  metadata.validate();
   return metadata;
 };
 

package/lib/query/helpers/populate/process.js

@@ -82,7 +82,13 @@ const processPopulate = (populate, ctx) => {
       continue;
     }
 
-    // make sure id is present for future populate queries
+    // Make sure to query the join column value if needed,
+    // so that we can apply the populate later on
+    if (attribute.joinColumn) {
+      qb.addSelect(attribute.joinColumn.name);
+    }
+
+    // Make sure id is present for future populate queries
     if (_.has('id', meta.attributes)) {
       qb.addSelect('id');
     }

package/lib/schema/index.d.ts

@@ -38,7 +38,7 @@ export interface Model {
   };
 }
 
-export interface SchemaProvideer {
+export interface SchemaProvider {
   sync(): Promise<void>;
   syncSchema(): Promise<void>;
   reset(): Promise<void>;
@@ -46,4 +46,4 @@ export interface SchemaProvideer {
   drop(): Promise<void>;
 }
 
-export default function(db: Database): SchemaProvideer;
+export default function(db: Database): SchemaProvider;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/database",
-  "version": "4.5.0-beta.0",
+  "version": "4.5.1",
   "description": "Strapi's database layer",
   "homepage": "https://strapi.io",
   "bugs": {
@@ -42,5 +42,5 @@
     "node": ">=14.19.1 <=18.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "ee98b9a9cbb6e0e07e781ff9e87eb170c72e50df"
+  "gitHead": "8c20ea2b5c5a115b78454086ea270dcd59b06004"
 }