Skip to content

Commit

Permalink
Remove dbName as argument
Browse files Browse the repository at this point in the history
  • Loading branch information
TotallyGamerJet committed Jan 21, 2025
1 parent e4ceb42 commit 8975f87
Showing 1 changed file with 3 additions and 8 deletions.
11 changes: 3 additions & 8 deletions generator/postgres/postgres_generator.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,11 @@ func GenerateDSN(dsn, schema, destDir string, templates ...template.Template) er
defer db.Close()

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
func GenerateDB(db *sql.DB, dbName, schema, destDir string, templates ...template.Template) error {
if dbName == "" {
return fmt.Errorf("database name is required")
}
func GenerateDB(db *sql.DB, schema, destDir string, templates ...template.Template) error {
generatorTemplate := template.Default(postgres.Dialect)
if len(templates) > 0 {
generatorTemplate = templates[0]
Expand All @@ -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)
}

dirPath := filepath.Join(destDir, dbName)

err = template.ProcessSchema(dirPath, schemaMetadata, generatorTemplate)
err = template.ProcessSchema(destDir, schemaMetadata, generatorTemplate)
if err != nil {
return fmt.Errorf("failed to generate schema %s: %d", schemaMetadata.Name, err)
}
Expand Down

0 comments on commit 8975f87

Please sign in to comment.