Gleipnir/jet
4
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Generator cleanup.

Browse source
This commit is contained in:
go-jet 2019-06-23 18:55:57 +02:00
parent ee5d526d26
commit a44bd85d32
22 changed files with 97 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

0
generator/metadata/meta_data.go → generator/internal/metadata/meta_data.go
View file

0
generator/postgres-metadata/column_info.go → generator/internal/metadata/postgres-metadata/column_info.go
View file

5
generator/postgres-metadata/enum_info.go → generator/internal/metadata/postgres-metadata/enum_info.go
View file

@ -2,8 +2,7 @@ package postgres_metadata
import (
"database/sql"
"fmt"
"github.com/go-jet/jet/generator/metadata"
"github.com/go-jet/jet/generator/internal/metadata"
)
type EnumInfo struct {
@ -63,7 +62,5 @@ ORDER BY n.nspname, t.typname, e.enumsortorder;`
})
}
fmt.Println("FOUND", len(ret), " enums")
return ret, nil
}

5
generator/postgres-metadata/schema_info.go → generator/internal/metadata/postgres-metadata/schema_info.go
View file

@ -2,8 +2,7 @@ package postgres_metadata
import (
"database/sql"
"fmt"
"github.com/go-jet/jet/generator/metadata"
"github.com/go-jet/jet/generator/internal/metadata"
)
type SchemaInfo struct {
@ -65,8 +64,6 @@ where table_catalog = $1 and table_schema = $2 and table_type = 'BASE TABLE';
ret = append(ret, tableInfo)
}
fmt.Println("FOUND", len(ret), "tables")
err = rows.Err()
if err != nil {

0
generator/postgres-metadata/table_info.go → generator/internal/metadata/postgres-metadata/table_info.go
View file

14
generator/utils.go → generator/internal/utils/utils.go
View file

@ -1,4 +1,4 @@
package generator
package utils
import (
"bytes"
@ -11,7 +11,7 @@ import (
"time"
)
func saveGoFile(dirPath, fileName string, text []byte) error {
func SaveGoFile(dirPath, fileName string, text []byte) error {
newGoFilePath := filepath.Join(dirPath, fileName) + ".go"
file, err := os.Create(newGoFilePath)
@ -36,7 +36,7 @@ func saveGoFile(dirPath, fileName string, text []byte) error {
return nil
}
func ensureDirPath(dirPath string) error {
func EnsureDirPath(dirPath string) error {
if _, err := os.Stat(dirPath); os.IsNotExist(err) {
err := os.MkdirAll(dirPath, os.ModePerm)
@ -48,7 +48,7 @@ func ensureDirPath(dirPath string) error {
return nil
}
func generateTemplate(templateText string, templateData interface{}) ([]byte, error) {
func GenerateTemplate(templateText string, templateData interface{}) ([]byte, error) {
t, err := template.New("sqlBuilderTableTemplate").Funcs(template.FuncMap{
"camelize": func(txt string) string {
@ -71,8 +71,8 @@ func generateTemplate(templateText string, templateData interface{}) ([]byte, er
return buf.Bytes(), nil
}
func cleanUpGeneratedFiles(dir string) error {
exist, err := dirExists(dir)
func CleanUpGeneratedFiles(dir string) error {
exist, err := DirExists(dir)
if err != nil {
return err
@ -89,7 +89,7 @@ func cleanUpGeneratedFiles(dir string) error {
return nil
}
func dirExists(path string) (bool, error) {
func DirExists(path string) (bool, error) {
_, err := os.Stat(path)
if err == nil {
return true, nil

62
generator/generator.go → generator/postgresgen/generator.go
View file

@ -1,16 +1,17 @@
package generator
package postgresgen
import (
"database/sql"
"fmt"
"github.com/go-jet/jet/generator/metadata"
"github.com/go-jet/jet/generator/postgres-metadata"
"github.com/go-jet/jet/generator/internal/metadata"
"github.com/go-jet/jet/generator/internal/metadata/postgres-metadata"
"github.com/go-jet/jet/generator/internal/utils"
_ "github.com/lib/pq"
"path"
"path/filepath"
)
type GeneratorData struct {
type DBConnection struct {
Host string
Port string
User string
@ -22,11 +23,13 @@ type GeneratorData struct {
SchemaName string
}
func Generate(destDir string, genData GeneratorData) error {
func Generate(destDir string, genData DBConnection) error {
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)
fmt.Println("Connecting to postgres database: " + connectionString)
db, err := sql.Open("postgres", connectionString)
if err != nil {
return err
@ -39,42 +42,53 @@ func Generate(destDir string, genData GeneratorData) error {
return err
}
err = cleanUpGeneratedFiles(path.Join(destDir, genData.DBName, genData.SchemaName))
if err != nil {
return err
}
fmt.Println("Retrieving schema information...")
schemaInfo, err := postgres_metadata.GetSchemaInfo(db, genData.DBName, genData.SchemaName)
if err != nil {
return err
}
fmt.Println(" FOUND", len(schemaInfo.TableInfos), " table(s), ", len(schemaInfo.EnumInfos), " enum(s)")
fmt.Println("Cleaning up destination directory...")
err = utils.CleanUpGeneratedFiles(path.Join(destDir, genData.DBName, genData.SchemaName))
if err != nil {
return err
}
fmt.Println("Generating table sql builder files...")
err = generate(schemaInfo, destDir, "table", sqlBuilderTableTemplate, schemaInfo.TableInfos)
if err != nil {
return err
}
//err = generateDataModel(schemaInfo, destDir)
fmt.Println("Generating table model files...")
err = generate(schemaInfo, destDir, "model", dataModelTemplate, schemaInfo.TableInfos)
if err != nil {
return err
}
err = generate(schemaInfo, destDir, "model", enumModelTemplate, schemaInfo.EnumInfos)
if len(schemaInfo.EnumInfos) > 0 {
fmt.Println("Generating enum sql builder files...")
err = generate(schemaInfo, destDir, "enum", enumTypeTemplate, schemaInfo.EnumInfos)
if err != nil {
return err
if err != nil {
return err
}
fmt.Println("Generating enum model files...")
err = generate(schemaInfo, destDir, "model", enumModelTemplate, schemaInfo.EnumInfos)
if err != nil {
return err
}
}
err = generate(schemaInfo, destDir, "enum", enumTypeTemplate, schemaInfo.EnumInfos)
if err != nil {
return err
}
fmt.Println("Done")
return nil
}
@ -82,26 +96,26 @@ func Generate(destDir string, genData GeneratorData) error {
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)
err := utils.EnsureDirPath(modelDirPath)
if err != nil {
return err
}
autoGenWarning, err := generateTemplate(autoGenWarningTemplate, nil)
autoGenWarning, err := utils.GenerateTemplate(autoGenWarningTemplate, nil)
if err != nil {
return err
}
for _, metaData := range metaDataList {
text, err := generateTemplate(template, metaData)
text, err := utils.GenerateTemplate(template, metaData)
if err != nil {
return err
}
err = saveGoFile(modelDirPath, metaData.Name(), append(autoGenWarning, text...))
err = utils.SaveGoFile(modelDirPath, metaData.Name(), append(autoGenWarning, text...))
if err != nil {
return err

2
generator/templates.go → generator/postgresgen/templates.go
View file

@ -1,4 +1,4 @@
package generator
package postgresgen
var autoGenWarningTemplate = `
//