fix(changelog-oel): replace returning * with defined column names

GitOrigin-RevId: 8fa1912556293bba8f9c841ec316da18a52ea61e

Author: aeneasr

.github/workflows/ci.yaml

@@ -32,7 +32,6 @@ jobs:
       - name: Run tests
         run: ./test/conformance/test.sh -v -short -parallel 16
 
-
   test:
     name: Run tests and lints
     runs-on: ubuntu-latest
@@ -130,8 +129,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        database: [ "memory", "postgres", "mysql", "cockroach" ]
-        args: [ "", "--jwt" ]
+        database: ["memory", "postgres", "mysql", "cockroach"]
+        args: ["", "--jwt"]
     services:
       postgres:
         image: postgres:16

go.mod

@@ -34,7 +34,7 @@ require (
 	github.com/ory/hydra-client-go/v2 v2.2.1
 	github.com/ory/jsonschema/v3 v3.0.9-0.20250317235931-280c5fc7bf0e
 	github.com/ory/kratos-client-go v1.3.8
-	github.com/ory/x v0.0.712
+	github.com/ory/x v0.0.718
 	github.com/pborman/uuid v1.2.1
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.21.1

go.sum

@@ -409,8 +409,8 @@ github.com/ory/kratos-client-go v1.3.8 h1:S4D5dAURq5C6LbOUU+DgE4ZXxp37IlJG2Gngem
 github.com/ory/kratos-client-go v1.3.8/go.mod h1:Dc+ANapsPxu+CfdC0yk8TxmvceCmrvNozW+ZGS/xq5o=
 github.com/ory/pop/v6 v6.2.1-0.20241121111754-e5dfc0f3344b h1:BIzoOe2/wynZBQak1po0tzgvARseIKsR2bF6b+SZoKE=
 github.com/ory/pop/v6 v6.2.1-0.20241121111754-e5dfc0f3344b/go.mod h1:okVAYKGtgunD/wbW3NGhZTndJCS+6FqO+cA89rQ4doc=
-github.com/ory/x v0.0.712 h1:3HRRXBlKXwkIh5ag55fs25tIMipb058muNtEWTFOqfI=
-github.com/ory/x v0.0.712/go.mod h1:FxgJl980fq/41JTPPloNawYPCY25KRYuMO98SRk1czc=
+github.com/ory/x v0.0.718 h1:/zsayNY4XWfzjIk5o8ytkEgLsVO8onz0qIotW5ue3TU=
+github.com/ory/x v0.0.718/go.mod h1:FxgJl980fq/41JTPPloNawYPCY25KRYuMO98SRk1czc=
 github.com/pborman/uuid v1.2.1 h1:+ZZIw58t/ozdjRaXh/3awHfmWRbzYxJoAdNJxe/3pvw=
 github.com/pborman/uuid v1.2.1/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
 github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=

persistence/sql/persister_consent.go

@@ -518,54 +518,46 @@ func (p *Persister) CreateLoginSession(ctx context.Context, session *flow.LoginS
 	return nil
 }
 
-func (p *Persister) DeleteLoginSession(ctx context.Context, id string) (deletedSession *flow.LoginSession, err error) {
+func (p *Persister) DeleteLoginSession(ctx context.Context, id string) (_ *flow.LoginSession, err error) {
 	ctx, span := p.r.Tracer(ctx).Tracer().Start(ctx, "persistence.sql.DeleteLoginSession")
 	defer otelx.End(span, &err)
 
-	if p.Connection(ctx).Dialect.Name() == "mysql" {
+	c := p.Connection(ctx)
+	if c.Dialect.Name() == "mysql" {
 		// MySQL does not support RETURNING.
 		return p.mySQLDeleteLoginSession(ctx, id)
 	}
 
 	var session flow.LoginSession
-
-	err = p.Connection(ctx).RawQuery(
-		`DELETE FROM hydra_oauth2_authentication_session
-       WHERE id = ? AND nid = ?
-       RETURNING *`,
+	columns := pop.NewModel(&session, ctx).Columns().Readable()
+	if err := p.Connection(ctx).RawQuery(
+		fmt.Sprintf(
+			`DELETE FROM hydra_oauth2_authentication_session WHERE id = ? AND nid = ? RETURNING %s`,
+			columns.QuotedString(c.Dialect)),
 		id,
 		p.NetworkID(ctx),
-	).First(&session)
-	if err != nil {
+	).First(&session); err != nil {
 		return nil, sqlcon.HandleError(err)
 	}
 
 	return &session, nil
 }
 
-func (p *Persister) mySQLDeleteLoginSession(ctx context.Context, id string) (*flow.LoginSession, error) {
-	var session flow.LoginSession
+func (p *Persister) mySQLDeleteLoginSession(ctx context.Context, id string) (_ *flow.LoginSession, err error) {
+	ctx, span := p.r.Tracer(ctx).Tracer().Start(ctx, "persistence.sql.mySQLDeleteLoginSession")
+	defer otelx.End(span, &err)
 
-	err := p.Connection(ctx).Transaction(func(tx *pop.Connection) error {
-		err := tx.RawQuery(`
-SELECT * FROM hydra_oauth2_authentication_session
-WHERE id = ? AND nid = ?`,
-			id,
-			p.NetworkID(ctx),
-		).First(&session)
-		if err != nil {
+	var session flow.LoginSession
+	if err := p.Connection(ctx).Transaction(func(tx *pop.Connection) error {
+		if err := tx.Where("id = ? AND nid = ?", id, p.NetworkID(ctx)).First(&session); err != nil {
 			return err
 		}
 
-		return p.Connection(ctx).RawQuery(`
-DELETE FROM hydra_oauth2_authentication_session
-WHERE id = ? AND nid = ?`,
-			id,
-			p.NetworkID(ctx),
+		return tx.RawQuery(
+			`DELETE FROM hydra_oauth2_authentication_session WHERE id = ? AND nid = ?`,
+			id, p.NetworkID(ctx),
 		).Exec()
-	})
-
-	if err != nil {
+	}); err != nil {
 		return nil, sqlcon.HandleError(err)
 	}
 

test/main.go

@@ -0,0 +1,14 @@
+package main
+
+import (
+	"context"
+	"fmt"
+	"github.com/gobuffalo/pop/v6"
+	"github.com/ory/hydra/v2/flow"
+)
+
+func main() {
+	var session flow.LoginSession
+
+	fmt.Printf("%+v", pop.NewModel(&session, context.Background()).Columns().Readable().SelectString())
+}