@strapi/database 4.4.0-alpha.0 → 4.4.0-beta.0

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

@@ -34,7 +34,7 @@ const processData = (metadata, data = {}, { withDefaults = false } = {}) => {
 
   const obj = {};
 
-  for (const attributeName in attributes) {
+  for (const attributeName of Object.keys(attributes)) {
     const attribute = attributes[attributeName];
 
     if (types.isScalar(attribute.type)) {
@@ -333,7 +333,7 @@ const createEntityManager = (db) => {
     async attachRelations(uid, id, data) {
       const { attributes } = db.metadata.get(uid);
 
-      for (const attributeName in attributes) {
+      for (const attributeName of Object.keys(attributes)) {
         const attribute = attributes[attributeName];
 
         const isValidLink = _.has(attributeName, data) && !_.isNil(data[attributeName]);
@@ -487,7 +487,7 @@ const createEntityManager = (db) => {
     async updateRelations(uid, id, data) {
       const { attributes } = db.metadata.get(uid);
 
-      for (const attributeName in attributes) {
+      for (const attributeName of Object.keys(attributes)) {
         const attribute = attributes[attributeName];
 
         if (attribute.type !== 'relation' || !_.has(attributeName, data)) {
@@ -667,7 +667,7 @@ const createEntityManager = (db) => {
     async deleteRelations(uid, id) {
       const { attributes } = db.metadata.get(uid);
 
-      for (const attributeName in attributes) {
+      for (const attributeName of Object.keys(attributes)) {
         const attribute = attributes[attributeName];
 
         if (attribute.type !== 'relation') {
@@ -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/lifecycles/index.js

@@ -54,7 +54,7 @@ const createLifecyclesProvider = (db) => {
      * @param {Map<any, any>} states
      */
     async run(action, uid, properties, states = new Map()) {
-      for (let i = 0; i < subscribers.length; i++) {
+      for (let i = 0; i < subscribers.length; i += 1) {
         const subscriber = subscribers[i];
         if (typeof subscriber === 'function') {
           const state = states.get(subscriber) || {};

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/query/helpers/join.js

@@ -71,7 +71,7 @@ const applyJoin = (qb, join) => {
     inner.on(`${rootTable}.${rootColumn}`, `${alias}.${referencedColumn}`);
 
     if (on) {
-      for (const key in on) {
+      for (const key of Object.keys(on)) {
         inner.onVal(`${alias}.${key}`, on[key]);
       }
     }

package/lib/query/helpers/populate.js

@@ -8,7 +8,7 @@ const { fromRow } = require('./transform');
 const getRootLevelPopulate = (meta) => {
   const populate = {};
 
-  for (const attributeName in meta.attributes) {
+  for (const attributeName of Object.keys(meta.attributes)) {
     const attribute = meta.attributes[attributeName];
     if (attribute.type === 'relation') {
       populate[attributeName] = true;
@@ -72,7 +72,7 @@ const processPopulate = (populate, ctx) => {
   }
 
   const finalPopulate = {};
-  for (const key in populateMap) {
+  for (const key of Object.keys(populateMap)) {
     const attribute = meta.attributes[key];
 
     if (!attribute) {
@@ -119,7 +119,7 @@ const applyPopulate = async (results, populate, ctx) => {
     return results;
   }
 
-  for (const key in populate) {
+  for (const key of Object.keys(populate)) {
     const attribute = meta.attributes[key];
     const targetMeta = db.metadata.get(attribute.target);
 
@@ -540,7 +540,7 @@ const applyPopulate = async (results, populate, ctx) => {
       }, {});
 
       const map = {};
-      for (const type in idsByType) {
+      for (const type of Object.keys(idsByType)) {
         const ids = idsByType[type];
 
         // type was removed but still in morph relation
@@ -604,7 +604,7 @@ const applyPopulate = async (results, populate, ctx) => {
       }, {});
 
       const map = {};
-      for (const type in idsByType) {
+      for (const type of Object.keys(idsByType)) {
         const ids = idsByType[type];
 
         // type was removed but still in morph relation

package/lib/query/helpers/transform.js

@@ -53,7 +53,7 @@ const toRow = (meta, data = {}) => {
 
   const { attributes } = meta;
 
-  for (const key in data) {
+  for (const key of Object.keys(data)) {
     const attribute = attributes[key];
 
     if (!attribute || attribute.columnName === key) {

package/lib/query/helpers/where.js

@@ -76,7 +76,7 @@ const processAttributeWhere = (attribute, where, operator = '$eq') => {
 
   const filters = {};
 
-  for (const key in where) {
+  for (const key of Object.keys(where)) {
     const value = where[key];
 
     if (!isOperator(key)) {
@@ -119,7 +119,7 @@ const processWhere = (where, ctx) => {
   const filters = {};
 
   // for each key in where
-  for (const key in where) {
+  for (const key of Object.keys(where)) {
     const value = where[key];
 
     // if operator $and $or then loop over them

package/lib/query/query-builder.js

@@ -27,7 +27,13 @@ const createQueryBuilder = (uid, db) => {
   };
 
   let counter = 0;
-  const getAlias = () => `t${counter++}`;
+  const getAlias = () => {
+    const alias = `t${counter}`;
+
+    counter += 1;
+
+    return alias;
+  };
 
   return {
     alias: getAlias(),

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();
+          tableBuilder.primary(addedColumn.name);
+        } else {
+          createColumn(tableBuilder, addedColumn);
+        }
       }
 
       for (const addedForeignKey of table.foreignKeys.added) {

package/lib/schema/schema.js

@@ -25,7 +25,7 @@ const createTable = (meta) => {
     columns: [],
   };
 
-  for (const key in meta.attributes) {
+  for (const key of Object.keys(meta.attributes)) {
     const attribute = meta.attributes[key];
 
     if (types.isRelation(attribute.type)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/database",
-  "version": "4.4.0-alpha.0",
+  "version": "4.4.0-beta.0",
   "description": "Strapi's database layer",
   "homepage": "https://strapi.io",
   "bugs": {
@@ -39,8 +39,8 @@
     "umzug": "3.1.1"
   },
   "engines": {
-    "node": ">=14.19.1 <=16.x.x",
+    "node": ">=14.19.1 <=18.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "fc78298ae4f9b247d636beda568734d5f8ed7b3e"
+  "gitHead": "cae16f7f259fa4473a55e8fea57839cda98f34ae"
 }