TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-04-21 13:41:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(projections): unique index names (#4439)

Browse Source
This commit is contained in:
Silvan 2022-09-22 15:18:52 +02:00 committed by GitHub
parent 7aef0ccfee
commit 2bc19f55b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
internal/query/projection/app.go
View File

@ -84,8 +84,8 @@ func newAppProjection(ctx context.Context, config crdb.StatementHandlerConfig) *
crdb.NewColumn(AppColumnSequence, crdb.ColumnTypeInt64), crdb.NewColumn(AppColumnSequence, crdb.ColumnTypeInt64),
}, },
crdb.NewPrimaryKey(AppColumnInstanceID, AppColumnID), crdb.NewPrimaryKey(AppColumnInstanceID, AppColumnID),
crdb.WithIndex(crdb.NewIndex("app_project_id_idx", []string{AppColumnProjectID})), crdb.WithIndex(crdb.NewIndex("app3_project_id_idx", []string{AppColumnProjectID})),
crdb.WithConstraint(crdb.NewConstraint("app_id_unique", []string{AppColumnID})), crdb.WithConstraint(crdb.NewConstraint("app3_id_unique", []string{AppColumnID})),
), ),
crdb.NewSuffixedTable([]*crdb.Column{ crdb.NewSuffixedTable([]*crdb.Column{
crdb.NewColumn(AppAPIConfigColumnAppID, crdb.ColumnTypeText), crdb.NewColumn(AppAPIConfigColumnAppID, crdb.ColumnTypeText),
@ -96,8 +96,8 @@ func newAppProjection(ctx context.Context, config crdb.StatementHandlerConfig) *
}, },
crdb.NewPrimaryKey(AppAPIConfigColumnInstanceID, AppAPIConfigColumnAppID), crdb.NewPrimaryKey(AppAPIConfigColumnInstanceID, AppAPIConfigColumnAppID),
appAPITableSuffix, appAPITableSuffix,
crdb.WithForeignKey(crdb.NewForeignKeyOfPublicKeys("fk_api_ref_apps")), crdb.WithForeignKey(crdb.NewForeignKeyOfPublicKeys("fk_api_ref_apps3")),
crdb.WithIndex(crdb.NewIndex("api_client_id_idx", []string{AppAPIConfigColumnClientID})), crdb.WithIndex(crdb.NewIndex("api_client_id3_idx", []string{AppAPIConfigColumnClientID})),
), ),
crdb.NewSuffixedTable([]*crdb.Column{ crdb.NewSuffixedTable([]*crdb.Column{
crdb.NewColumn(AppOIDCConfigColumnAppID, crdb.ColumnTypeText), crdb.NewColumn(AppOIDCConfigColumnAppID, crdb.ColumnTypeText),
@ -121,8 +121,8 @@ func newAppProjection(ctx context.Context, config crdb.StatementHandlerConfig) *
}, },
crdb.NewPrimaryKey(AppOIDCConfigColumnInstanceID, AppOIDCConfigColumnAppID), crdb.NewPrimaryKey(AppOIDCConfigColumnInstanceID, AppOIDCConfigColumnAppID),
appOIDCTableSuffix, appOIDCTableSuffix,
crdb.WithForeignKey(crdb.NewForeignKeyOfPublicKeys("fk_oidc_ref_apps")), crdb.WithForeignKey(crdb.NewForeignKeyOfPublicKeys("fk_oidc_ref_apps3")),
crdb.WithIndex(crdb.NewIndex("oidc_client_id_idx", []string{AppOIDCConfigColumnClientID})), crdb.WithIndex(crdb.NewIndex("oidc_client_id_idx3", []string{AppOIDCConfigColumnClientID})),
), ),
crdb.NewSuffixedTable([]*crdb.Column{ crdb.NewSuffixedTable([]*crdb.Column{
crdb.NewColumn(AppSAMLConfigColumnAppID, crdb.ColumnTypeText), crdb.NewColumn(AppSAMLConfigColumnAppID, crdb.ColumnTypeText),
@ -133,8 +133,8 @@ func newAppProjection(ctx context.Context, config crdb.StatementHandlerConfig) *
}, },
crdb.NewPrimaryKey(AppSAMLConfigColumnInstanceID, AppSAMLConfigColumnAppID), crdb.NewPrimaryKey(AppSAMLConfigColumnInstanceID, AppSAMLConfigColumnAppID),
appSAMLTableSuffix, appSAMLTableSuffix,
crdb.WithForeignKey(crdb.NewForeignKeyOfPublicKeys("fk_saml_ref_apps")), crdb.WithForeignKey(crdb.NewForeignKeyOfPublicKeys("fk_saml_ref_apps3")),
crdb.WithIndex(crdb.NewIndex("saml_entity_id_idx", []string{AppSAMLConfigColumnEntityID})), crdb.WithIndex(crdb.NewIndex("saml_entity_id_idx3", []string{AppSAMLConfigColumnEntityID})),
), ),
) )
p.StatementHandler = crdb.NewStatementHandler(ctx, config) p.StatementHandler = crdb.NewStatementHandler(ctx, config)

8
internal/query/projection/key.go
View File

@ -68,7 +68,7 @@ func newKeyProjection(ctx context.Context, config crdb.StatementHandlerConfig, k
crdb.NewColumn(KeyColumnUse, crdb.ColumnTypeEnum, crdb.Default(0)), crdb.NewColumn(KeyColumnUse, crdb.ColumnTypeEnum, crdb.Default(0)),
}, },
crdb.NewPrimaryKey(KeyColumnInstanceID, KeyColumnID), crdb.NewPrimaryKey(KeyColumnInstanceID, KeyColumnID),
crdb.WithConstraint(crdb.NewConstraint("key_id_unique", []string{KeyColumnID})), crdb.WithConstraint(crdb.NewConstraint("key3_id_unique", []string{KeyColumnID})),
), ),
crdb.NewSuffixedTable([]*crdb.Column{ crdb.NewSuffixedTable([]*crdb.Column{
crdb.NewColumn(KeyPrivateColumnID, crdb.ColumnTypeText), crdb.NewColumn(KeyPrivateColumnID, crdb.ColumnTypeText),
@ -78,7 +78,7 @@ func newKeyProjection(ctx context.Context, config crdb.StatementHandlerConfig, k
}, },
crdb.NewPrimaryKey(KeyPrivateColumnInstanceID, KeyPrivateColumnID), crdb.NewPrimaryKey(KeyPrivateColumnInstanceID, KeyPrivateColumnID),
privateKeyTableSuffix, privateKeyTableSuffix,
crdb.WithForeignKey(crdb.NewForeignKeyOfPublicKeys("fk_private_ref_keys")), crdb.WithForeignKey(crdb.NewForeignKeyOfPublicKeys("fk_private_ref_keys3")),
), ),
crdb.NewSuffixedTable([]*crdb.Column{ crdb.NewSuffixedTable([]*crdb.Column{
crdb.NewColumn(KeyPublicColumnID, crdb.ColumnTypeText), crdb.NewColumn(KeyPublicColumnID, crdb.ColumnTypeText),
@ -88,7 +88,7 @@ func newKeyProjection(ctx context.Context, config crdb.StatementHandlerConfig, k
}, },
crdb.NewPrimaryKey(KeyPublicColumnInstanceID, KeyPublicColumnID), crdb.NewPrimaryKey(KeyPublicColumnInstanceID, KeyPublicColumnID),
publicKeyTableSuffix, publicKeyTableSuffix,
crdb.WithForeignKey(crdb.NewForeignKeyOfPublicKeys("fk_public_ref_keys")), crdb.WithForeignKey(crdb.NewForeignKeyOfPublicKeys("fk_public_ref_keys3")),
), ),
crdb.NewSuffixedTable([]*crdb.Column{ crdb.NewSuffixedTable([]*crdb.Column{
crdb.NewColumn(CertificateColumnID, crdb.ColumnTypeText), crdb.NewColumn(CertificateColumnID, crdb.ColumnTypeText),
@ -98,7 +98,7 @@ func newKeyProjection(ctx context.Context, config crdb.StatementHandlerConfig, k
}, },
crdb.NewPrimaryKey(CertificateColumnInstanceID, CertificateColumnID), crdb.NewPrimaryKey(CertificateColumnInstanceID, CertificateColumnID),
certificateTableSuffix, certificateTableSuffix,
crdb.WithForeignKey(crdb.NewForeignKeyOfPublicKeys("fk_certificate_ref_keys")), crdb.WithForeignKey(crdb.NewForeignKeyOfPublicKeys("fk_certificate_ref_keys3")),
), ),
) )
p.encryptionAlgorithm = keyEncryptionAlgorithm p.encryptionAlgorithm = keyEncryptionAlgorithm