@strapi/database 4.4.5 → 4.4.7

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.js

@@ -83,7 +83,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/database",
-  "version": "4.4.5",
+  "version": "4.4.7",
   "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": "65feb971b86e91c06a0b3c7aec1fae21346bb7de"
+  "gitHead": "2a7549f5df12ac54adbc1cd6a3a773d53965a137"
 }