Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
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
4 changes: 4 additions & 0 deletions pkg/generator/model.go
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,10 @@ func BuildRelationTag(r *state.Relation) string {
jsonTag := fmt.Sprintf("json:%q", utils.ToSnakeCase(r.Table)+",omitempty")
tags = append(tags, jsonTag)

if r.Index != nil {
tags = append(tags, "indexed:true")
}

if r.Action != nil {

onUpdate, onDelete := objects.RelationActionDefaultLabel, objects.RelationActionDefaultLabel
Expand Down
1 change: 1 addition & 0 deletions pkg/generator/model_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ func TestGenerateModels(t *testing.T) {
ForeignKey: "test_table_id",
PrimaryKey: "id",
Action: &relationshipAction,
Index: &objects.Index{Schema: "public", Table: "related_table", Name: "test_table_id", Definition: "CREATE INDEX test_table_id ON related_table(test_table_id);"},
},
},
Policies: objects.Policies{},
Expand Down
1 change: 1 addition & 0 deletions pkg/resource/import.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ func Import(flags *Flags, config *raiden.Config) error {
if err != nil {
return err
}
ImportLogger.Trace("indexes", spResource.Indexes)
spResource.Tables = tables.AttachIndexAndAction(spResource.Tables, spResource.Indexes, spResource.RelationActions)

// create import state
Expand Down
12 changes: 8 additions & 4 deletions pkg/resource/tables/compare.go
Original file line number Diff line number Diff line change
Expand Up @@ -239,11 +239,15 @@ func compareRelations(table *objects.Table, source, target []objects.TablesRelat
}

if t.Index == nil && sc.Index == nil {
updateItems = append(updateItems, objects.UpdateRelationItem{
Data: sc,
Type: objects.UpdateRelationCreateIndex,
})
// updateItems = append(updateItems, objects.UpdateRelationItem{
// Data: sc,
// Type: objects.UpdateRelationCreateIndex,
// })
Logger.Debug("create new index", "constrain-name", sc.ConstraintName)
} else {
Logger.Debug("check-index", "t-index", t.Index)
Logger.Debug("check-index", "sc-index", sc.Index)
Logger.Debug("updating index", "constrain-name", sc.ConstraintName)
}

if t.Action != nil && sc.Action != nil {
Expand Down
11 changes: 11 additions & 0 deletions pkg/state/table.go
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,17 @@ func buildTableFromModel(model any) (ei ExtractTableItem) {
}
}

// check index field
indexed := field.Tag.Get("indexed")
if len(indexed) > 0 {
rel.Index = &objects.Index{
Schema: ei.Table.Schema,
Table: rel.TargetTableName,
Name: fmt.Sprintf("ix_%s_%s", rel.TargetTableName, rel.TargetColumnName),
Definition: fmt.Sprintf("CREATE INDEX ix_%s_%s ON %s(%s);", rel.TargetTableName, rel.TargetColumnName, rel.TargetTableName, rel.TargetColumnName),
}
}

ei.Table.Relationships = append(ei.Table.Relationships, rel)
}
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/state/table_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ type Submission struct {
Acl string `json:"-" read:"anon" write:"anon"`

// Relations
Candidate *Candidate `json:"candidate,omitempty" join:"joinType:hasOne;primaryKey:id;foreignKey:candidate_id" onUpdate:"cascade" onDelete:"cascade"`
Candidate *Candidate `json:"candidate,omitempty" join:"joinType:hasOne;primaryKey:id;foreignKey:candidate_id" onUpdate:"cascade" onDelete:"cascade" indexed:"true"`
}

type Candidate struct {
Expand Down