mirror of
https://github.com/zitadel/zitadel.git
synced 2025-12-29 01:25:02 +00:00
22ef817d5c
Improves compatibility of eventstore and related database components with the new relational table package. ## Which problems are solved 1. **Incompatible Database Interfaces**: The existing eventstore was tightly coupled to the database package, which is incompatible with the new, more abstract relational table package in v3. This prevented the new command-side logic from pushing events to the legacy eventstore. 2. **Missing Health Checks**: The database interfaces in the new package lacked a Ping method, making it impossible to perform health checks on database connections. 3. **Event Publishing Logic**: The command handling logic in domain needed a way to collect and push events to the legacy eventstore after a command was successfully executed. ## How the problems are solved 1. **`LegacyEventstore` Interface**: * A new `LegacyEventstore` interface is introduced in the new `database/eventstore` . This interface exposes a `PushWithNewClient` method that accepts the new `database.QueryExecutor` interface, decoupling the v3 domain from the legacy implementation. * The `internal/eventstore.Eventstore` now implements this interface. A wrapper, PushWithClient, is added to convert the old database client types (`*sql.DB`, `*sql.Tx`) into the new `QueryExecutor` types before calling `PushWithNewClient`. 2. **Database Interface Updates**: * The `database.Pool` and `database.Client` interfaces in `storage/eventstore` have been updated to include a Ping method, allowing for consistent health checks across different database dialects. * The `postgres` and `sql` dialect implementations have been updated to support this new method. 3. **Command and Invoker Refactoring**: * The `Commander` interface in domain now includes an `Events() []legacy_es.Command` method. This allows commands to declare which events they will generate. * The `eventCollector` in the invoker logic has been redesigned. It now ensures a database transaction is started before executing a command. After successful execution, it calls the `Events()` method on the command to collect the generated events and appends them to a list. * The `eventStoreInvoker` then pushes all collected events to the legacy eventstore using the new `LegacyEventstore` interface, ensuring that events are only pushed if the entire command (and any sub-commands) executes successfully within the transaction. 4. **Testing**: * New unit tests have been added for the invoker to verify that events are correctly collected from single commands, batched commands, and nested commands. These changes create a clean bridge between the new v3 command-side logic and the existing v1 eventstore, allowing for incremental adoption of the new architecture while maintaining full functionality. ## Additional Information closes https://github.com/zitadel/zitadel/issues/10442
106 lines
2.5 KiB
Go
106 lines
2.5 KiB
Go
package postgres
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/jackc/pgx/v5/pgxpool"
|
|
|
|
"github.com/zitadel/zitadel/backend/v3/storage/database"
|
|
"github.com/zitadel/zitadel/backend/v3/storage/database/dialect/postgres/migration"
|
|
)
|
|
|
|
type pgxPool struct {
|
|
*pgxpool.Pool
|
|
}
|
|
|
|
var _ database.Pool = (*pgxPool)(nil)
|
|
|
|
func PGxPool(pool *pgxpool.Pool) *pgxPool {
|
|
return &pgxPool{
|
|
Pool: pool,
|
|
}
|
|
}
|
|
|
|
// Acquire implements [database.Pool].
|
|
func (c *pgxPool) Acquire(ctx context.Context) (database.Client, error) {
|
|
conn, err := c.Pool.Acquire(ctx)
|
|
if err != nil {
|
|
return nil, wrapError(err)
|
|
}
|
|
return &pgxConn{Conn: conn}, nil
|
|
}
|
|
|
|
// Query implements [database.Pool].
|
|
// Subtle: this method shadows the method (Pool).Query of pgxPool.Pool.
|
|
func (c *pgxPool) Query(ctx context.Context, sql string, args ...any) (database.Rows, error) {
|
|
rows, err := c.Pool.Query(ctx, sql, args...)
|
|
if err != nil {
|
|
return nil, wrapError(err)
|
|
}
|
|
return &Rows{rows}, nil
|
|
}
|
|
|
|
// QueryRow implements [database.Pool].
|
|
// Subtle: this method shadows the method (Pool).QueryRow of pgxPool.Pool.
|
|
func (c *pgxPool) QueryRow(ctx context.Context, sql string, args ...any) database.Row {
|
|
return &Row{c.Pool.QueryRow(ctx, sql, args...)}
|
|
}
|
|
|
|
// Exec implements [database.Pool].
|
|
// Subtle: this method shadows the method (Pool).Exec of pgxPool.Pool.
|
|
func (c *pgxPool) Exec(ctx context.Context, sql string, args ...any) (int64, error) {
|
|
res, err := c.Pool.Exec(ctx, sql, args...)
|
|
if err != nil {
|
|
return 0, wrapError(err)
|
|
}
|
|
return res.RowsAffected(), nil
|
|
}
|
|
|
|
// Begin implements [database.Pool].
|
|
func (c *pgxPool) Begin(ctx context.Context, opts *database.TransactionOptions) (database.Transaction, error) {
|
|
tx, err := c.BeginTx(ctx, transactionOptionsToPgx(opts))
|
|
if err != nil {
|
|
return nil, wrapError(err)
|
|
}
|
|
return &Transaction{tx}, nil
|
|
}
|
|
|
|
// Close implements [database.Pool].
|
|
func (c *pgxPool) Close(_ context.Context) error {
|
|
c.Pool.Close()
|
|
return nil
|
|
}
|
|
|
|
// Ping implements [database.Pool].
|
|
func (c *pgxPool) Ping(ctx context.Context) error {
|
|
return wrapError(c.Pool.Ping(ctx))
|
|
}
|
|
|
|
// Migrate implements [database.Migrator].
|
|
func (c *pgxPool) Migrate(ctx context.Context) error {
|
|
if isMigrated {
|
|
return nil
|
|
}
|
|
|
|
client, err := c.Pool.Acquire(ctx)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
err = migration.Migrate(ctx, client.Conn())
|
|
isMigrated = err == nil
|
|
return wrapError(err)
|
|
}
|
|
|
|
// Migrate implements [database.PoolTest].
|
|
func (c *pgxPool) MigrateTest(ctx context.Context) error {
|
|
client, err := c.Pool.Acquire(ctx)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
err = migration.Migrate(ctx, client.Conn())
|
|
isMigrated = err == nil
|
|
return err
|
|
}
|