mirror of
https://github.com/andwati/zitadel.git
synced 2026-10-18 05:52:51 +00:00
f138082b64
Introduces the `administrators` relational table and repository layer for the v3 backend, unifying instance, organization, project, and project-grant membership into a single scoped model. Closes #10220 ## Changes - **Domain**: `Administrator` struct, `AdministratorScope` enum, `AdministratorRepository` interface with typed CRUD, column, condition, and change helpers. Generated enumer and GoMock. - **Migration** (`016`): `zitadel.administrators` table with a generated `id`, scope-alignment check constraint, cascading foreign keys, and a child `administrator_roles` table. - **Repository**: CTE-based role mutations (`AddRole`, `RemoveRole`, `SetRoles`) for atomicity. Roles aggregated via `ARRAY_AGG`. - **Projection**: Event reducers for `member.added/changed/removed/cascade_removed` across all four admin scopes. - **Fixes**: `Rows.Close()` error wrapping; `TextArray` nil-safe scan + full `pgtype` array interface; `authorization` and `projectGrant` scan helpers fixed for `ARRAY_AGG` under `database/sql`; removed unused `ctx` parameter from `callReduce`. --------- Co-authored-by: Marco Ardizzone <[email protected]>
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 wrapError(r.Rows.Close())
|
|
}
|