@strapi/database 4.3.4 → 4.3.7

package/lib/schema/builder.js

@@ -3,7 +3,7 @@
 const { isNil, prop, omit, castArray } = require('lodash/fp');
 const debug = require('debug')('strapi::database');
 
-module.exports = db => {
+module.exports = (db) => {
   const helpers = createHelpers(db);
 
   return {
@@ -20,7 +20,7 @@ module.exports = db => {
      * @param {Schema} schema - database schema
      */
     async createSchema(schema) {
-      await db.connection.transaction(async trx => {
+      await db.connection.transaction(async (trx) => {
         await this.createTables(schema.tables, trx);
       });
     },
@@ -56,7 +56,7 @@ module.exports = db => {
         return;
       }
 
-      await db.connection.transaction(async trx => {
+      await db.connection.transaction(async (trx) => {
         for (const table of schema.tables.reverse()) {
           const schemaBuilder = this.getSchemaBuilder(trx);
           await helpers.dropTable(schemaBuilder, table);
@@ -73,7 +73,7 @@ module.exports = db => {
       const { forceMigration } = db.config.settings;
 
       await db.dialect.startSchemaUpdate();
-      await db.connection.transaction(async trx => {
+      await db.connection.transaction(async (trx) => {
         await this.createTables(schemaDiff.tables.added, trx);
 
         if (forceMigration) {
@@ -107,7 +107,7 @@ module.exports = db => {
   };
 };
 
-const createHelpers = db => {
+const createHelpers = (db) => {
   /**
    *  Creates a foreign key on a table
    * @param {Knex.TableBuilder} tableBuilder
@@ -243,23 +243,25 @@ const createHelpers = db => {
    * @param {Table} table
    */
   const createTable = async (schemaBuilder, table) => {
-    await schemaBuilder.createTable(table.name, tableBuilder => {
+    await schemaBuilder.createTable(table.name, (tableBuilder) => {
       // columns
-      (table.columns || []).forEach(column => createColumn(tableBuilder, column));
+      (table.columns || []).forEach((column) => createColumn(tableBuilder, column));
 
       // indexes
-      (table.indexes || []).forEach(index => createIndex(tableBuilder, index));
+      (table.indexes || []).forEach((index) => createIndex(tableBuilder, index));
 
       // foreign keys
 
       if (!db.dialect.canAlterConstraints()) {
-        (table.foreignKeys || []).forEach(foreignKey => createForeignKey(tableBuilder, foreignKey));
+        (table.foreignKeys || []).forEach((foreignKey) =>
+          createForeignKey(tableBuilder, foreignKey)
+        );
       }
     });
   };
 
   const alterTable = async (schemaBuilder, table) => {
-    await schemaBuilder.alterTable(table.name, tableBuilder => {
+    await schemaBuilder.alterTable(table.name, (tableBuilder) => {
       // Delete indexes / fks / columns
 
       for (const removedIndex of table.indexes.removed) {
@@ -288,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) {
@@ -309,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) {
@@ -344,8 +355,8 @@ const createHelpers = db => {
    */
   const createTableForeignKeys = async (schemaBuilder, table) => {
     // foreign keys
-    await schemaBuilder.table(table.name, tableBuilder => {
-      (table.foreignKeys || []).forEach(foreignKey => createForeignKey(tableBuilder, foreignKey));
+    await schemaBuilder.table(table.name, (tableBuilder) => {
+      (table.foreignKeys || []).forEach((foreignKey) => createForeignKey(tableBuilder, foreignKey));
     });
   };
 
@@ -360,8 +371,8 @@ const createHelpers = db => {
     }
 
     // foreign keys
-    await schemaBuilder.table(table.name, tableBuilder => {
-      (table.foreignKeys || []).forEach(foreignKey => dropForeignKey(tableBuilder, foreignKey));
+    await schemaBuilder.table(table.name, (tableBuilder) => {
+      (table.foreignKeys || []).forEach((foreignKey) => dropForeignKey(tableBuilder, foreignKey));
     });
   };
 

package/lib/schema/diff.js

@@ -14,36 +14,36 @@ const statuses = {
 
 const helpers = {
   hasTable(schema, tableName) {
-    return schema.tables.findIndex(table => table.name === tableName) !== -1;
+    return schema.tables.findIndex((table) => table.name === tableName) !== -1;
   },
   findTable(schema, tableName) {
-    return schema.tables.find(table => table.name === tableName);
+    return schema.tables.find((table) => table.name === tableName);
   },
 
   hasColumn(table, columnName) {
-    return table.columns.findIndex(column => column.name === columnName) !== -1;
+    return table.columns.findIndex((column) => column.name === columnName) !== -1;
   },
   findColumn(table, columnName) {
-    return table.columns.find(column => column.name === columnName);
+    return table.columns.find((column) => column.name === columnName);
   },
 
   hasIndex(table, columnName) {
-    return table.indexes.findIndex(column => column.name === columnName) !== -1;
+    return table.indexes.findIndex((column) => column.name === columnName) !== -1;
   },
   findIndex(table, columnName) {
-    return table.indexes.find(column => column.name === columnName);
+    return table.indexes.find((column) => column.name === columnName);
   },
 
   hasForeignKey(table, columnName) {
-    return table.foreignKeys.findIndex(column => column.name === columnName) !== -1;
+    return table.foreignKeys.findIndex((column) => column.name === columnName) !== -1;
   },
   findForeignKey(table, columnName) {
-    return table.foreignKeys.find(column => column.name === columnName);
+    return table.foreignKeys.find((column) => column.name === columnName);
   },
 };
 
-module.exports = db => {
-  const hasChangedStatus = diff => diff.status === statuses.CHANGED;
+module.exports = (db) => {
+  const hasChangedStatus = (diff) => diff.status === statuses.CHANGED;
 
   /**
    * Compares two indexes info
@@ -117,7 +117,7 @@ module.exports = db => {
 
   const diffDefault = (oldColumn, column) => {
     const oldDefaultTo = oldColumn.defaultTo;
-    const defaultTo = column.defaultTo;
+    const { defaultTo } = column;
 
     if (oldDefaultTo === null || _.toLower(oldDefaultTo) === 'null') {
       return _.isNil(defaultTo) || _.toLower(defaultTo) === 'null';
@@ -197,7 +197,7 @@ module.exports = db => {
       }
     }
 
-    const hasChanged = [addedColumns, updatedColumns, removedColumns].some(arr => arr.length > 0);
+    const hasChanged = [addedColumns, updatedColumns, removedColumns].some((arr) => arr.length > 0);
 
     return {
       status: hasChanged ? statuses.CHANGED : statuses.UNCHANGED,
@@ -237,7 +237,7 @@ module.exports = db => {
       }
     }
 
-    const hasChanged = [addedIndexes, updatedIndexes, removedIndexes].some(arr => arr.length > 0);
+    const hasChanged = [addedIndexes, updatedIndexes, removedIndexes].some((arr) => arr.length > 0);
 
     return {
       status: hasChanged ? statuses.CHANGED : statuses.UNCHANGED,
@@ -290,7 +290,7 @@ module.exports = db => {
     }
 
     const hasChanged = [addedForeignKeys, updatedForeignKeys, removedForeignKeys].some(
-      arr => arr.length > 0
+      (arr) => arr.length > 0
     );
 
     return {
@@ -353,7 +353,7 @@ module.exports = db => {
       }
     }
 
-    const hasChanged = [addedTables, updatedTables, removedTables].some(arr => arr.length > 0);
+    const hasChanged = [addedTables, updatedTables, removedTables].some((arr) => arr.length > 0);
 
     return {
       status: hasChanged ? statuses.CHANGED : statuses.UNCHANGED,

package/lib/schema/index.js

@@ -10,7 +10,7 @@ const { metadataToSchema } = require('./schema');
 /**
  * @type {import('.').default}
  */
-const createSchemaProvider = db => {
+const createSchemaProvider = (db) => {
   const schema = metadataToSchema(db.metadata);
 
   return {
@@ -87,7 +87,6 @@ const createSchemaProvider = db => {
       }
 
       debug('Schema unchanged');
-      return;
     },
   };
 };

package/lib/schema/schema.js

@@ -17,7 +17,7 @@ const createColumn = (name, attribute) => {
   };
 };
 
-const createTable = meta => {
+const createTable = (meta) => {
   const table = {
     name: meta.tableName,
     indexes: meta.indexes || [],
@@ -96,7 +96,7 @@ const createTable = meta => {
   return table;
 };
 
-const getColumnType = attribute => {
+const getColumnType = (attribute) => {
   if (attribute.columnType) {
     return attribute.columnType;
   }
@@ -182,7 +182,7 @@ const getColumnType = attribute => {
   }
 };
 
-const metadataToSchema = metadata => {
+const metadataToSchema = (metadata) => {
   const schema = {
     tables: [],
     addTable(table) {
@@ -191,7 +191,7 @@ const metadataToSchema = metadata => {
     },
   };
 
-  metadata.forEach(metadata => {
+  metadata.forEach((metadata) => {
     schema.addTable(createTable(metadata));
   });
 

package/lib/schema/storage.js

@@ -4,11 +4,11 @@ const crypto = require('crypto');
 
 const TABLE_NAME = 'strapi_database_schema';
 
-module.exports = db => {
+module.exports = (db) => {
   const hasSchemaTable = () => db.getSchemaConnection().hasTable(TABLE_NAME);
 
   const createSchemaTable = () => {
-    return db.getSchemaConnection().createTable(TABLE_NAME, t => {
+    return db.getSchemaConnection().createTable(TABLE_NAME, (t) => {
       t.increments('id');
       t.json('schema');
       t.datetime('time', { useTz: false });
@@ -46,10 +46,7 @@ module.exports = db => {
     },
 
     hashSchema(schema) {
-      return crypto
-        .createHash('md5')
-        .update(JSON.stringify(schema))
-        .digest('hex');
+      return crypto.createHash('md5').update(JSON.stringify(schema)).digest('hex');
     },
 
     async add(schema) {

package/lib/types/index.js

@@ -25,10 +25,10 @@ const STRING_TYPES = ['string', 'text', 'uid', 'email', 'enumeration', 'richtext
 const NUMBER_TYPES = ['biginteger', 'integer', 'decimal', 'float'];
 
 module.exports = {
-  isString: type => STRING_TYPES.includes(type),
-  isNumber: type => NUMBER_TYPES.includes(type),
-  isScalar: type => SCALAR_TYPES.includes(type),
-  isComponent: type => type === 'component',
-  isDynamicZone: type => type === 'dynamiczone',
-  isRelation: type => type === 'relation',
+  isString: (type) => STRING_TYPES.includes(type),
+  isNumber: (type) => NUMBER_TYPES.includes(type),
+  isScalar: (type) => SCALAR_TYPES.includes(type),
+  isComponent: (type) => type === 'component',
+  isDynamicZone: (type) => type === 'dynamiczone',
+  isRelation: (type) => type === 'relation',
 };

package/lib/utils/content-types.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const transformAttribute = attribute => {
+const transformAttribute = (attribute) => {
   switch (attribute.type) {
     case 'media': {
       return {
@@ -17,8 +17,8 @@ const transformAttribute = attribute => {
 };
 
 // TODO: model logic outside DB
-const transformContentTypes = contentTypes => {
-  return contentTypes.map(contentType => {
+const transformContentTypes = (contentTypes) => {
+  return contentTypes.map((contentType) => {
     const model = {
       ...contentType,
       // reuse new model def

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/database",
-  "version": "4.3.4",
+  "version": "4.3.7",
   "description": "Strapi's database layer",
   "homepage": "https://strapi.io",
   "bugs": {
@@ -31,7 +31,7 @@
     "test:unit": "jest --verbose"
   },
   "dependencies": {
-    "date-fns": "2.28.0",
+    "date-fns": "2.29.2",
     "debug": "4.3.1",
     "fs-extra": "10.0.0",
     "knex": "1.0.7",
@@ -42,5 +42,5 @@
     "node": ">=14.19.1 <=16.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "28a2a00db8234ffcf644661c4c8092aa82f8c119"
+  "gitHead": "73f523b98322cea8992c72977b94a73a624d2e79"
 }

package/lib/errors.js

@@ -1,56 +0,0 @@
-'use strict';
-
-/* DatabaseError */
-class DatabaseError extends Error {
-  constructor(message, details = {}) {
-    super();
-    this.name = 'DatabaseError';
-    this.message = message || 'A database error occured';
-    this.details = details;
-  }
-}
-
-class NotNullConstraint extends DatabaseError {
-  constructor({ column = '' } = {}) {
-    super();
-    this.name = 'NotNullConstraint';
-    this.message = `Not null constraint violation${column ? ` on column ${column}` : ''}.`;
-    this.details = { column };
-    this.stack = '';
-  }
-}
-
-class InvalidTimeError extends DatabaseError {
-  constructor(message) {
-    super();
-    this.name = 'InvalidTimeFormat';
-    this.message = message || 'Invalid time format, expected HH:mm:ss.SSS';
-    this.details = {};
-  }
-}
-
-class InvalidDateError extends DatabaseError {
-  constructor(message) {
-    super();
-    this.name = 'InvalidTimeFormat';
-    this.message = message || 'Invalid date format, expected YYYY-MM-DD';
-    this.details = {};
-  }
-}
-
-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 = {
-  DatabaseError,
-  NotNullConstraint,
-  InvalidTimeError,
-  InvalidDateError,
-  InvalidDateTimeError,
-};

package/lib/fields.js

@@ -1,231 +0,0 @@
-'use strict';
-
-const _ = require('lodash/fp');
-const dateFns = require('date-fns');
-const { InvalidTimeError, InvalidDateError, InvalidDateTimeError } = require('./errors');
-
-class Field {
-  constructor(config) {
-    this.config = config;
-  }
-
-  toDB(value) {
-    return value;
-  }
-
-  fromDB(value) {
-    return value;
-  }
-}
-
-class StringField extends Field {
-  toDB(value) {
-    return _.toString(value);
-  }
-
-  fromDB(value) {
-    return _.toString(value);
-  }
-}
-
-class JSONField extends Field {
-  toDB(value) {
-    return JSON.stringify(value);
-  }
-
-  fromDB(value) {
-    if (typeof value === 'string') return JSON.parse(value);
-    return value;
-  }
-}
-
-class BooleanField extends Field {
-  toDB(value) {
-    if (typeof value === 'boolean') return value;
-
-    if (['true', 't', '1', 1].includes(value)) {
-      return true;
-    }
-
-    if (['false', 'f', '0', 0].includes(value)) {
-      return false;
-    }
-
-    return Boolean(value);
-  }
-
-  fromDB(value) {
-    if (typeof value === 'boolean') {
-      return value;
-    }
-
-    const strVal = _.toString(value);
-
-    if (strVal === '1') {
-      return true;
-    } else if (strVal === '0') {
-      return false;
-    } else {
-      return null;
-    }
-  }
-}
-
-class NumberField extends Field {
-  toDB(value) {
-    const numberValue = _.toNumber(value);
-
-    if (Number.isNaN(numberValue)) {
-      throw new Error(`Expected a valid Number, got ${value}`);
-    }
-
-    return numberValue;
-  }
-
-  fromDB(value) {
-    return _.toNumber(value);
-  }
-}
-
-class BigIntegerField extends NumberField {
-  toDB(value) {
-    return _.toString(value);
-  }
-
-  fromDB(value) {
-    return _.toString(value);
-  }
-}
-
-const timeRegex = new RegExp('^(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(.[0-9]{1,3})?$');
-const dateRegex = /^\d{4}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$/;
-const partialDateRegex = /^\d{4}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])/g;
-
-const parseTime = value => {
-  if (dateFns.isDate(value)) return dateFns.format(value, 'HH:mm:ss.SSS');
-
-  if (typeof value !== 'string') {
-    throw new InvalidTimeError(`Expected a string, got a ${typeof value}`);
-  }
-  const result = value.match(timeRegex);
-
-  if (result === null) {
-    throw new InvalidTimeError('Invalid time format, expected HH:mm:ss.SSS');
-  }
-
-  const [, hours, minutes, seconds, fraction = '.000'] = result;
-  const fractionPart = _.padCharsEnd('0', 3, fraction.slice(1));
-
-  return `${hours}:${minutes}:${seconds}.${fractionPart}`;
-};
-
-const parseDate = value => {
-  const found = _.isString(value) ? value.match(partialDateRegex) || [] : [];
-  const extractedValue = found[0];
-
-  if (extractedValue && !dateRegex.test(value)) {
-    // TODO V5: throw an error when format yyyy-MM-dd is not respected
-    // throw new InvalidDateError(`Invalid format, expected yyyy-MM-dd`);
-    process.emitWarning(
-      `[deprecated] Using a date format other than YYYY-MM-DD will be removed in future versions. Date received: ${value}. Date stored: ${extractedValue}.`
-    );
-  }
-
-  let date = dateFns.parseISO(extractedValue);
-  if (!dateFns.isValid(date)) {
-    throw new InvalidDateError(`Invalid date`);
-  }
-
-  return extractedValue;
-};
-
-const parseDateTimeOrTimestamp = value => {
-  if (dateFns.isDate(value)) return value;
-  try {
-    const date = dateFns.parseISO(value);
-    if (dateFns.isValid(date)) return date;
-
-    const milliUnixDate = dateFns.parse(value, 'T', new Date());
-    if (dateFns.isValid(milliUnixDate)) return milliUnixDate;
-
-    throw new InvalidDateTimeError(`Invalid format, expected a timestamp or an ISO date`);
-  } catch (error) {
-    throw new InvalidDateTimeError(`Invalid format, expected a timestamp or an ISO date`);
-  }
-};
-
-class DateField extends Field {
-  toDB(value) {
-    return parseDate(value);
-  }
-
-  fromDB(value) {
-    return value;
-  }
-}
-class DatetimeField extends Field {
-  toDB(value) {
-    return parseDateTimeOrTimestamp(value);
-  }
-
-  fromDB(value) {
-    const cast = new Date(value);
-    return dateFns.isValid(cast) ? cast.toISOString() : null;
-  }
-}
-
-class TimeField extends Field {
-  toDB(value) {
-    return parseTime(value);
-  }
-
-  fromDB(value) {
-    // make sure that's a string with valid format ?
-    return value;
-  }
-}
-class TimestampField extends Field {
-  toDB(value) {
-    return parseDateTimeOrTimestamp(value);
-  }
-
-  fromDB(value) {
-    const cast = new Date(value);
-    return dateFns.isValid(cast) ? dateFns.format(cast, 'T') : null;
-  }
-}
-
-const typeToFieldMap = {
-  increments: Field,
-  password: StringField,
-  email: StringField,
-  string: StringField,
-  uid: StringField,
-  richtext: StringField,
-  text: StringField,
-  enumeration: StringField,
-  json: JSONField,
-  biginteger: BigIntegerField,
-  integer: NumberField,
-  float: NumberField,
-  decimal: NumberField,
-  date: DateField,
-  time: TimeField,
-  datetime: DatetimeField,
-  timestamp: TimestampField,
-  boolean: BooleanField,
-};
-
-const createField = attribute => {
-  const { type } = attribute;
-
-  if (_.has(type, typeToFieldMap)) {
-    return new typeToFieldMap[type]({});
-  }
-
-  throw new Error(`Undefined field for type ${type}`);
-};
-
-module.exports = {
-  createField,
-};