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

fixup! fixup! fixup! fixup! fixup! Merge branch 'main' into import_export_merge

Browse Source
This commit is contained in:
Iraq Jaber
2025-06-06 15:54:18 +02:00
parent 4384652b5e
commit d6c5783dc0
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
backend/v3/storage/database/condition.go
View File

@@ -12,7 +12,6 @@ type and struct {
// Write implements [Condition]. // Write implements [Condition].
func (a *and) Write(builder *StatementBuilder) { func (a *and) Write(builder *StatementBuilder) {
builder.WriteString(" WHERE ")
if len(a.conditions) > 1 { if len(a.conditions) > 1 {
builder.WriteString("(") builder.WriteString("(")
defer builder.WriteString(")") defer builder.WriteString(")")

4
backend/v3/storage/database/repository/instance.go
View File

@@ -40,7 +40,7 @@ func (i *instance) Get(ctx context.Context, opts ...database.Condition) (*domain
// return only non deleted isntances // return only non deleted isntances
opts = append(opts, database.IsNull(i.DeletedAtColumn())) opts = append(opts, database.IsNull(i.DeletedAtColumn()))
andCondition := database.And(opts...) andCondition := database.And(opts...)
andCondition.Write(&builder) i.writeCondition(&builder, andCondition)
return scanInstance(i.client.QueryRow(ctx, builder.String(), builder.Args()...)) 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 // return only non deleted isntances
opts = append(opts, database.IsNull(i.DeletedAtColumn())) opts = append(opts, database.IsNull(i.DeletedAtColumn()))
andCondition := database.And(opts...) andCondition := database.And(opts...)
andCondition.Write(&builder) i.writeCondition(&builder, andCondition)
rows, err := i.client.Query(ctx, builder.String(), builder.Args()...) rows, err := i.client.Query(ctx, builder.String(), builder.Args()...)
if err != nil { if err != nil {

17
backend/v3/storage/database/repository/instance_test.go
View File

@@ -139,7 +139,7 @@ func TestCreateInstance(t *testing.T) {
} }
} }
func TestUpdateNameInstance(t *testing.T) { func TestUpdateInstance(t *testing.T) {
tests := []struct { tests := []struct {
name string name string
testFunc func() *domain.Instance testFunc func() *domain.Instance
@@ -491,10 +491,9 @@ func TestListInstance(t *testing.T) {
func TestDeleteInstance(t *testing.T) { func TestDeleteInstance(t *testing.T) {
type test struct { type test struct {
name string name string
testFunc func() testFunc func()
conditionClauses database.Condition conditionClauses database.Condition
noInstanceReturned bool
} }
tests := []test{ tests := []test{
func() test { func() test {
@@ -531,6 +530,14 @@ func TestDeleteInstance(t *testing.T) {
conditionClauses: instanceRepo.NameCondition(database.TextOperationEqual, instanceName), 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 { func() test {
instanceRepo := repository.InstanceRepository(pool) instanceRepo := repository.InstanceRepository(pool)
instanceName := gofakeit.Name() instanceName := gofakeit.Name()