@strapi/database 0.0.0-e6cac9fe30 → 0.0.0-fd8e4c6bfa

package/lib/query/helpers/populate.js

@@ -80,7 +80,7 @@ const processPopulate = (populate, ctx) => {
     }
 
     if (!types.isRelation(attribute.type)) {
-      throw new Error(`Invalid populate field. Expected a relation, got ${attribute.type}`);
+      continue;
     }
 
     // make sure id is present for future populate queries

package/lib/query/query-builder.js

@@ -71,7 +71,7 @@ const createQueryBuilder = (uid, db) => {
       return this;
     },
 
-    count(count = '*') {
+    count(count = 'id') {
       state.type = 'count';
       state.count = count;
 
@@ -295,10 +295,13 @@ const createQueryBuilder = (uid, db) => {
           break;
         }
         case 'count': {
-          const dbColumnName =
-            state.count === '*' ? '*' : this.aliasColumn(helpers.toColumnName(meta, state.count));
+          const dbColumnName = this.aliasColumn(helpers.toColumnName(meta, state.count));
 
-          qb.count({ count: dbColumnName });
+          if (this.shouldUseDistinct()) {
+            qb.countDistinct({ count: dbColumnName });
+          } else {
+            qb.count({ count: dbColumnName });
+          }
           break;
         }
         case 'max': {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/database",
-  "version": "0.0.0-e6cac9fe30",
+  "version": "0.0.0-fd8e4c6bfa",
   "description": "Strapi's database layer",
   "homepage": "https://strapi.io",
   "bugs": {
@@ -31,7 +31,7 @@
     "test:unit": "jest --verbose"
   },
   "dependencies": {
-    "date-fns": "2.28.0",
+    "date-fns": "2.29.2",
     "debug": "4.3.1",
     "fs-extra": "10.0.0",
     "knex": "1.0.7",
@@ -42,5 +42,5 @@
     "node": ">=14.19.1 <=16.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "e6cac9fe309b80c9c59cde56d6b25fc6cd40bc8d"
+  "gitHead": "fd8e4c6bfa2fd687a3c62f8428e00f3b320c32c2"
 }