From d6c5783dc050ae7915f9699830c549c26b5a0ed5 Mon Sep 17 00:00:00 2001
From: Iraq Jaber <iraq+github@zitadel.com>
Date: Fri, 6 Jun 2025 15:54:18 +0200
Subject: [PATCH] fixup! fixup! fixup! fixup! fixup! Merge branch 'main' into
 import_export_merge

---
 backend/v3/storage/database/condition.go        |  1 -
 .../v3/storage/database/repository/instance.go  |  4 ++--
 .../database/repository/instance_test.go        | 17 ++++++++++++-----
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/backend/v3/storage/database/condition.go b/backend/v3/storage/database/condition.go
index 702a8f11d2..e47b520dd1 100644
--- a/backend/v3/storage/database/condition.go
+++ b/backend/v3/storage/database/condition.go
@@ -12,7 +12,6 @@ type and struct {
 
 // Write implements [Condition].
 func (a *and) Write(builder *StatementBuilder) {
-	builder.WriteString(" WHERE ")
 	if len(a.conditions) > 1 {
 		builder.WriteString("(")
 		defer builder.WriteString(")")
diff --git a/backend/v3/storage/database/repository/instance.go b/backend/v3/storage/database/repository/instance.go
index 25e2659113..8278eeb24e 100644
--- a/backend/v3/storage/database/repository/instance.go
+++ b/backend/v3/storage/database/repository/instance.go
@@ -40,7 +40,7 @@ func (i *instance) Get(ctx context.Context, opts ...database.Condition) (*domain
 	// return only non deleted isntances
 	opts = append(opts, database.IsNull(i.DeletedAtColumn()))
 	andCondition := database.And(opts...)
-	andCondition.Write(&builder)
+	i.writeCondition(&builder, andCondition)
 
 	return scanInstance(i.client.QueryRow(ctx, builder.String(), builder.Args()...))
 }
@@ -54,7 +54,7 @@ func (i *instance) List(ctx context.Context, opts ...database.Condition) ([]*dom
 	// return only non deleted isntances
 	opts = append(opts, database.IsNull(i.DeletedAtColumn()))
 	andCondition := database.And(opts...)
-	andCondition.Write(&builder)
+	i.writeCondition(&builder, andCondition)
 
 	rows, err := i.client.Query(ctx, builder.String(), builder.Args()...)
 	if err != nil {
diff --git a/backend/v3/storage/database/repository/instance_test.go b/backend/v3/storage/database/repository/instance_test.go
index 1555b0aed7..2bf4d29c25 100644
--- a/backend/v3/storage/database/repository/instance_test.go
+++ b/backend/v3/storage/database/repository/instance_test.go
@@ -139,7 +139,7 @@ func TestCreateInstance(t *testing.T) {
 	}
 }
 
-func TestUpdateNameInstance(t *testing.T) {
+func TestUpdateInstance(t *testing.T) {
 	tests := []struct {
 		name         string
 		testFunc     func() *domain.Instance
@@ -491,10 +491,9 @@ func TestListInstance(t *testing.T) {
 
 func TestDeleteInstance(t *testing.T) {
 	type test struct {
-		name               string
-		testFunc           func()
-		conditionClauses   database.Condition
-		noInstanceReturned bool
+		name             string
+		testFunc         func()
+		conditionClauses database.Condition
 	}
 	tests := []test{
 		func() test {
@@ -531,6 +530,14 @@ func TestDeleteInstance(t *testing.T) {
 				conditionClauses: instanceRepo.NameCondition(database.TextOperationEqual, instanceName),
 			}
 		}(),
+		func() test {
+			instanceRepo := repository.InstanceRepository(pool)
+			non_existent_instance_name := gofakeit.Name()
+			return test{
+				name:             "delete non existent instance",
+				conditionClauses: instanceRepo.NameCondition(database.TextOperationEqual, non_existent_instance_name),
+			}
+		}(),
 		func() test {
 			instanceRepo := repository.InstanceRepository(pool)
 			instanceName := gofakeit.Name()