Skip to content

Commit 625a2ec

Browse files
committed
fix: db error
1 parent 71696cc commit 625a2ec

File tree

2 files changed

+19
-4
lines changed

2 files changed

+19
-4
lines changed

cmd/new.go

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,11 @@ func createNewProject(projectName, projectRouter, template string, out io.Writer
169169
frameworkConfig := framework.FrameworkRegistory[projectRouter]
170170
var dbConfig *addons.DbAddOneConfig
171171

172+
jobs := []TemplateJob{
173+
{"common", projectName},
174+
{"rest/clean", projectName},
175+
}
176+
172177
if DBType != "" {
173178
cfg := addons.DbRegistory[DBType]
174179
dbConfig = &cfg
@@ -189,10 +194,20 @@ func createNewProject(projectName, projectRouter, template string, out io.Writer
189194
renderTemplateDir("rest/clean", projectName, data)
190195

191196
if DBType != "" {
192-
renderTemplateDir("db/"+DBType, projectName, data)
193-
renderTemplateDir("db/database", filepath.Join(projectName, "internal/db"), data)
197+
jobs = append(jobs,
198+
TemplateJob{"db/" + DBType, projectName},
199+
TemplateJob{"db/database", filepath.Join(projectName, "internal", "db")},
200+
)
201+
202+
// fmt.Fprintf(out, "✓ Added database support for '%s'\n", DBType)
203+
}
194204

195-
fmt.Fprintf(out, "✓ Added database support for '%s'\n", DBType)
205+
for _, job := range jobs {
206+
if err := renderTemplateDir(job.TemplateDir, job.DestDir, data); err != nil {
207+
fmt.Fprintf(out, "Error rendering template %s → %s: %v\n",
208+
job.TemplateDir, job.DestDir, err)
209+
return
210+
}
196211
}
197212

198213
fmt.Fprintf(out, "✓ Created '%s' successfully\n", projectName)

templates/db/database/database.go.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func New() Service {
3939
return dbInstance
4040
}
4141

42-
connStr := fmt.Sprintf("{{.DSN}}", username, password, host, port, database, schema)
42+
connStr := fmt.Sprintf("{{.DSN}}", username, password, host, port, database)
4343

4444
db, err := sql.Open("{{.Driver}}", connStr)
4545
if err != nil {

0 commit comments

Comments
 (0)