Skip to content

Commit 5e3483a

Browse files
stgraberstgraber
authored
Merge pull request #1823 from masnax/generator-config
Fix generator table pluralization
2 parents 48b53ef + cc0f531 commit 5e3483a

31 files changed

+217
-163
lines changed

‎cmd/generate-database/db/method.go

Lines changed: 75 additions & 41 deletions
Large diffs are not rendered by default.

‎cmd/incusd/api_internal_recover.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,12 @@ func internalRecoverScan(ctx context.Context, s *state.State, userPools []api.St
8080
return err
8181
}
8282

83-
profileConfigs, err := dbCluster.GetConfig(ctx, tx.Tx(), "profile")
83+
profileConfigs, err := dbCluster.GetAllProfileConfigs(ctx, tx.Tx())
8484
if err != nil {
8585
return err
8686
}
8787

88-
profileDevices, err := dbCluster.GetDevices(ctx, tx.Tx(), "profile")
88+
profileDevices, err := dbCluster.GetAllProfileDevices(ctx, tx.Tx())
8989
if err != nil {
9090
return err
9191
}

‎cmd/incusd/instance_patch.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,12 +191,12 @@ func instancePatch(d *Daemon, r *http.Request) response.Response {
191191
return err
192192
}
193193

194-
profileConfigs, err := cluster.GetConfig(ctx, tx.Tx(), "profile")
194+
profileConfigs, err := cluster.GetAllProfileConfigs(ctx, tx.Tx())
195195
if err != nil {
196196
return err
197197
}
198198

199-
profileDevices, err := cluster.GetDevices(ctx, tx.Tx(), "profile")
199+
profileDevices, err := cluster.GetAllProfileDevices(ctx, tx.Tx())
200200
if err != nil {
201201
return err
202202
}

‎cmd/incusd/instance_post.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -358,12 +358,12 @@ func instancePost(d *Daemon, r *http.Request) response.Response {
358358
return err
359359
}
360360

361-
dbProfileConfigs, err := dbCluster.GetConfig(ctx, tx.Tx(), "profile")
361+
dbProfileConfigs, err := dbCluster.GetAllProfileConfigs(ctx, tx.Tx())
362362
if err != nil {
363363
return err
364364
}
365365

366-
dbProfileDevices, err := dbCluster.GetDevices(ctx, tx.Tx(), "profile")
366+
dbProfileDevices, err := dbCluster.GetAllProfileDevices(ctx, tx.Tx())
367367
if err != nil {
368368
return err
369369
}
@@ -713,12 +713,12 @@ func migrateInstance(ctx context.Context, s *state.State, inst instance.Instance
713713
return err
714714
}
715715

716-
profileConfigs, err := dbCluster.GetConfig(ctx, tx.Tx(), "profile")
716+
profileConfigs, err := dbCluster.GetAllProfileConfigs(ctx, tx.Tx())
717717
if err != nil {
718718
return err
719719
}
720720

721-
profileDevices, err := dbCluster.GetDevices(ctx, tx.Tx(), "profile")
721+
profileDevices, err := dbCluster.GetAllProfileDevices(ctx, tx.Tx())
722722
if err != nil {
723723
return err
724724
}

‎cmd/incusd/instance_put.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,12 +137,12 @@ func instancePut(d *Daemon, r *http.Request) response.Response {
137137
return err
138138
}
139139

140-
profileConfigs, err := cluster.GetConfig(ctx, tx.Tx(), "profile")
140+
profileConfigs, err := cluster.GetAllProfileConfigs(ctx, tx.Tx())
141141
if err != nil {
142142
return err
143143
}
144144

145-
profileDevices, err := cluster.GetDevices(ctx, tx.Tx(), "profile")
145+
profileDevices, err := cluster.GetAllProfileDevices(ctx, tx.Tx())
146146
if err != nil {
147147
return err
148148
}

‎cmd/incusd/instances_post.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1060,12 +1060,12 @@ func instancesPost(d *Daemon, r *http.Request) response.Response {
10601060
return err
10611061
}
10621062

1063-
dbProfileConfigs, err := dbCluster.GetConfig(ctx, tx.Tx(), "profile")
1063+
dbProfileConfigs, err := dbCluster.GetAllProfileConfigs(ctx, tx.Tx())
10641064
if err != nil {
10651065
return err
10661066
}
10671067

1068-
dbProfileDevices, err := dbCluster.GetDevices(ctx, tx.Tx(), "profile")
1068+
dbProfileDevices, err := dbCluster.GetAllProfileDevices(ctx, tx.Tx())
10691069
if err != nil {
10701070
return err
10711071
}

‎cmd/incusd/profiles.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,12 +213,12 @@ func profilesGet(d *Daemon, r *http.Request) response.Response {
213213
}
214214

215215
if mustLoadObjects {
216-
profileConfigs, err := dbCluster.GetConfig(ctx, tx.Tx(), "profile")
216+
profileConfigs, err := dbCluster.GetAllProfileConfigs(ctx, tx.Tx())
217217
if err != nil {
218218
return err
219219
}
220220

221-
profileDevices, err := dbCluster.GetDevices(ctx, tx.Tx(), "profile")
221+
profileDevices, err := dbCluster.GetAllProfileDevices(ctx, tx.Tx())
222222
if err != nil {
223223
return err
224224
}
@@ -476,12 +476,12 @@ func profileGet(d *Daemon, r *http.Request) response.Response {
476476
return fmt.Errorf("Fetch profile: %w", err)
477477
}
478478

479-
profileConfigs, err := dbCluster.GetConfig(ctx, tx.Tx(), "profile")
479+
profileConfigs, err := dbCluster.GetAllProfileConfigs(ctx, tx.Tx())
480480
if err != nil {
481481
return err
482482
}
483483

484-
profileDevices, err := dbCluster.GetDevices(ctx, tx.Tx(), "profile")
484+
profileDevices, err := dbCluster.GetAllProfileDevices(ctx, tx.Tx())
485485
if err != nil {
486486
return err
487487
}

‎internal/server/backup/backup_config_utils.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@ func ConfigToInstanceDBArgs(state *state.State, c *config.Config, projectName st
5252
}
5353

5454
// Get all the profile configs.
55-
profileConfigs, err := cluster.GetConfig(ctx, tx.Tx(), "profile")
55+
profileConfigs, err := cluster.GetAllProfileConfigs(ctx, tx.Tx())
5656
if err != nil {
5757
return err
5858
}
5959

6060
// Get all the profile devices.
61-
profileDevices, err := cluster.GetDevices(ctx, tx.Tx(), "profile")
61+
profileDevices, err := cluster.GetAllProfileDevices(ctx, tx.Tx())
6262
if err != nil {
6363
return err
6464
}

‎internal/server/db/cluster/cluster_groups.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ import (
2020
//generate-database:mapper stmt -e cluster_group delete-by-Name table=cluster_groups
2121
//generate-database:mapper stmt -e cluster_group update table=cluster_groups
2222
//
23-
//generate-database:mapper method -i -e cluster_group GetMany references=Config
24-
//generate-database:mapper method -i -e cluster_group GetOne
25-
//generate-database:mapper method -i -e cluster_group ID
26-
//generate-database:mapper method -i -e cluster_group Exists
27-
//generate-database:mapper method -i -e cluster_group Rename
28-
//generate-database:mapper method -i -e cluster_group Create references=Config
29-
//generate-database:mapper method -i -e cluster_group Update references=Config
30-
//generate-database:mapper method -i -e cluster_group DeleteOne-by-Name
23+
//generate-database:mapper method -i -e cluster_group GetMany references=Config table=cluster_groups
24+
//generate-database:mapper method -i -e cluster_group GetOne table=cluster_groups
25+
//generate-database:mapper method -i -e cluster_group ID table=cluster_groups
26+
//generate-database:mapper method -i -e cluster_group Exists table=cluster_groups
27+
//generate-database:mapper method -i -e cluster_group Rename table=cluster_groups
28+
//generate-database:mapper method -i -e cluster_group Create references=Config table=cluster_groups
29+
//generate-database:mapper method -i -e cluster_group Update references=Config table=cluster_groups
30+
//generate-database:mapper method -i -e cluster_group DeleteOne-by-Name table=cluster_groups
3131

3232
// ClusterGroup is a value object holding db-related details about a cluster group.
3333
type ClusterGroup struct {

‎internal/server/db/cluster/cluster_groups.mapper.go

Lines changed: 15 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/server/db/cluster/config.interface.mapper.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@ import "context"
88
type ConfigGenerated interface {
99
// GetConfig returns all available config.
1010
// generator: config GetMany
11-
GetConfig(ctx context.Context, db dbtx, parent string, filters ...ConfigFilter) (map[int]map[string]string, error)
11+
GetConfig(ctx context.Context, db dbtx, parentTablePrefix string, parentColumnPrefix string, filters ...ConfigFilter) (map[int]map[string]string, error)
1212

1313
// CreateConfig adds a new config to the database.
1414
// generator: config Create
15-
CreateConfig(ctx context.Context, db dbtx, parent string, object Config) error
15+
CreateConfig(ctx context.Context, db dbtx, parentTablePrefix string, parentColumnPrefix string, object Config) error
1616

1717
// UpdateConfig updates the config matching the given key parameters.
1818
// generator: config Update
19-
UpdateConfig(ctx context.Context, db dbtx, parent string, referenceID int, config map[string]string) error
19+
UpdateConfig(ctx context.Context, db dbtx, parentTablePrefix string, parentColumnPrefix string, referenceID int, config map[string]string) error
2020

2121
// DeleteConfig deletes the config matching the given key parameters.
2222
// generator: config DeleteMany
23-
DeleteConfig(ctx context.Context, db dbtx, parent string, referenceID int) error
23+
DeleteConfig(ctx context.Context, db dbtx, parentTablePrefix string, parentColumnPrefix string, referenceID int) error
2424
}

0 commit comments

Comments
 (0)