TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-03-01 02:07:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(projection): new version of oidc_settings (#4811)

Browse Source 
There was a field delete some commits back but the projection version was not updated, that's why we update now
This commit is contained in:
Silvan 2022-12-02 13:54:28 +01:00 committed by GitHub
parent 0175076dfc
commit e7137dba60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
internal/query/oidc_settings_test.go
View File

@ -28,15 +28,15 @@ func Test_OIDCConfigsPrepares(t *testing.T) {
prepare: prepareOIDCSettingsQuery, prepare: prepareOIDCSettingsQuery,
want: want{ want: want{
sqlExpectations: mockQueries( sqlExpectations: mockQueries(
`SELECT projections.oidc_settings.aggregate_id,`+ `SELECT projections.oidc_settings2.aggregate_id,`+
` projections.oidc_settings.creation_date,`+ ` projections.oidc_settings2.creation_date,`+
` projections.oidc_settings.change_date,`+ ` projections.oidc_settings2.change_date,`+
` projections.oidc_settings.resource_owner,`+ ` projections.oidc_settings2.resource_owner,`+
` projections.oidc_settings.sequence,`+ ` projections.oidc_settings2.sequence,`+
` projections.oidc_settings.access_token_lifetime,`+ ` projections.oidc_settings2.access_token_lifetime,`+
` projections.oidc_settings.id_token_lifetime,`+ ` projections.oidc_settings2.id_token_lifetime,`+
` projections.oidc_settings.refresh_token_idle_expiration,`+ ` projections.oidc_settings2.refresh_token_idle_expiration,`+
` projections.oidc_settings.refresh_token_expiration`+ ` projections.oidc_settings2.refresh_token_expiration`+
` FROM projections.oidc_settings`, ` FROM projections.oidc_settings`,
nil, nil,
nil, nil,
@ -55,15 +55,15 @@ func Test_OIDCConfigsPrepares(t *testing.T) {
prepare: prepareOIDCSettingsQuery, prepare: prepareOIDCSettingsQuery,
want: want{ want: want{
sqlExpectations: mockQuery( sqlExpectations: mockQuery(
regexp.QuoteMeta(`SELECT projections.oidc_settings.aggregate_id,`+ regexp.QuoteMeta(`SELECT projections.oidc_settings2.aggregate_id,`+
` projections.oidc_settings.creation_date,`+ ` projections.oidc_settings2.creation_date,`+
` projections.oidc_settings.change_date,`+ ` projections.oidc_settings2.change_date,`+
` projections.oidc_settings.resource_owner,`+ ` projections.oidc_settings2.resource_owner,`+
` projections.oidc_settings.sequence,`+ ` projections.oidc_settings2.sequence,`+
` projections.oidc_settings.access_token_lifetime,`+ ` projections.oidc_settings2.access_token_lifetime,`+
` projections.oidc_settings.id_token_lifetime,`+ ` projections.oidc_settings2.id_token_lifetime,`+
` projections.oidc_settings.refresh_token_idle_expiration,`+ ` projections.oidc_settings2.refresh_token_idle_expiration,`+
` projections.oidc_settings.refresh_token_expiration`+ ` projections.oidc_settings2.refresh_token_expiration`+
` FROM projections.oidc_settings`), ` FROM projections.oidc_settings`),
[]string{ []string{
"aggregate_id", "aggregate_id",
@ -106,15 +106,15 @@ func Test_OIDCConfigsPrepares(t *testing.T) {
prepare: prepareOIDCSettingsQuery, prepare: prepareOIDCSettingsQuery,
want: want{ want: want{
sqlExpectations: mockQueryErr( sqlExpectations: mockQueryErr(
regexp.QuoteMeta(`SELECT projections.oidc_settings.aggregate_id,`+ regexp.QuoteMeta(`SELECT projections.oidc_settings2.aggregate_id,`+
` projections.oidc_settings.creation_date,`+ ` projections.oidc_settings2.creation_date,`+
` projections.oidc_settings.change_date,`+ ` projections.oidc_settings2.change_date,`+
` projections.oidc_settings.resource_owner,`+ ` projections.oidc_settings2.resource_owner,`+
` projections.oidc_settings.sequence,`+ ` projections.oidc_settings2.sequence,`+
` projections.oidc_settings.access_token_lifetime,`+ ` projections.oidc_settings2.access_token_lifetime,`+
` projections.oidc_settings.id_token_lifetime,`+ ` projections.oidc_settings2.id_token_lifetime,`+
` projections.oidc_settings.refresh_token_idle_expiration,`+ ` projections.oidc_settings2.refresh_token_idle_expiration,`+
` projections.oidc_settings.refresh_token_expiration`+ ` projections.oidc_settings2.refresh_token_expiration`+
` FROM projections.oidc_settings`), ` FROM projections.oidc_settings`),
sql.ErrConnDone, sql.ErrConnDone,
), ),

2
internal/query/projection/oidc_settings.go
View File

@ -11,7 +11,7 @@ import (
) )
const ( const (
OIDCSettingsProjectionTable = "projections.oidc_settings" OIDCSettingsProjectionTable = "projections.oidc_settings2"
OIDCSettingsColumnAggregateID = "aggregate_id" OIDCSettingsColumnAggregateID = "aggregate_id"
OIDCSettingsColumnCreationDate = "creation_date" OIDCSettingsColumnCreationDate = "creation_date"

6
internal/query/projection/oidc_settings_test.go
View File

@ -38,7 +38,7 @@ func TestOIDCSettingsProjection_reduces(t *testing.T) {
executer: &testExecuter{ executer: &testExecuter{
executions: []execution{ 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{}{ expectedArgs: []interface{}{
anyArg{}, anyArg{},
uint64(15), uint64(15),
@ -71,7 +71,7 @@ func TestOIDCSettingsProjection_reduces(t *testing.T) {
executer: &testExecuter{ executer: &testExecuter{
executions: []execution{ 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{}{ expectedArgs: []interface{}{
"agg-id", "agg-id",
anyArg{}, anyArg{},
@ -106,7 +106,7 @@ func TestOIDCSettingsProjection_reduces(t *testing.T) {
executer: &testExecuter{ executer: &testExecuter{
executions: []execution{ executions: []execution{
{ {
expectedStmt: "DELETE FROM projections.oidc_settings WHERE (instance_id = $1)", expectedStmt: "DELETE FROM projections.oidc_settings2 WHERE (instance_id = $1)",
expectedArgs: []interface{}{ expectedArgs: []interface{}{
"agg-id", "agg-id",
}, },