mirror of
https://github.com/zitadel/zitadel.git
synced 2025-12-25 15:16:46 +00:00
869282ca49
This pull request fixes an issue where the repository would fail to scan organization or instance structs if the `domains` column was `NULL`. ## Which problems are solved If the `domains` column of `orgs` or `instances` was `NULL`, the repository failed scanning into the structs. This happened because the scanning mechanism did not correctly handle `NULL` JSONB columns. ## How the problems are solved A new generic type `JSONArray[T]` is introduced, which implements the `sql.Scanner` interface. This type can correctly scan JSON arrays from the database, including handling `NULL` values gracefully. The repositories for instances and organizations have been updated to use this new type for the domains field. The SQL queries have also been improved to use `FILTER` with `jsonb_agg` for better readability and performance when aggregating domains. ## Additional changes * An unnecessary cleanup step in the organization domain tests for already removed domains has been removed. * The `pgxscan` library has been replaced with `sqlscan` for scanning `database/sql`.Rows. * Minor cleanups in integration tests.
79 lines
2.0 KiB
Go
79 lines
2.0 KiB
Go
package sql
|
|
|
|
import (
|
|
"database/sql"
|
|
|
|
"github.com/georgysavva/scany/v2/sqlscan"
|
|
"github.com/jackc/pgx/v5"
|
|
|
|
"github.com/zitadel/zitadel/backend/v3/storage/database"
|
|
)
|
|
|
|
var (
|
|
_ database.Rows = (*Rows)(nil)
|
|
_ database.CollectableRows = (*Rows)(nil)
|
|
_ database.Row = (*Row)(nil)
|
|
)
|
|
|
|
type Row struct{ pgx.Row }
|
|
|
|
// Scan implements [database.Row].
|
|
// Subtle: this method shadows the method ([pgx.Row]).Scan of Row.Row.
|
|
func (r *Row) Scan(dest ...any) error {
|
|
return wrapError(r.Row.Scan(dest...))
|
|
}
|
|
|
|
type Rows struct{ *sql.Rows }
|
|
|
|
// Err implements [database.Rows].
|
|
// Subtle: this method shadows the method ([pgx.Rows]).Err of Rows.Rows.
|
|
func (r *Rows) Err() error {
|
|
return wrapError(r.Rows.Err())
|
|
}
|
|
|
|
func (r *Rows) Scan(dest ...any) error {
|
|
return wrapError(r.Rows.Scan(dest...))
|
|
}
|
|
|
|
// Collect implements [database.CollectableRows].
|
|
// See [this page](https://github.com/georgysavva/scany/blob/master/dbscan/doc.go#L8) for additional details.
|
|
func (r *Rows) Collect(dest any) (err error) {
|
|
defer func() {
|
|
closeErr := r.Close()
|
|
if err == nil {
|
|
err = closeErr
|
|
}
|
|
}()
|
|
return wrapError(sqlscan.ScanAll(dest, r.Rows))
|
|
}
|
|
|
|
// CollectFirst implements [database.CollectableRows].
|
|
// See [this page](https://github.com/georgysavva/scany/blob/master/dbscan/doc.go#L8) for additional details.
|
|
func (r *Rows) CollectFirst(dest any) (err error) {
|
|
defer func() {
|
|
closeErr := r.Close()
|
|
if err == nil {
|
|
err = closeErr
|
|
}
|
|
}()
|
|
return wrapError(sqlscan.ScanRow(dest, r.Rows))
|
|
}
|
|
|
|
// CollectExactlyOneRow implements [database.CollectableRows].
|
|
// See [this page](https://github.com/georgysavva/scany/blob/master/dbscan/doc.go#L8) for additional details.
|
|
func (r *Rows) CollectExactlyOneRow(dest any) (err error) {
|
|
defer func() {
|
|
closeErr := r.Close()
|
|
if err == nil {
|
|
err = closeErr
|
|
}
|
|
}()
|
|
return wrapError(sqlscan.ScanOne(dest, r.Rows))
|
|
}
|
|
|
|
// Close implements [database.Rows].
|
|
// Subtle: this method shadows the method (Rows).Close of Rows.Rows.
|
|
func (r *Rows) Close() error {
|
|
return r.Rows.Close()
|
|
}
|