From 5149bd563a5e851ac1a5cf6612db6da63159a996 Mon Sep 17 00:00:00 2001
From: Iraq Jaber <iraq+github@zitadel.com>
Date: Wed, 2 Jul 2025 15:48:13 +0200
Subject: [PATCH] fixup! fixup! fixup! fixup! Merge branch 'main' into
 fix_adding_org_same_id_twice

---
 cmd/setup/61.go | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/cmd/setup/61.go b/cmd/setup/61.go
index 1bd371883c..42bd447d46 100644
--- a/cmd/setup/61.go
+++ b/cmd/setup/61.go
@@ -2,6 +2,7 @@ package setup
 
 import (
 	"context"
+	"database/sql"
 
 	"github.com/zitadel/zitadel/internal/database"
 	"github.com/zitadel/zitadel/internal/eventstore"
@@ -42,7 +43,7 @@ func (e *OrgRemoveEventUpdateIDUniqueConstraint) UniqueConstraints() []*eventsto
 	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{}
 	sqb := eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		AddQuery().
@@ -52,18 +53,19 @@ func (mig *AddIDUniqueConstraintsForOrgs) Execute(ctx context.Context, _ eventst
 		).
 		Builder()
 
-	err := mig.eventstore.FilterToReducer(context.Background(), sqb, &orm)
+	err = mig.eventstore.FilterToReducer(ctx, sqb, &orm)
 	if err != nil {
 	}
 
-	tx, err := mig.dbClient.BeginTx(ctx, nil)
+	var tx *sql.Tx
+	tx, err = mig.dbClient.BeginTx(ctx, nil)
 	if err != nil {
 		return err
 	}
 
 	defer func() {
 		if err == nil {
-			tx.Commit()
+			err = tx.Commit()
 		}
 	}()