From 96fac81463541b02d1a1462d7034dcb7f1f0261c Mon Sep 17 00:00:00 2001
From: Ed Carl <edwardmcarl@gmail.com>
Date: Thu, 6 Jan 2022 00:31:29 -0500
Subject: [PATCH 1/2] Merge remote-tracking branch 'upstream/master'


From b2213ec037372e3c5b673c5c04728b1108fa9639 Mon Sep 17 00:00:00 2001
From: Ed Carl <edwardmcarl@gmail.com>
Date: Thu, 6 Jan 2022 00:36:42 -0500
Subject: [PATCH 2/2] Detect more default values as literals

---
 src/auto-generator.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/auto-generator.ts b/src/auto-generator.ts
index 9d3b4252..350eb053 100644
--- a/src/auto-generator.ts
+++ b/src/auto-generator.ts
@@ -366,7 +366,7 @@ export class AutoGenerator {
             val_text = "Sequelize.Sequelize.fn('" + defaultVal.replace(/\(\)$/g, "") + "')";
 
           } else if (this.isNumber(field_type)) {
-            if (defaultVal.match(/\(\)/g)) {
+            if (defaultVal.match(/\([\w ]*\)/g)) {
               // assume it's a server function if it contains parens
               val_text = "Sequelize.Sequelize.literal('" + defaultVal + "')";
             } else {
@@ -374,7 +374,7 @@ export class AutoGenerator {
               val_text = defaultVal;
             }
 
-          } else if (defaultVal.match(/\(\)/g)) {
+          } else if (defaultVal.match(/\([\w ]*\)/g)) {
             // embedded function, pass as literal
             val_text = "Sequelize.Sequelize.literal('" + defaultVal + "')";