andwati/zitadel
1
0
Fork 0
mirror of https://github.com/andwati/zitadel.git synced 2026-10-27 01:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(repo): correct mapping for domains (#10653)

Browse Source 
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.
This commit is contained in:
Silvan
2025-09-08 09:35:31 +02:00
committed by GitHub
parent 69be6b9416
commit 869282ca49
9 changed files with 128 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/v3/storage/database/dialect/sql/rows.go
+4 -4
View File
@@ -3,7 +3,7 @@ package sql
import (
"database/sql"
pgxscan "github.com/georgysavva/scany/v2/dbscan"
"github.com/georgysavva/scany/v2/sqlscan"
"github.com/jackc/pgx/v5"
"github.com/zitadel/zitadel/backend/v3/storage/database"
@@ -44,7 +44,7 @@ func (r *Rows) Collect(dest any) (err error) {
err = closeErr
}
}()
return wrapError(pgxscan.ScanAll(dest, r.Rows))
return wrapError(sqlscan.ScanAll(dest, r.Rows))
}
// CollectFirst implements [database.CollectableRows].
@@ -56,7 +56,7 @@ func (r *Rows) CollectFirst(dest any) (err error) {
err = closeErr
}
}()
return wrapError(pgxscan.ScanRow(dest, r.Rows))
return wrapError(sqlscan.ScanRow(dest, r.Rows))
}
// CollectExactlyOneRow implements [database.CollectableRows].
@@ -68,7 +68,7 @@ func (r *Rows) CollectExactlyOneRow(dest any) (err error) {
err = closeErr
}
}()
return wrapError(pgxscan.ScanOne(dest, r.Rows))
return wrapError(sqlscan.ScanOne(dest, r.Rows))
}
// Close implements [database.Rows].