improvements on er generator

Author: lastlink

samples/mermaid.py

@@ -1,16 +1,49 @@
 from schemacrawler.schema import TableRelationshipType # pylint: disable=import-error
 import re
+from datetime import date
 
+today = date.today()
+
+print('# Mermaid erDiagram')
+print ('* generated using schemacrawler on:' + str(today))
+print ('* using Little-Mermaid-2-TheSQL formatting')
+# TODO include package version
+print('')
+print('```mermaid')
 print('erDiagram')
 print('')
 for table in catalog.tables:
   print('  ' + table.fullName + ' {')
   for column in table.columns:
-    print('    ' + re.sub(r'\([\d ,]+\)', '', column.columnDataType.name) + ' ' + column.name)
+    # // need to remove quotes and spaces
+    # get all column attributes for debugging
+    # print (dir(column))
+    columnShortName = re.sub("[\"\']", "", column.name).replace(" ","")
+    columnFullName = ""
+    if(columnShortName != column.name):
+      columnFullName = "'" + column.name + "'"
+    # values cared about: 
+      # isNullable
+      # autoIncremented
+      # isPartOfIndex
+      # isPartOfUniqueIndex
+    keyType = " PK" if column.partOfPrimaryKey else ""
+    if(keyType != "" and column.partOfForeignKey ):
+       keyType = " FK"
+    # dont need to define FK can get through relationships
+    # keyType += (""  if keyType == "" else ",") + "FK" if column.partOfForeignKey else ""
+    extraAttributes = ""
+    if(columnFullName != ""):
+      extraAttributes += columnFullName
+    
+    if(extraAttributes != ""):
+      extraAttributes = " \"" + extraAttributes + "\""
+    print('    ' + re.sub("[,]", "_",re.sub(r'[()]', '', column.columnDataType.name)) + ' ' + columnShortName + keyType +  extraAttributes)
   print('  }')
   print('')
 
 for table in catalog.tables:  
   for childTable in table.getRelatedTables(TableRelationshipType.child):
     print('  ' + table.name + ' ||--o{ ' + childTable.name + ' : "foreign key"')
-  print('')
+  print('')
+print('```')

src/Library.ts

@@ -24,6 +24,7 @@ import { MermaidConfig } from "../deps/mermaid/src/config.type";
 import { log } from "../deps/mermaid/src/logger";
 import erDb from "./mermaid/src/diagrams/er/erDb";
 import { DiagramDefinition } from "./types";
+import { DbParser } from "./generate-sql-ddl";
 // import { getDiagram } from '../deps/mermaid/src/diagram-api/diagramAPI';
 const diagrams: Record<string, DiagramDefinition> = {};
 
@@ -205,8 +206,9 @@ export const GenerateSqlFromMermaid = async function (
                 var r:boolean = diag.parser.parse(md);
                 var entities = diag.db.getEntities();
                 var relationships = diag.db.getRelationships();
-                // TODO: model interfaces
+                // model interfaces
                 // TODO: models to sql
+                const ddlSyntax = new DbParser(databaseType, diag.db).getSQLDataDefinition();
                 // var r2 = diag.parser.parser.parse(md);
                 // console.log(JSON.stringify(r));
                 var test5 = 1 + 1;