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

Remove dbName as argument

Browse source
This commit is contained in:
TotallyGamerJet 2025-01-21 14:06:34 -05:00
parent e4ceb421de
commit 8975f87830
1 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
generator/postgres/postgres_generator.go
View file

@ -56,14 +56,11 @@ func GenerateDSN(dsn, schema, destDir string, templates ...template.Template) er
defer db.Close() defer db.Close()
fmt.Println("Retrieving schema information...") fmt.Println("Retrieving schema information...")
return GenerateDB(db, schema, cfg.Database, destDir, templates...) return GenerateDB(db, schema, filepath.Join(destDir, cfg.Database), templates...)
} }
// GenerateDB generates jet files using the provided *sql.DB // GenerateDB generates jet files using the provided *sql.DB
func GenerateDB(db *sql.DB, dbName, schema, destDir string, templates ...template.Template) error { func GenerateDB(db *sql.DB, schema, destDir string, templates ...template.Template) error {
if dbName == "" {
return fmt.Errorf("database name is required")
}
generatorTemplate := template.Default(postgres.Dialect) generatorTemplate := template.Default(postgres.Dialect)
if len(templates) > 0 { if len(templates) > 0 {
generatorTemplate = templates[0] generatorTemplate = templates[0]
@ -74,9 +71,7 @@ func GenerateDB(db *sql.DB, dbName, schema, destDir string, templates ...templat
return fmt.Errorf("failed to get '%s' schema metadata: %w", schema, err) return fmt.Errorf("failed to get '%s' schema metadata: %w", schema, err)
} }
dirPath := filepath.Join(destDir, dbName) err = template.ProcessSchema(destDir, schemaMetadata, generatorTemplate)
err = template.ProcessSchema(dirPath, schemaMetadata, generatorTemplate)
if err != nil { if err != nil {
return fmt.Errorf("failed to generate schema %s: %d", schemaMetadata.Name, err) return fmt.Errorf("failed to generate schema %s: %d", schemaMetadata.Name, err)
} }