fix: incorrect usage of database/sql

alnr · ory-bot · commit 590d898dc7fc · 2026-02-03T23:21:52.000Z
GitOrigin-RevId: a6bc423928fb9910a76e0b18afa2fc2a56fc052d
diff --git a/oryx/sqlxx/batch/create.go b/oryx/sqlxx/batch/create.go
@@ -246,10 +246,6 @@ func Create[T any](ctx context.Context, p *TracerConnection, models []*T, opts .
 	// Databases not supporting RETURNING will just return 0 rows.
 	count := 0
 	for rows.Next() {
-		if err := rows.Err(); err != nil {
-			return sqlcon.HandleError(err)
-		}
-
 		if err := setModelID(rows, pop.NewModel(models[count], ctx)); err != nil {
 			return err
 		}
@@ -260,10 +256,6 @@ func Create[T any](ctx context.Context, p *TracerConnection, models []*T, opts .
 		return sqlcon.HandleError(err)
 	}
 
-	if err := rows.Close(); err != nil {
-		return sqlcon.HandleError(err)
-	}
-
 	return sqlcon.HandleError(err)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -246,10 +246,6 @@ func Create[T any](ctx context.Context, p TracerConnection, models []T, opts .`
`246`	`246`	`// Databases not supporting RETURNING will just return 0 rows.`
`247`	`247`	`count := 0`
`248`	`248`	`for rows.Next() {`
`249`		`- if err := rows.Err(); err != nil {`
`250`		`- return sqlcon.HandleError(err)`
`251`		`- }`
`252`		`-`
`253`	`249`	`if err := setModelID(rows, pop.NewModel(models[count], ctx)); err != nil {`
`254`	`250`	`return err`
`255`	`251`	`}`
`@@ -260,10 +256,6 @@ func Create[T any](ctx context.Context, p TracerConnection, models []T, opts .`
`260`	`256`	`return sqlcon.HandleError(err)`
`261`	`257`	`}`
`262`	`258`
`263`		`- if err := rows.Close(); err != nil {`
`264`		`- return sqlcon.HandleError(err)`
`265`		`- }`
`266`		`-`
`267`	`259`	`return sqlcon.HandleError(err)`
`268`	`260`	`}`
`269`	`261`