@strapi/database 4.3.4 → 4.3.5

package/jest.config.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const baseConfig = require('../../../jest.base-config');
-const pkg = require('./package');
+const pkg = require('./package.json');
 
 module.exports = {
   ...baseConfig,

package/lib/__tests__/lifecycles.test.js

@@ -6,7 +6,7 @@ describe('LifecycleProvider', () => {
   describe('run', () => {
     /** @type {import("../lifecycles").LifecycleProvider} */
     let provider;
-    let dbMetadataGetStub = jest.fn(uid => ({ uid, name: 'TestModel' }));
+    const dbMetadataGetStub = jest.fn((uid) => ({ uid, name: 'TestModel' }));
 
     beforeEach(() => {
       const db = {

package/lib/connection.js

@@ -1,12 +1,12 @@
-/* eslint-disable node/no-missing-require */
-/* eslint-disable node/no-extraneous-require */
+/* eslint-disable import/no-extraneous-dependencies */
+
 'use strict';
 
 const knex = require('knex');
 
 const SqliteClient = require('knex/lib/dialects/sqlite3/index');
 
-const trySqlitePackage = packageName => {
+const trySqlitePackage = (packageName) => {
   try {
     require.resolve(packageName);
     return packageName;
@@ -44,7 +44,7 @@ const getSqlitePackageName = () => {
   );
 };
 
-const createConnection = config => {
+const createConnection = (config) => {
   const knexConfig = { ...config };
   if (knexConfig.client === 'sqlite') {
     const sqlitePackageName = getSqlitePackageName();

package/lib/dialects/dialect.js

@@ -6,6 +6,7 @@ class Dialect {
   }
 
   configure() {}
+
   initialize() {}
 
   getSqlType(type) {
@@ -28,8 +29,13 @@ class Dialect {
     return false;
   }
 
-  async startSchemaUpdate() {}
-  async endSchemaUpdate() {}
+  async startSchemaUpdate() {
+    // noop
+  }
+
+  async endSchemaUpdate() {
+    // noop
+  }
 
   transformErrors(error) {
     if (error instanceof Error) {

package/lib/dialects/index.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const getDialectClass = client => {
+const getDialectClass = (client) => {
   switch (client) {
     case 'postgres':
       return require('./postgresql');
@@ -13,7 +13,7 @@ const getDialectClass = client => {
   }
 };
 
-const getDialect = db => {
+const getDialect = (db) => {
   const { client } = db.config.connection;
 
   const constructor = getDialectClass(client);

package/lib/dialects/mysql/index.js

@@ -15,12 +15,12 @@ class MysqlDialect extends Dialect {
     this.db.config.connection.connection.bigNumberStrings = true;
     this.db.config.connection.connection.typeCast = (field, next) => {
       if (field.type === 'DECIMAL' || field.type === 'NEWDECIMAL') {
-        var value = field.string();
+        const value = field.string();
         return value === null ? null : Number(value);
       }
 
       if (field.type === 'TINY' && field.length === 1) {
-        let value = field.string();
+        const value = field.string();
         return value ? value === '1' : null;
       }
 

package/lib/dialects/mysql/schema-inspector.js

@@ -55,7 +55,7 @@ const SQL_QUERIES = {
   `,
 };
 
-const toStrapiType = column => {
+const toStrapiType = (column) => {
   const rootType = column.data_type.toLowerCase().match(/[^(), ]+/)[0];
 
   switch (rootType) {
@@ -119,7 +119,7 @@ class MysqlSchemaInspector {
     const tables = await this.getTables();
 
     schema.tables = await Promise.all(
-      tables.map(async tableName => {
+      tables.map(async (tableName) => {
         const columns = await this.getColumns(tableName);
         const indexes = await this.getIndexes(tableName);
         const foreignKeys = await this.getForeignKeys(tableName);
@@ -139,13 +139,13 @@ class MysqlSchemaInspector {
   async getTables() {
     const [rows] = await this.db.connection.raw(SQL_QUERIES.TABLE_LIST);
 
-    return rows.map(row => row.table_name);
+    return rows.map((row) => row.table_name);
   }
 
   async getColumns(tableName) {
     const [rows] = await this.db.connection.raw(SQL_QUERIES.LIST_COLUMNS, [tableName]);
 
-    return rows.map(row => {
+    return rows.map((row) => {
       const { type, args = [], ...rest } = toStrapiType(row);
 
       return {
@@ -214,20 +214,16 @@ class MysqlSchemaInspector {
         ret[fkReference.constraint_name].referencedColumns.push(fkReference.referenced_column_name);
       }
 
-      const [
-        fkReferentialConstraints,
-      ] = await this.db.connection.raw(SQL_QUERIES.FOREIGN_KEY_REFERENTIALS_CONSTRAINTS, [
-        contraintNames,
-        tableName,
-      ]);
+      const [fkReferentialConstraints] = await this.db.connection.raw(
+        SQL_QUERIES.FOREIGN_KEY_REFERENTIALS_CONSTRAINTS,
+        [contraintNames, tableName]
+      );
 
       for (const fkReferentialConstraint of fkReferentialConstraints) {
-        ret[
-          fkReferentialConstraint.constraint_name
-        ].onUpdate = fkReferentialConstraint.on_update.toUpperCase();
-        ret[
-          fkReferentialConstraint.constraint_name
-        ].onDelete = fkReferentialConstraint.on_delete.toUpperCase();
+        ret[fkReferentialConstraint.constraint_name].onUpdate =
+          fkReferentialConstraint.on_update.toUpperCase();
+        ret[fkReferentialConstraint.constraint_name].onDelete =
+          fkReferentialConstraint.on_delete.toUpperCase();
       }
     }
 

package/lib/dialects/postgresql/index.js

@@ -16,7 +16,7 @@ class PostgresDialect extends Dialect {
   }
 
   initialize() {
-    this.db.connection.client.driver.types.setTypeParser(1082, 'text', v => v); // Don't cast DATE string to Date()
+    this.db.connection.client.driver.types.setTypeParser(1082, 'text', (v) => v); // Don't cast DATE string to Date()
     this.db.connection.client.driver.types.setTypeParser(1700, 'text', parseFloat);
   }
 
@@ -38,7 +38,7 @@ class PostgresDialect extends Dialect {
   transformErrors(error) {
     switch (error.code) {
       case '23502': {
-        throw new errors.NotNullConstraint({ column: error.column });
+        throw new errors.NotNullError({ column: error.column });
       }
       default: {
         super.transformErrors(error);

package/lib/dialects/postgresql/schema-inspector.js

@@ -51,7 +51,7 @@ const SQL_QUERIES = {
     SELECT
       kcu."constraint_name" as constraint_name,
       kcu."column_name" as column_name
-     
+
     FROM information_schema.key_column_usage kcu
     WHERE kcu.constraint_name=ANY(?)
     AND kcu.table_schema = ?
@@ -77,7 +77,7 @@ const SQL_QUERIES = {
 `,
 };
 
-const toStrapiType = column => {
+const toStrapiType = (column) => {
   const rootType = column.data_type.toLowerCase().match(/[^(), ]+/)[0];
 
   switch (rootType) {
@@ -122,6 +122,18 @@ const toStrapiType = column => {
   }
 };
 
+const getIndexType = (index) => {
+  if (index.is_primary) {
+    return 'primary';
+  }
+
+  if (index.is_unique) {
+    return 'unique';
+  }
+
+  return null;
+};
+
 class PostgresqlSchemaInspector {
   constructor(db) {
     this.db = db;
@@ -133,7 +145,7 @@ class PostgresqlSchemaInspector {
     const tables = await this.getTables();
 
     schema.tables = await Promise.all(
-      tables.map(async tableName => {
+      tables.map(async (tableName) => {
         const columns = await this.getColumns(tableName);
         const indexes = await this.getIndexes(tableName);
         const foreignKeys = await this.getForeignKeys(tableName);
@@ -159,7 +171,7 @@ class PostgresqlSchemaInspector {
       this.getDatabaseSchema(),
     ]);
 
-    return rows.map(row => row.table_name);
+    return rows.map((row) => row.table_name);
   }
 
   async getColumns(tableName) {
@@ -168,7 +180,7 @@ class PostgresqlSchemaInspector {
       tableName,
     ]);
 
-    return rows.map(row => {
+    return rows.map((row) => {
       const { type, args = [], ...rest } = toStrapiType(row);
 
       const defaultTo =
@@ -203,7 +215,7 @@ class PostgresqlSchemaInspector {
         ret[index.indexrelid] = {
           columns: [index.column_name],
           name: index.index_name,
-          type: index.is_primary ? 'primary' : index.is_unique ? 'unique' : null,
+          type: getIndexType(index),
         };
       } else {
         ret[index.indexrelid].columns.push(index.column_name);
@@ -234,31 +246,24 @@ class PostgresqlSchemaInspector {
     const constraintNames = Object.keys(ret);
     const dbSchema = this.getDatabaseSchema();
     if (constraintNames.length > 0) {
-      const {
-        rows: fkReferences,
-      } = await this.db.connection.raw(SQL_QUERIES.FOREIGN_KEY_REFERENCES, [
-        [constraintNames],
-        dbSchema,
-        tableName,
-      ]);
+      const { rows: fkReferences } = await this.db.connection.raw(
+        SQL_QUERIES.FOREIGN_KEY_REFERENCES,
+        [[constraintNames], dbSchema, tableName]
+      );
 
       for (const fkReference of fkReferences) {
         ret[fkReference.constraint_name].columns.push(fkReference.column_name);
 
-        const {
-          rows: fkReferencesConstraint,
-        } = await this.db.connection.raw(SQL_QUERIES.FOREIGN_KEY_REFERENCES_CONSTRAIN, [
-          [fkReference.constraint_name],
-          dbSchema,
-        ]);
+        const { rows: fkReferencesConstraint } = await this.db.connection.raw(
+          SQL_QUERIES.FOREIGN_KEY_REFERENCES_CONSTRAIN,
+          [[fkReference.constraint_name], dbSchema]
+        );
 
         for (const fkReferenceC of fkReferencesConstraint) {
-          const {
-            rows: fkReferencesConstraintReferece,
-          } = await this.db.connection.raw(SQL_QUERIES.FOREIGN_KEY_REFERENCES_CONSTRAIN_RFERENCE, [
-            fkReferenceC.unique_constraint_name,
-            dbSchema,
-          ]);
+          const { rows: fkReferencesConstraintReferece } = await this.db.connection.raw(
+            SQL_QUERIES.FOREIGN_KEY_REFERENCES_CONSTRAIN_RFERENCE,
+            [fkReferenceC.unique_constraint_name, dbSchema]
+          );
           for (const fkReferenceConst of fkReferencesConstraintReferece) {
             ret[fkReference.constraint_name].referencedTable = fkReferenceConst.foreign_table;
             ret[fkReference.constraint_name].referencedColumns.push(

package/lib/dialects/sqlite/index.js

@@ -61,7 +61,7 @@ class SqliteDialect extends Dialect {
   transformErrors(error) {
     switch (error.errno) {
       case 19: {
-        throw new errors.NotNullConstraint(); // TODO: extract column name
+        throw new errors.NotNullError(); // TODO: extract column name
       }
       default: {
         super.transformErrors(error);

package/lib/dialects/sqlite/schema-inspector.js

@@ -8,7 +8,7 @@ const SQL_QUERIES = {
   FOREIGN_KEY_LIST: 'pragma foreign_key_list(??)',
 };
 
-const toStrapiType = column => {
+const toStrapiType = (column) => {
   const { type } = column;
 
   const rootType = type.toLowerCase().match(/[^(), ]+/)[0];
@@ -84,13 +84,13 @@ class SqliteSchemaInspector {
   async getTables() {
     const rows = await this.db.connection.raw(SQL_QUERIES.TABLE_LIST);
 
-    return rows.map(row => row.name);
+    return rows.map((row) => row.name);
   }
 
   async getColumns(tableName) {
     const rows = await this.db.connection.raw(SQL_QUERIES.TABLE_INFO, [tableName]);
 
-    return rows.map(row => {
+    return rows.map((row) => {
       const { type, args = [], ...rest } = toStrapiType(row);
 
       return {
@@ -110,11 +110,11 @@ class SqliteSchemaInspector {
 
     const ret = [];
 
-    for (const index of indexes.filter(index => !index.name.startsWith('sqlite_'))) {
+    for (const index of indexes.filter((index) => !index.name.startsWith('sqlite_'))) {
       const res = await this.db.connection.raw(SQL_QUERIES.INDEX_INFO, [index.name]);
 
       ret.push({
-        columns: res.map(row => row.name),
+        columns: res.map((row) => row.name),
         name: index.name,
         type: index.unique ? 'unique' : null,
       });

package/lib/entity-manager.js

@@ -7,14 +7,14 @@ const { createQueryBuilder } = require('./query');
 const { createRepository } = require('./entity-repository');
 const { isBidirectional, isOneToAny } = require('./metadata/relations');
 
-const toId = value => value.id || value;
-const toIds = value => _.castArray(value || []).map(toId);
+const toId = (value) => value.id || value;
+const toIds = (value) => _.castArray(value || []).map(toId);
 
-const isValidId = value => _.isString(value) || _.isInteger(value);
-const toAssocs = data => {
+const isValidId = (value) => _.isString(value) || _.isInteger(value);
+const toAssocs = (data) => {
   return _.castArray(data)
-    .filter(datum => !_.isNil(datum))
-    .map(datum => {
+    .filter((datum) => !_.isNil(datum))
+    .map((datum) => {
       // if it is a string or an integer return an obj with id = to datum
       if (isValidId(datum)) {
         return { id: datum, __pivot: {} };
@@ -108,17 +108,14 @@ const processData = (metadata, data = {}, { withDefaults = false } = {}) => {
   return obj;
 };
 
-const createEntityManager = db => {
+const createEntityManager = (db) => {
   const repoMap = {};
 
   return {
     async findOne(uid, params) {
       const states = await db.lifecycles.run('beforeFindOne', uid, { params });
 
-      const result = await this.createQueryBuilder(uid)
-        .init(params)
-        .first()
-        .execute();
+      const result = await this.createQueryBuilder(uid).init(params).first().execute();
 
       await db.lifecycles.run('afterFindOne', uid, { params, result }, states);
 
@@ -129,9 +126,7 @@ const createEntityManager = db => {
     async findMany(uid, params) {
       const states = await db.lifecycles.run('beforeFindMany', uid, { params });
 
-      const result = await this.createQueryBuilder(uid)
-        .init(params)
-        .execute();
+      const result = await this.createQueryBuilder(uid).init(params).execute();
 
       await db.lifecycles.run('afterFindMany', uid, { params, result }, states);
 
@@ -166,9 +161,7 @@ const createEntityManager = db => {
 
       const dataToInsert = processData(metadata, data, { withDefaults: true });
 
-      const res = await this.createQueryBuilder(uid)
-        .insert(dataToInsert)
-        .execute();
+      const res = await this.createQueryBuilder(uid).insert(dataToInsert).execute();
 
       const id = res[0].id || res[0];
 
@@ -198,15 +191,15 @@ const createEntityManager = db => {
         throw new Error('CreateMany expects data to be an array');
       }
 
-      const dataToInsert = data.map(datum => processData(metadata, datum, { withDefaults: true }));
+      const dataToInsert = data.map((datum) =>
+        processData(metadata, datum, { withDefaults: true })
+      );
 
       if (_.isEmpty(dataToInsert)) {
         throw new Error('Nothing to insert');
       }
 
-      await this.createQueryBuilder(uid)
-        .insert(dataToInsert)
-        .execute();
+      await this.createQueryBuilder(uid).insert(dataToInsert).execute();
 
       const result = { count: data.length };
 
@@ -229,11 +222,7 @@ const createEntityManager = db => {
         throw new Error('Update requires a where parameter');
       }
 
-      const entity = await this.createQueryBuilder(uid)
-        .select('id')
-        .where(where)
-        .first()
-        .execute();
+      const entity = await this.createQueryBuilder(uid).select('id').where(where).first().execute();
 
       if (!entity) {
         return null;
@@ -244,10 +233,7 @@ const createEntityManager = db => {
       const dataToUpdate = processData(metadata, data);
 
       if (!_.isEmpty(dataToUpdate)) {
-        await this.createQueryBuilder(uid)
-          .where({ id })
-          .update(dataToUpdate)
-          .execute();
+        await this.createQueryBuilder(uid).where({ id }).update(dataToUpdate).execute();
       }
 
       await this.updateRelations(uid, id, data);
@@ -311,10 +297,7 @@ const createEntityManager = db => {
 
       const { id } = entity;
 
-      await this.createQueryBuilder(uid)
-        .where({ id })
-        .delete()
-        .execute();
+      await this.createQueryBuilder(uid).where({ id }).delete().execute();
 
       await this.deleteRelations(uid, id);
 
@@ -329,10 +312,7 @@ const createEntityManager = db => {
 
       const { where } = params;
 
-      const deletedRows = await this.createQueryBuilder(uid)
-        .where(where)
-        .delete()
-        .execute();
+      const deletedRows = await this.createQueryBuilder(uid).where(where).delete().execute();
 
       const result = { count: deletedRows };
 
@@ -397,9 +377,7 @@ const createEntityManager = db => {
               continue;
             }
 
-            await this.createQueryBuilder(joinTable.name)
-              .insert(rows)
-              .execute();
+            await this.createQueryBuilder(joinTable.name).insert(rows).execute();
           }
 
           continue;
@@ -412,7 +390,7 @@ const createEntityManager = db => {
 
           const { idColumn, typeColumn, typeField = '__type' } = morphColumn;
 
-          const rows = toAssocs(data[attributeName]).map(data => ({
+          const rows = toAssocs(data[attributeName]).map((data) => ({
             [joinColumn.name]: id,
             [idColumn.name]: data.id,
             [typeColumn.name]: data[typeField],
@@ -424,9 +402,7 @@ const createEntityManager = db => {
             continue;
           }
 
-          await this.createQueryBuilder(joinTable.name)
-            .insert(rows)
-            .execute();
+          await this.createQueryBuilder(joinTable.name).insert(rows).execute();
 
           continue;
         }
@@ -479,7 +455,7 @@ const createEntityManager = db => {
               .execute();
           }
 
-          const insert = toAssocs(data[attributeName]).map(data => {
+          const insert = toAssocs(data[attributeName]).map((data) => {
             return {
               [joinColumn.name]: id,
               [inverseJoinColumn.name]: data.id,
@@ -493,9 +469,7 @@ const createEntityManager = db => {
             continue;
           }
 
-          await this.createQueryBuilder(joinTable.name)
-            .insert(insert)
-            .execute();
+          await this.createQueryBuilder(joinTable.name).insert(insert).execute();
         }
       }
     },
@@ -570,9 +544,7 @@ const createEntityManager = db => {
               continue;
             }
 
-            await this.createQueryBuilder(joinTable.name)
-              .insert(rows)
-              .execute();
+            await this.createQueryBuilder(joinTable.name).insert(rows).execute();
           }
 
           continue;
@@ -597,7 +569,7 @@ const createEntityManager = db => {
             })
             .execute();
 
-          const rows = toAssocs(data[attributeName]).map(data => ({
+          const rows = toAssocs(data[attributeName]).map((data) => ({
             [joinColumn.name]: id,
             [idColumn.name]: data.id,
             [typeColumn.name]: data[typeField],
@@ -609,9 +581,7 @@ const createEntityManager = db => {
             continue;
           }
 
-          await this.createQueryBuilder(joinTable.name)
-            .insert(rows)
-            .execute();
+          await this.createQueryBuilder(joinTable.name).insert(rows).execute();
 
           continue;
         }
@@ -664,7 +634,7 @@ const createEntityManager = db => {
           }
 
           if (!_.isNull(data[attributeName])) {
-            const insert = toAssocs(data[attributeName]).map(data => {
+            const insert = toAssocs(data[attributeName]).map((data) => {
               return {
                 [joinColumn.name]: id,
                 [inverseJoinColumn.name]: data.id,
@@ -678,9 +648,7 @@ const createEntityManager = db => {
               continue;
             }
 
-            await this.createQueryBuilder(joinTable.name)
-              .insert(insert)
-              .execute();
+            await this.createQueryBuilder(joinTable.name).insert(insert).execute();
           }
         }
       }
@@ -817,7 +785,7 @@ const createEntityManager = db => {
         populate,
       });
 
-      return Object.assign({}, entity, entry);
+      return { ...entity, ...entry };
     },
 
     // TODO: support multiple relations at once with the populate syntax

package/lib/entity-repository.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const withDefaultPagination = params => {
+const withDefaultPagination = (params) => {
   const { page = 1, pageSize = 10, ...rest } = params;
 
   return {

package/lib/errors/database.js

@@ -0,0 +1,12 @@
+'use strict';
+
+class DatabaseError extends Error {
+  constructor(message, details = {}) {
+    super();
+    this.name = 'DatabaseError';
+    this.message = message || 'A database error occured';
+    this.details = details;
+  }
+}
+
+module.exports = DatabaseError;

package/lib/errors/index.js

@@ -0,0 +1,15 @@
+'use strict';
+
+const DatabaseError = require('./database');
+const NotNullError = require('./not-null');
+const InvalidTimeError = require('./invalid-time');
+const InvalidDateError = require('./invalid-date');
+const InvalidDateTimeError = require('./invalid-datetime');
+
+module.exports = {
+  DatabaseError,
+  NotNullError,
+  InvalidTimeError,
+  InvalidDateError,
+  InvalidDateTimeError,
+};

package/lib/errors/invalid-date.js

@@ -0,0 +1,14 @@
+'use strict';
+
+const DatabaseError = require('./database');
+
+class InvalidDateError extends DatabaseError {
+  constructor(message) {
+    super();
+    this.name = 'InvalidTimeFormat';
+    this.message = message || 'Invalid date format, expected YYYY-MM-DD';
+    this.details = {};
+  }
+}
+
+module.exports = InvalidDateError;

package/lib/errors/invalid-datetime.js

@@ -0,0 +1,14 @@
+'use strict';
+
+const DatabaseError = require('./database');
+
+class InvalidDateTimeError extends DatabaseError {
+  constructor(message) {
+    super();
+    this.name = 'InvalidTimeFormat';
+    this.message = message || 'Invalid datetime format, expected a timestamp or an ISO date';
+    this.details = {};
+  }
+}
+
+module.exports = InvalidDateTimeError;

package/lib/errors/invalid-time.js

@@ -0,0 +1,14 @@
+'use strict';
+
+const DatabaseError = require('./database');
+
+class InvalidTimeError extends DatabaseError {
+  constructor(message) {
+    super();
+    this.name = 'InvalidTimeFormat';
+    this.message = message || 'Invalid time format, expected HH:mm:ss.SSS';
+    this.details = {};
+  }
+}
+
+module.exports = InvalidTimeError;