Generator clean up refactoring.

generator/generator.go

@@ -2,28 +2,32 @@ package generator
 
 import (
 	"database/sql"
+	"fmt"
 	_ "github.com/lib/pq"
 	"github.com/sub0zero/go-sqlbuilder/generator/metadata"
+	"github.com/sub0zero/go-sqlbuilder/generator/postgres-metadata"
 	"path"
+	"path/filepath"
 )
 
-type DbConnectInfo struct {
-	host     string
-	port     int
-	user     string
-	password string
-	dbname   string
+type GeneratorData struct {
+	Host     string
+	Port     string
+	User     string
+	Password string
+	SslMode  string
+	Params   string
+
+	DbName     string
+	SchemaName string
 }
 
-func Generate(folderPath string, connectString string, databaseName, schemaName string) error {
+func Generate(destDir string, genData GeneratorData) error {
 
-	err := cleanUpGeneratedFiles(path.Join(folderPath, databaseName, schemaName))
+	connectionString := fmt.Sprintf("host=%s port=%s user=%s password=%s dbname=%s sslmode=%s %s",
+		genData.Host, genData.Port, genData.User, genData.Password, genData.DbName, genData.SslMode, genData.Params)
 
-	if err != nil {
-		return err
-	}
-
-	db, err := sql.Open("postgres", connectString)
+	db, err := sql.Open("postgres", connectionString)
 	if err != nil {
 		return err
 	}
@@ -35,25 +39,32 @@ func Generate(folderPath string, connectString string, databaseName, schemaName
 		return err
 	}
 
-	databaseInfo, err := metadata.GetDatabaseInfo(db, databaseName, schemaName)
+	err = cleanUpGeneratedFiles(path.Join(destDir, genData.DbName, genData.SchemaName))
 
 	if err != nil {
 		return err
 	}
 
-	err = generateSqlBuilderModel(databaseInfo, folderPath)
+	schemaInfo, err := postgres_metadata.GetSchemaInfo(db, genData.DbName, genData.SchemaName)
 
 	if err != nil {
 		return err
 	}
 
-	err = generateDataModel(databaseInfo, folderPath)
+	err = generate(schemaInfo, destDir, "table", sqlBuilderTableTemplate, schemaInfo.TableInfos)
 
 	if err != nil {
 		return err
 	}
 
-	err = generateEnumTypes(databaseInfo, folderPath)
+	//err = generateDataModel(schemaInfo, destDir)
+	err = generate(schemaInfo, destDir, "model", dataModelTemplate, schemaInfo.TableInfos)
+
+	if err != nil {
+		return err
+	}
+
+	err = generate(schemaInfo, destDir, "model", enumModelTemplate, schemaInfo.EnumInfos)
 
 	if err != nil {
 		return err
@@ -61,3 +72,35 @@ func Generate(folderPath string, connectString string, databaseName, schemaName
 
 	return nil
 }
+
+func generate(schemaInfo postgres_metadata.SchemaInfo, dirPath, packageName string, template string, metaDataList []metadata.MetaData) error {
+	modelDirPath := filepath.Join(dirPath, schemaInfo.DatabaseName, schemaInfo.Name, packageName)
+
+	err := ensureDirPath(modelDirPath)
+
+	if err != nil {
+		return err
+	}
+
+	autoGenWarning, err := generateTemplate(autoGenWarningTemplate, nil)
+
+	if err != nil {
+		return err
+	}
+
+	for _, metaData := range metaDataList {
+		text, err := generateTemplate(template, metaData)
+
+		if err != nil {
+			return err
+		}
+
+		err = saveGoFile(modelDirPath, metaData.Name(), append(autoGenWarning, text...))
+
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}