TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-12 07:37:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixup! fixup! fixup! fixup! Merge branch 'main' into fix_adding_org_same_id_twice

Browse Source
This commit is contained in:
Iraq Jaber
2025-07-02 15:48:13 +02:00
parent 9178e49f69
commit 5149bd563a
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/setup/61.go
View File

@@ -2,6 +2,7 @@ package setup
import ( import (
"context" "context"
"database/sql"
"github.com/zitadel/zitadel/internal/database" "github.com/zitadel/zitadel/internal/database"
"github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore"
@@ -42,7 +43,7 @@ func (e *OrgRemoveEventUpdateIDUniqueConstraint) UniqueConstraints() []*eventsto
return []*eventstore.UniqueConstraint{org.NewRemoveOrgIDUniqueConstraint(e.Aggregate().ID)} return []*eventstore.UniqueConstraint{org.NewRemoveOrgIDUniqueConstraint(e.Aggregate().ID)}
} }
func (mig *AddIDUniqueConstraintsForOrgs) Execute(ctx context.Context, _ eventstore.Event) error { func (mig *AddIDUniqueConstraintsForOrgs) Execute(ctx context.Context, _ eventstore.Event) (err error) {
orm := orgsReadModel{} orm := orgsReadModel{}
sqb := eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent). sqb := eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
AddQuery(). AddQuery().
@@ -52,18 +53,19 @@ func (mig *AddIDUniqueConstraintsForOrgs) Execute(ctx context.Context, _ eventst
). ).
Builder() Builder()
err := mig.eventstore.FilterToReducer(context.Background(), sqb, &orm) err = mig.eventstore.FilterToReducer(ctx, sqb, &orm)
if err != nil { if err != nil {
} }
tx, err := mig.dbClient.BeginTx(ctx, nil) var tx *sql.Tx
tx, err = mig.dbClient.BeginTx(ctx, nil)
if err != nil { if err != nil {
return err return err
} }
defer func() { defer func() {
if err == nil { if err == nil {
tx.Commit() err = tx.Commit()
} }
}() }()