@strapi/database 4.3.6 → 4.3.7

package/lib/dialects/dialect.js

@@ -44,6 +44,10 @@ class Dialect {
 
     throw new Error(error.message);
   }
+
+  canAddIncrements() {
+    return true;
+  }
 }
 
 module.exports = {

package/lib/dialects/sqlite/index.js

@@ -24,6 +24,10 @@ class SqliteDialect extends Dialect {
     fse.ensureDirSync(dbDir);
   }
 
+  useReturning() {
+    return true;
+  }
+
   async initialize() {
     await this.db.connection.raw('pragma foreign_keys = on');
   }
@@ -68,6 +72,10 @@ class SqliteDialect extends Dialect {
       }
     }
   }
+
+  canAddIncrements() {
+    return false;
+  }
 }
 
 module.exports = SqliteDialect;

package/lib/entity-manager.js

@@ -776,7 +776,6 @@ const createEntityManager = (db) => {
       }
     },
 
-    // TODO: support multiple relations at once with the populate syntax
     // TODO: add lifecycle events
     async populate(uid, entity, populate) {
       const entry = await this.findOne(uid, {
@@ -788,30 +787,37 @@ const createEntityManager = (db) => {
       return { ...entity, ...entry };
     },
 
-    // TODO: support multiple relations at once with the populate syntax
     // TODO: add lifecycle events
-    async load(uid, entity, field, params) {
+    async load(uid, entity, fields, params) {
       const { attributes } = db.metadata.get(uid);
 
-      const attribute = attributes[field];
+      const fieldsArr = _.castArray(fields);
+      fieldsArr.forEach((field) => {
+        const attribute = attributes[field];
 
-      if (!attribute || attribute.type !== 'relation') {
-        throw new Error('Invalid load. Expected a relational attribute');
-      }
+        if (!attribute || attribute.type !== 'relation') {
+          throw new Error(`Invalid load. Expected ${field} to be a relational attribute`);
+        }
+      });
 
       const entry = await this.findOne(uid, {
         select: ['id'],
         where: { id: entity.id },
-        populate: {
-          [field]: params || true,
-        },
+        populate: fieldsArr.reduce((acc, field) => {
+          acc[field] = params || true;
+          return acc;
+        }, {}),
       });
 
       if (!entry) {
         return null;
       }
 
-      return entry[field];
+      if (Array.isArray(fields)) {
+        return _.pick(fields, entry);
+      }
+
+      return entry[fields];
     },
 
     // cascading

package/lib/metadata/relations.js

@@ -206,6 +206,9 @@ const createMorphToMany = (attributeName, attribute, meta, metadata) => {
     uid: joinTableName,
     tableName: joinTableName,
     attributes: {
+      id: {
+        type: 'increments',
+      },
       [joinColumnName]: {
         type: 'integer',
         column: {
@@ -404,6 +407,9 @@ const createJoinTable = (metadata, { attributeName, attribute, meta }) => {
     uid: joinTableName,
     tableName: joinTableName,
     attributes: {
+      id: {
+        type: 'increments',
+      },
       [joinColumnName]: {
         type: 'integer',
         column: {

package/lib/schema/builder.js

@@ -290,13 +290,16 @@ const createHelpers = (db) => {
       }
 
       // Update existing columns / foreign keys / indexes
-
       for (const updatedColumn of table.columns.updated) {
         debug(`Updating column ${updatedColumn.name}`);
 
         const { object } = updatedColumn;
 
-        createColumn(tableBuilder, object).alter();
+        if (object.type === 'increments') {
+          createColumn(tableBuilder, { ...object, type: 'integer' }).alter();
+        } else {
+          createColumn(tableBuilder, object).alter();
+        }
       }
 
       for (const updatedForeignKey of table.foreignKeys.updated) {
@@ -311,7 +314,13 @@ const createHelpers = (db) => {
 
       for (const addedColumn of table.columns.added) {
         debug(`Creating column ${addedColumn.name}`);
-        createColumn(tableBuilder, addedColumn);
+
+        if (addedColumn.type === 'increments' && !db.dialect.canAddIncrements()) {
+          tableBuilder.integer(addedColumn.name).unsigned().notNullable();
+          tableBuilder.primary(addedColumn.name);
+        } else {
+          createColumn(tableBuilder, addedColumn);
+        }
       }
 
       for (const addedForeignKey of table.foreignKeys.added) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/database",
-  "version": "4.3.6",
+  "version": "4.3.7",
   "description": "Strapi's database layer",
   "homepage": "https://strapi.io",
   "bugs": {
@@ -42,5 +42,5 @@
     "node": ">=14.19.1 <=16.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "4c6e67c4934580ed051a2afb83e6fc8f64f3a5b5"
+  "gitHead": "73f523b98322cea8992c72977b94a73a624d2e79"
 }