@strapi/database 4.2.0 → 4.3.0-beta.1

package/lib/entity-manager.js

@@ -617,7 +617,7 @@ const createEntityManager = db => {
         }
 
         if (attribute.joinColumn && attribute.owner) {
-          // handled in the row itslef
+          // handled in the row itself
           continue;
         }
 

package/lib/index.d.ts

@@ -2,16 +2,37 @@ import { LifecycleProvider } from './lifecycles';
 import { MigrationProvider } from './migrations';
 import { SchemaProvideer } from './schema';
 
-type BooleanWhere<T> = {
+type LogicalOperators<T> = {
   $and?: WhereParams<T>[];
   $or?: WhereParams<T>[];
   $not?: WhereParams<T>;
 };
 
-type WhereParams<T> = {
-  [K in keyof T]?: T[K];
+type AttributeOperators<T, K extends keyof T> = {
+  $eq?: T[K] | Array<T[K]>;
+  $ne?: T[K] | Array<T[K]>;
+  $in?: T[K][];
+  $notIn?: T[K][];
+  $lt?: T[K];
+  $lte?: T[K];
+  $gt?: T[K];
+  $gte?: T[K];
+  $between?: [T[K], T[K]];
+  $contains?: T[K];
+  $notContains?: T[K];
+  $containsi?: T[K];
+  $notContainsi?: T[K];
+  $startsWith?: T[K];
+  $endsWith?: T[K];
+  $null?: boolean;
+  $notNull?: boolean;
+  $not?: WhereParams<T> | AttributeOperators<T, K>;
+};
+
+export type WhereParams<T> = {
+  [K in keyof T]?: T[K] | T[K][] | AttributeOperators<T, K>;
 } &
-  BooleanWhere<T>;
+  LogicalOperators<T>;
 
 type Sortables<T> = {
   // check sortable

package/lib/index.js

@@ -58,6 +58,10 @@ class Database {
     return schema ? trx.schema.withSchema(schema) : trx.schema;
   }
 
+  transaction() {
+    return this.connection.transaction();
+  }
+
   queryBuilder(uid) {
     return this.entityManager.createQueryBuilder(uid);
   }

package/lib/metadata/index.js

@@ -33,6 +33,7 @@ const createMetadata = (models = []) => {
         ...model.attributes,
       },
       lifecycles: model.lifecycles || {},
+      indexes: model.indexes || [],
     });
   }
 

package/lib/migrations/index.js

@@ -34,7 +34,7 @@ const migrationResolver = ({ name, path, context }) => {
 };
 
 const createUmzugProvider = db => {
-  const migrationDir = path.join(strapi.dirs.root, 'database/migrations');
+  const migrationDir = path.join(strapi.dirs.app.root, 'database/migrations');
 
   fse.ensureDirSync(migrationDir);
 

package/lib/query/query-builder.js

@@ -12,6 +12,7 @@ const createQueryBuilder = (uid, db) => {
     type: 'select',
     select: [],
     count: null,
+    max: null,
     first: false,
     data: null,
     where: [],
@@ -19,6 +20,8 @@ const createQueryBuilder = (uid, db) => {
     populate: null,
     limit: null,
     offset: null,
+    transaction: null,
+    forUpdate: false,
     orderBy: [],
     groupBy: [],
   };
@@ -75,6 +78,13 @@ const createQueryBuilder = (uid, db) => {
       return this;
     },
 
+    max(column) {
+      state.type = 'max';
+      state.max = column;
+
+      return this;
+    },
+
     where(where = {}) {
       if (!_.isPlainObject(where)) {
         throw new Error('Where must be an object');
@@ -115,6 +125,16 @@ const createQueryBuilder = (uid, db) => {
       return this;
     },
 
+    transacting(transaction) {
+      state.transaction = transaction;
+      return this;
+    },
+
+    forUpdate() {
+      state.forUpdate = true;
+      return this;
+    },
+
     init(params = {}) {
       const { _q, filters, where, select, limit, offset, orderBy, groupBy, populate } = params;
 
@@ -281,7 +301,15 @@ const createQueryBuilder = (uid, db) => {
           break;
         }
         case 'count': {
-          qb.count({ count: state.count });
+          const dbColumnName =
+            state.count === '*' ? '*' : this.aliasColumn(helpers.toColumnName(meta, state.count));
+
+          qb.count({ count: dbColumnName });
+          break;
+        }
+        case 'max': {
+          const dbColumnName = this.aliasColumn(helpers.toColumnName(meta, state.max));
+          qb.max({ max: dbColumnName });
           break;
         }
         case 'insert': {
@@ -308,6 +336,14 @@ const createQueryBuilder = (uid, db) => {
         }
       }
 
+      if (state.transaction) {
+        qb.transacting(state.transaction);
+      }
+
+      if (state.forUpdate) {
+        qb.forUpdate();
+      }
+
       if (state.limit) {
         qb.limit(state.limit);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/database",
-  "version": "4.2.0",
+  "version": "4.3.0-beta.1",
   "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": "12c8ee3b2d95fe417de4d939db0311a0513bd8da"
+  "gitHead": "9d6555398960c39159d66bb4eea3bcb0362e37e3"
 }