Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Last changes
  • Loading branch information
kyleconroy committed Oct 20, 2023
commit ab4db66e5295b3b98841eba1fcad3b59249f1234
14 changes: 7 additions & 7 deletions internal/cmd/createdb.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ var createDBCmd = &cobra.Command{
RunE: func(cmd *cobra.Command, args []string) error {
defer trace.StartRegion(cmd.Context(), "createdb").End()
stderr := cmd.ErrOrStderr()
dir, name := getConfigPath(stderr, cmd.Flag("file"))
qs, err := cmd.Flags().GetString("queryset")
dir, filename := getConfigPath(stderr, cmd.Flag("file"))
querySetName, err := cmd.Flags().GetString("queryset")
if err != nil {
return err
}
err = CreateDB(cmd.Context(), dir, name, qs, &Options{
err = CreateDB(cmd.Context(), dir, filename, querySetName, &Options{
Env: ParseEnv(cmd),
Stderr: stderr,
})
Expand All @@ -38,7 +38,7 @@ var createDBCmd = &cobra.Command{
},
}

func CreateDB(ctx context.Context, dir, filename, name string, o *Options) error {
func CreateDB(ctx context.Context, dir, filename, querySetName string, o *Options) error {
_, conf, err := o.ReadConfig(dir, filename)
if err != nil {
return err
Expand All @@ -48,16 +48,16 @@ func CreateDB(ctx context.Context, dir, filename, name string, o *Options) error
var count int
for _, sql := range conf.SQL {
sql := sql
if name != "" && sql.Name != name {
if querySetName != "" && sql.Name != querySetName {
continue
}
if sql.Database != nil && sql.Database.Managed {
queryset = &sql
count += 1
}
}
if queryset == nil && name != "" {
return fmt.Errorf("no queryset found with name %q", name)
if queryset == nil && querySetName != "" {
return fmt.Errorf("no queryset found with name %q", querySetName)
}
if queryset == nil {
return fmt.Errorf("no querysets configured to use a managed database")
Expand Down
5 changes: 4 additions & 1 deletion internal/config/v_two.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@
"engine"
],
"properties": {
"name": {
"type": "string"
},
"engine": {
"enum": [
"postgresql",
Expand Down Expand Up @@ -439,4 +442,4 @@
}
}
}
}
}