diff --git a/internal/query/oidc_settings_test.go b/internal/query/oidc_settings_test.go index 8b6f47cb9a..1831156081 100644 --- a/internal/query/oidc_settings_test.go +++ b/internal/query/oidc_settings_test.go @@ -28,15 +28,15 @@ func Test_OIDCConfigsPrepares(t *testing.T) { prepare: prepareOIDCSettingsQuery, want: want{ sqlExpectations: mockQueries( - `SELECT projections.oidc_settings.aggregate_id,`+ - ` projections.oidc_settings.creation_date,`+ - ` projections.oidc_settings.change_date,`+ - ` projections.oidc_settings.resource_owner,`+ - ` projections.oidc_settings.sequence,`+ - ` projections.oidc_settings.access_token_lifetime,`+ - ` projections.oidc_settings.id_token_lifetime,`+ - ` projections.oidc_settings.refresh_token_idle_expiration,`+ - ` projections.oidc_settings.refresh_token_expiration`+ + `SELECT projections.oidc_settings2.aggregate_id,`+ + ` projections.oidc_settings2.creation_date,`+ + ` projections.oidc_settings2.change_date,`+ + ` projections.oidc_settings2.resource_owner,`+ + ` projections.oidc_settings2.sequence,`+ + ` projections.oidc_settings2.access_token_lifetime,`+ + ` projections.oidc_settings2.id_token_lifetime,`+ + ` projections.oidc_settings2.refresh_token_idle_expiration,`+ + ` projections.oidc_settings2.refresh_token_expiration`+ ` FROM projections.oidc_settings`, nil, nil, @@ -55,15 +55,15 @@ func Test_OIDCConfigsPrepares(t *testing.T) { prepare: prepareOIDCSettingsQuery, want: want{ sqlExpectations: mockQuery( - regexp.QuoteMeta(`SELECT projections.oidc_settings.aggregate_id,`+ - ` projections.oidc_settings.creation_date,`+ - ` projections.oidc_settings.change_date,`+ - ` projections.oidc_settings.resource_owner,`+ - ` projections.oidc_settings.sequence,`+ - ` projections.oidc_settings.access_token_lifetime,`+ - ` projections.oidc_settings.id_token_lifetime,`+ - ` projections.oidc_settings.refresh_token_idle_expiration,`+ - ` projections.oidc_settings.refresh_token_expiration`+ + regexp.QuoteMeta(`SELECT projections.oidc_settings2.aggregate_id,`+ + ` projections.oidc_settings2.creation_date,`+ + ` projections.oidc_settings2.change_date,`+ + ` projections.oidc_settings2.resource_owner,`+ + ` projections.oidc_settings2.sequence,`+ + ` projections.oidc_settings2.access_token_lifetime,`+ + ` projections.oidc_settings2.id_token_lifetime,`+ + ` projections.oidc_settings2.refresh_token_idle_expiration,`+ + ` projections.oidc_settings2.refresh_token_expiration`+ ` FROM projections.oidc_settings`), []string{ "aggregate_id", @@ -106,15 +106,15 @@ func Test_OIDCConfigsPrepares(t *testing.T) { prepare: prepareOIDCSettingsQuery, want: want{ sqlExpectations: mockQueryErr( - regexp.QuoteMeta(`SELECT projections.oidc_settings.aggregate_id,`+ - ` projections.oidc_settings.creation_date,`+ - ` projections.oidc_settings.change_date,`+ - ` projections.oidc_settings.resource_owner,`+ - ` projections.oidc_settings.sequence,`+ - ` projections.oidc_settings.access_token_lifetime,`+ - ` projections.oidc_settings.id_token_lifetime,`+ - ` projections.oidc_settings.refresh_token_idle_expiration,`+ - ` projections.oidc_settings.refresh_token_expiration`+ + regexp.QuoteMeta(`SELECT projections.oidc_settings2.aggregate_id,`+ + ` projections.oidc_settings2.creation_date,`+ + ` projections.oidc_settings2.change_date,`+ + ` projections.oidc_settings2.resource_owner,`+ + ` projections.oidc_settings2.sequence,`+ + ` projections.oidc_settings2.access_token_lifetime,`+ + ` projections.oidc_settings2.id_token_lifetime,`+ + ` projections.oidc_settings2.refresh_token_idle_expiration,`+ + ` projections.oidc_settings2.refresh_token_expiration`+ ` FROM projections.oidc_settings`), sql.ErrConnDone, ), diff --git a/internal/query/projection/oidc_settings.go b/internal/query/projection/oidc_settings.go index 42b3299ad1..ee2545b55d 100644 --- a/internal/query/projection/oidc_settings.go +++ b/internal/query/projection/oidc_settings.go @@ -11,7 +11,7 @@ import ( ) const ( - OIDCSettingsProjectionTable = "projections.oidc_settings" + OIDCSettingsProjectionTable = "projections.oidc_settings2" OIDCSettingsColumnAggregateID = "aggregate_id" OIDCSettingsColumnCreationDate = "creation_date" diff --git a/internal/query/projection/oidc_settings_test.go b/internal/query/projection/oidc_settings_test.go index 5aa85758b4..46c90987d9 100644 --- a/internal/query/projection/oidc_settings_test.go +++ b/internal/query/projection/oidc_settings_test.go @@ -38,7 +38,7 @@ func TestOIDCSettingsProjection_reduces(t *testing.T) { executer: &testExecuter{ executions: []execution{ { - expectedStmt: "UPDATE projections.oidc_settings SET (change_date, sequence, access_token_lifetime, id_token_lifetime, refresh_token_idle_expiration, refresh_token_expiration) = ($1, $2, $3, $4, $5, $6) WHERE (aggregate_id = $7) AND (instance_id = $8)", + expectedStmt: "UPDATE projections.oidc_settings2 SET (change_date, sequence, access_token_lifetime, id_token_lifetime, refresh_token_idle_expiration, refresh_token_expiration) = ($1, $2, $3, $4, $5, $6) WHERE (aggregate_id = $7) AND (instance_id = $8)", expectedArgs: []interface{}{ anyArg{}, uint64(15), @@ -71,7 +71,7 @@ func TestOIDCSettingsProjection_reduces(t *testing.T) { executer: &testExecuter{ executions: []execution{ { - expectedStmt: "INSERT INTO projections.oidc_settings (aggregate_id, creation_date, change_date, resource_owner, instance_id, sequence, access_token_lifetime, id_token_lifetime, refresh_token_idle_expiration, refresh_token_expiration) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)", + expectedStmt: "INSERT INTO projections.oidc_settings2 (aggregate_id, creation_date, change_date, resource_owner, instance_id, sequence, access_token_lifetime, id_token_lifetime, refresh_token_idle_expiration, refresh_token_expiration) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)", expectedArgs: []interface{}{ "agg-id", anyArg{}, @@ -106,7 +106,7 @@ func TestOIDCSettingsProjection_reduces(t *testing.T) { executer: &testExecuter{ executions: []execution{ { - expectedStmt: "DELETE FROM projections.oidc_settings WHERE (instance_id = $1)", + expectedStmt: "DELETE FROM projections.oidc_settings2 WHERE (instance_id = $1)", expectedArgs: []interface{}{ "agg-id", },