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

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

@@ -0,0 +1,96 @@
+'use strict';
+
+const _ = require('lodash/fp');
+
+const types = require('../../../types');
+
+const getRootLevelPopulate = (meta) => {
+  const populate = {};
+
+  for (const attributeName of Object.keys(meta.attributes)) {
+    const attribute = meta.attributes[attributeName];
+    if (attribute.type === 'relation') {
+      populate[attributeName] = true;
+    }
+  }
+
+  return populate;
+};
+
+/**
+ * Converts and prepares the query for populate
+ *
+ * @param {boolean|string[]|object} populate populate param
+ * @param {object} ctx query context
+ * @param {object} ctx.db database instance
+ * @param {object} ctx.qb query builder instance
+ * @param {string} ctx.uid model uid
+ */
+const processPopulate = (populate, ctx) => {
+  const { qb, db, uid } = ctx;
+  const meta = db.metadata.get(uid);
+
+  let populateMap = {};
+
+  if (populate === false || _.isNil(populate)) {
+    return null;
+  }
+
+  if (populate === true) {
+    populateMap = getRootLevelPopulate(meta);
+  } else if (Array.isArray(populate)) {
+    for (const key of populate) {
+      const [root, ...rest] = key.split('.');
+
+      if (rest.length > 0) {
+        const subPopulate = rest.join('.');
+
+        if (populateMap[root]) {
+          if (populateMap[root] === true) {
+            populateMap[root] = {
+              populate: [subPopulate],
+            };
+          } else {
+            populateMap[root].populate = [subPopulate].concat(populateMap[root].populate || []);
+          }
+        } else {
+          populateMap[root] = {
+            populate: [subPopulate],
+          };
+        }
+      } else {
+        populateMap[root] = populateMap[root] ? populateMap[root] : true;
+      }
+    }
+  } else {
+    populateMap = populate;
+  }
+
+  if (!_.isPlainObject(populateMap)) {
+    throw new Error('Populate must be an object');
+  }
+
+  const finalPopulate = {};
+  for (const key of Object.keys(populateMap)) {
+    const attribute = meta.attributes[key];
+
+    if (!attribute) {
+      continue;
+    }
+
+    if (!types.isRelation(attribute.type)) {
+      continue;
+    }
+
+    // make sure id is present for future populate queries
+    if (_.has('id', meta.attributes)) {
+      qb.addSelect('id');
+    }
+
+    finalPopulate[key] = populateMap[key];
+  }
+
+  return finalPopulate;
+};
+
+module.exports = processPopulate;

package/lib/query/query-builder.js

@@ -23,6 +23,9 @@ const createQueryBuilder = (uid, db, initialState = {}) => {
       offset: null,
       transaction: null,
       forUpdate: false,
+      onConflict: null,
+      merge: null,
+      ignore: false,
       orderBy: [],
       groupBy: [],
       increments: [],
@@ -69,6 +72,24 @@ const createQueryBuilder = (uid, db, initialState = {}) => {
       return this;
     },
 
+    onConflict(args) {
+      state.onConflict = args;
+
+      return this;
+    },
+
+    merge(args) {
+      state.merge = args;
+
+      return this;
+    },
+
+    ignore() {
+      state.ignore = true;
+
+      return this;
+    },
+
     delete() {
       state.type = 'delete';
 
@@ -400,6 +421,14 @@ const createQueryBuilder = (uid, db, initialState = {}) => {
         state.decrements.forEach((decr) => qb.decrement(decr.column, decr.amount));
       }
 
+      if (state.onConflict) {
+        if (state.merge) {
+          qb.onConflict(state.onConflict).merge(state.merge);
+        } else if (state.ignore) {
+          qb.onConflict(state.onConflict).ignore();
+        }
+      }
+
       if (state.limit) {
         qb.limit(state.limit);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/database",
-  "version": "4.5.0-alpha.0",
+  "version": "4.5.0-beta.0",
   "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": "c9a98c4dbcf3c4f2a449f8d96e7cbe4cd9b1e0f5"
+  "gitHead": "ee98b9a9cbb6e0e07e781ff9e87eb170c72e50df"
 }