fix(datasource-sql): improve management of literal values to avoid bu…

…gs when introspection is stringified (#720)
ForestAdmin · Jun 8, 2023 · 615dcda · 615dcda
1 parent 66a2a56
commit 615dcda
Show file tree

Hide file tree

Showing 6 changed files with 261 additions and 162 deletions.
diff --git a/packages/datasource-sql/src/introspection/helpers/default-value-parser.ts b/packages/datasource-sql/src/introspection/helpers/default-value-parser.ts
@@ -27,6 +27,11 @@ export default class DefaultValueParser {
     }
   }
 
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  isLiteral(expression: any, columnType: ColumnType): boolean {
+    return this.parse(expression, columnType)?.constructor.name === 'Literal';
+  }
+
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   private parseGeneric(expression: any, columnType: ColumnType): unknown {
     let sanitizedExpression = expression;

diff --git a/packages/datasource-sql/src/introspection/introspector.ts b/packages/datasource-sql/src/introspection/introspector.ts
@@ -77,7 +77,7 @@ export default class Introspector {
 
     try {
       const type = await typeConverter.convert(tableName, name, description);
-      const defaultValue = new DefaultValueParser(dialect).parse(description.defaultValue, type);
+      const parser = new DefaultValueParser(dialect);
 
       // Workaround autoincrement flag not being properly set when using postgres
       const autoIncrement = Boolean(
@@ -87,7 +87,10 @@ export default class Introspector {
       return {
         type,
         autoIncrement,
-        defaultValue: autoIncrement ? null : defaultValue,
+        defaultValue: autoIncrement ? null : parser.parse(description.defaultValue, type),
+        isLiteralDefaultValue: autoIncrement
+          ? false
+          : parser.isLiteral(description.defaultValue, type),
         name,
         allowNull: description.allowNull,
         primaryKey: description.primaryKey,

diff --git a/packages/datasource-sql/src/introspection/types.ts b/packages/datasource-sql/src/introspection/types.ts
@@ -42,6 +42,7 @@ export type Table = {
     name: string;
     type: ColumnType;
     defaultValue: unknown;
+    isLiteralDefaultValue: boolean;
     allowNull: boolean;
     autoIncrement: boolean;
     primaryKey: boolean;

diff --git a/packages/datasource-sql/src/orm-builder/model.ts b/packages/datasource-sql/src/orm-builder/model.ts
@@ -52,6 +52,11 @@ export default class ModelBuilder {
         !(hasTimestamps && (column.name === 'updatedAt' || column.name === 'createdAt')) &&
         !(isParanoid && column.name === 'deletedAt');
 
+      if (column.defaultValue && column.isLiteralDefaultValue) {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        column.defaultValue = Sequelize.literal((column.defaultValue as any).val);
+      }
+
       // Clone object, because sequelize modifies it.
       if (isExplicit)
         modelAttrs[column.name] = {