From 8975f87830d5219579d5adb82f283143e04a808a Mon Sep 17 00:00:00 2001 From: TotallyGamerJet Date: Tue, 21 Jan 2025 14:06:34 -0500 Subject: [PATCH] Remove dbName as argument --- generator/postgres/postgres_generator.go | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/generator/postgres/postgres_generator.go b/generator/postgres/postgres_generator.go index 83469037..196840ef 100644 --- a/generator/postgres/postgres_generator.go +++ b/generator/postgres/postgres_generator.go @@ -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] @@ -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) }