From be7dd63988b5e580e3d9c43f6c40d00a25065f9f Mon Sep 17 00:00:00 2001
From: aeneasr <3372410+aeneasr@users.noreply.github.com>
Date: Fri, 7 Jun 2024 10:32:41 +0200
Subject: [PATCH] chore: synchronize workspaces

---
 ...08104443000000_change_client_pk.cockroach.up.sql |  2 +-
 persistence/sql/persister_consent.go                | 13 +++++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/persistence/sql/migrations/20230908104443000000_change_client_pk.cockroach.up.sql b/persistence/sql/migrations/20230908104443000000_change_client_pk.cockroach.up.sql
index a74863aa6ca..5dedcc76bb3 100644
--- a/persistence/sql/migrations/20230908104443000000_change_client_pk.cockroach.up.sql
+++ b/persistence/sql/migrations/20230908104443000000_change_client_pk.cockroach.up.sql
@@ -1 +1 @@
-ALTER TABLE hydra_client ALTER PRIMARY KEY USING COLUMNS (id, nid) USING HASH WITH bucket_count=16;
+ALTER TABLE hydra_client ALTER PRIMARY KEY USING COLUMNS (id, nid);
diff --git a/persistence/sql/persister_consent.go b/persistence/sql/persister_consent.go
index 9dc88865bd9..ca0f4ab5526 100644
--- a/persistence/sql/persister_consent.go
+++ b/persistence/sql/persister_consent.go
@@ -12,7 +12,6 @@ import (
 
 	"github.com/gobuffalo/pop/v6"
 	"github.com/gofrs/uuid"
-	"github.com/jmoiron/sqlx"
 	"github.com/pkg/errors"
 
 	"github.com/ory/fosite"
@@ -83,15 +82,13 @@ func (p *Persister) revokeConsentSession(whereStmt string, whereArgs ...interfac
 		}
 
 		count, err := c.RawQuery(
-			sqlx.Rebind(
-				sqlx.BindType(c.Dialect.Name()), fmt.Sprintf(
-					"DELETE FROM hydra_oauth2_flow WHERE nid = ? AND consent_challenge_id IN (%s)",
-					strings.Join(args, ", "),
-				),
+			fmt.Sprintf(
+				"DELETE FROM hydra_oauth2_flow WHERE consent_challenge_id IN (%s) AND nid = ? ",
+				strings.Join(args, ", "),
 			),
 			append(
-				[]interface{}{p.NetworkID(ctx)},
-				ids...,
+				ids,
+				p.NetworkID(ctx),
 			)...,
 		).ExecWithCount()
 		if errors.Is(err, sql.ErrNoRows) {