@strapi/database 4.0.4 → 4.0.8

package/lib/dialects/mysql/index.js

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

package/lib/dialects/postgresql/index.js

@@ -16,6 +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(1700, 'text', parseFloat);
   }
 

package/lib/fields.js

@@ -98,6 +98,8 @@ class BigIntegerField extends NumberField {
 }
 
 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');
@@ -118,16 +120,23 @@ const parseTime = value => {
 };
 
 const parseDate = value => {
-  if (dateFns.isDate(value)) return dateFns.format(value, 'yyyy-MM-dd');
-  try {
-    let date = dateFns.parseISO(value);
+  const found = _.isString(value) ? value.match(partialDateRegex) || [] : [];
+  const extractedValue = found[0];
 
-    if (dateFns.isValid(date)) return dateFns.format(date, 'yyyy-MM-dd');
+  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}.`
+    );
+  }
 
-    throw new InvalidDateError(`Invalid format, expected an ISO compatible date`);
-  } catch (error) {
-    throw new InvalidDateError(`Invalid format, expected an ISO compatible date`);
+  let date = dateFns.parseISO(extractedValue);
+  if (!dateFns.isValid(date)) {
+    throw new InvalidDateError(`Invalid date`);
   }
+
+  return extractedValue;
 };
 
 const parseDateTimeOrTimestamp = value => {
@@ -151,8 +160,7 @@ class DateField extends Field {
   }
 
   fromDB(value) {
-    const cast = new Date(value);
-    return dateFns.isValid(cast) ? dateFns.formatISO(cast, { representation: 'date' }) : null;
+    return value;
   }
 }
 class DatetimeField extends Field {

package/lib/query/helpers/where.js

@@ -249,12 +249,16 @@ const applyOperator = (qb, column, operator, value) => {
     case '$null': {
       if (value) {
         qb.whereNull(column);
+      } else {
+        qb.whereNotNull(column);
       }
       break;
     }
     case '$notNull': {
       if (value) {
         qb.whereNotNull(column);
+      } else {
+        qb.whereNull(column);
       }
       break;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/database",
-  "version": "4.0.4",
+  "version": "4.0.8",
   "description": "Strapi's database layer",
   "homepage": "https://strapi.io",
   "bugs": {
@@ -42,5 +42,5 @@
     "node": ">=12.22.0 <=16.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "d81919ac2272948b3f5d3b25a4cf8cc7b6994460"
+  "gitHead": "669bb2f0440d3b21a23c8d665fdba98bd3d8cc71"
 }