Merge pull request #24 from kefniark/chore/improve-preparser

Improve Preparser

Author: kefniark

cmd/mangosql/actions/codegen/codegen.go

@@ -64,6 +64,7 @@ func generate(opts generateOptions) error {
 	// parse schema
 	schema, err := internal.ParseSchema(sql)
 	if err != nil {
+		fmt.Printf("schema parsing error: %+v\n", err)
 		return err
 	}
 

cmd/mangosql/actions/diagram/diagram.go

@@ -103,6 +103,7 @@ func diagram(opts diagramOptions) error {
 	// parse schema
 	schema, err := internal.ParseSchema(sql)
 	if err != nil {
+		fmt.Printf("schema parsing error: %+v\n", err)
 		return err
 	}
 
@@ -275,6 +276,11 @@ func renderColumn(t *core.SQLTable, columns map[string]*core.SQLColumn, writer *
 			if err != nil {
 				continue
 			}
+		} else {
+			_, err := writer.WriteString(fmt.Sprintf("	%s: %s\n", c.Name, ""))
+			if err != nil {
+				continue
+			}
 		}
 	}
 }

internal/parser.go

@@ -105,6 +105,10 @@ func ParseSchema(sql string) (*core.SQLSchema, error) {
 	for _, table := range schema.Tables {
 		for _, ref := range table.References {
 			refTable := schema.Tables[ref.Table]
+			if refTable == nil {
+				fmt.Println("Cannot find foreignKey", ref)
+				continue
+			}
 
 			refTable.Referenced = append(refTable.Referenced, &core.SQLTableReference{
 				Name:         ref.Name,