From ec67d6eb59a26d8754f12db11e87731b85ee43d0 Mon Sep 17 00:00:00 2001
From: amr <amrnabil5700@gmail.com>
Date: Mon, 21 Feb 2022 20:03:04 +0200
Subject: [PATCH] initial commit

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

diff --git a/src/auto-generator.ts b/src/auto-generator.ts
index 9d3b4252..dea19520 100644
--- a/src/auto-generator.ts
+++ b/src/auto-generator.ts
@@ -323,8 +323,7 @@ export class AutoGenerator {
         if (this.dialect.name === "mssql" && (["(NULL)", "NULL"].includes(defaultVal) || typeof defaultVal === "undefined")) {
           defaultVal = null as any; // Override default NULL in MS SQL to javascript null
         }
-
-        if (defaultVal === null || defaultVal === undefined) {
+        if ((defaultVal === null || defaultVal === undefined) && !fieldObj.primaryKey) {
           return true;
         }
         if (isSerialKey) {
@@ -396,6 +395,9 @@ export class AutoGenerator {
         // don't prepend N for MSSQL when building models...
         // defaultVal = _.trimStart(defaultVal, 'N');
 
+        if (fieldObj.primaryKey){
+          val_text = "DataTypes.UUIDV4";
+        }
         str += space[3] + attr + ": " + val_text;
 
       } else if (attr === "comment" && (!fieldObj[attr] || this.dialect.name === "mssql")) {
@@ -473,6 +475,9 @@ export class AutoGenerator {
   /** Get the sequelize type from the Field */
   private getSqType(fieldObj: Field, attr: string): string {
     const attrValue = (fieldObj as any)[attr];
+    if (fieldObj.primaryKey) {
+       return "DataTypes.UUID";
+    }
     if (!attrValue.toLowerCase) {
       console.log("attrValue", attr, attrValue);
       return attrValue;