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

Reuse generator logic between two generator functions.

Browse source
This commit is contained in:
go-jet 2021-10-04 10:46:46 +02:00
parent f30662e0b8
commit 8adfe45e38
1 changed files with 20 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

45
generator/postgres/postgres_generator.go
View file

@ -30,19 +30,19 @@ type DBConnection struct {
// Generate generates jet files at destination dir from database connection details
func Generate(destDir string, dbConn DBConnection, genTemplate ...template.Template) (err error) {
defer utils.ErrorCatch(&err)
dsn := fmt.Sprintf("postgresql://%s:%s@%s:%s/%s?sslmode=%s",
url.QueryEscape(dbConn.User),
url.QueryEscape(dbConn.Password),
dbConn.Host,
strconv.Itoa(dbConn.Port),
url.QueryEscape(dbConn.DBName),
dbConn.SslMode,
)
connectionString := fmt.Sprintf("postgresql://%s:%s@%s:%s/%s?sslmode=%s&search_path=%s",
dbConn.User, url.QueryEscape(dbConn.Password), dbConn.Host, strconv.Itoa(dbConn.Port), dbConn.DBName, dbConn.SslMode, dbConn.SchemaName)
db := openConnection(connectionString)
defer utils.DBClose(db)
generate(db, dbConn.DBName, dbConn.SchemaName, destDir, genTemplate...)
return
return GenerateDSN(dsn, dbConn.SchemaName, destDir, genTemplate...)
}
// GenerateDSN generates jet files using dsn connection string
func GenerateDSN(dsn, schema, destDir string, templates ...template.Template) (err error) {
defer utils.ErrorCatch(&err)
@ -54,8 +54,17 @@ func GenerateDSN(dsn, schema, destDir string, templates ...template.Template) (e
db := openConnection(dsn)
defer utils.DBClose(db)
generate(db, cfg.Database, schema, destDir, templates...)
fmt.Println("Retrieving schema information...")
generatorTemplate := template.Default(postgres.Dialect)
if len(templates) > 0 {
generatorTemplate = templates[0]
}
schemaMetadata := metadata.GetSchema(db, &postgresQuerySet{}, schema)
dirPath := path.Join(destDir, cfg.Database)
template.ProcessSchema(dirPath, schemaMetadata, generatorTemplate)
return
}
@ -70,17 +79,3 @@ func openConnection(dsn string) *sql.DB {
return db
}
func generate(db *sql.DB, dbName, schema, destDir string, templates ...template.Template) {
fmt.Println("Retrieving schema information...")
generatorTemplate := template.Default(postgres.Dialect)
if len(templates) > 0 {
generatorTemplate = templates[0]
}
schemaMetadata := metadata.GetSchema(db, &postgresQuerySet{}, schema)
dirPath := path.Join(destDir, dbName)
template.ProcessSchema(dirPath, schemaMetadata, generatorTemplate)
}