TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-04-14 20:36:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: handle user metadata projection correctly (#4098)

Browse Source
This commit is contained in:
Livio Spring 2022-08-03 09:50:23 +02:00 committed by GitHub
parent 6b30be77e6
commit dba0fdcf7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/query/projection/user_metadata.go
View File

@ -11,7 +11,7 @@ import (
) )
const ( const (
UserMetadataProjectionTable = "projections.user_metadata" UserMetadataProjectionTable = "projections.user_metadata2"
UserMetadataColumnUserID = "user_id" UserMetadataColumnUserID = "user_id"
UserMetadataColumnCreationDate = "creation_date" UserMetadataColumnCreationDate = "creation_date"
@ -42,7 +42,7 @@ func newUserMetadataProjection(ctx context.Context, config crdb.StatementHandler
crdb.NewColumn(UserMetadataColumnKey, crdb.ColumnTypeText), crdb.NewColumn(UserMetadataColumnKey, crdb.ColumnTypeText),
crdb.NewColumn(UserMetadataColumnValue, crdb.ColumnTypeBytes, crdb.Nullable()), crdb.NewColumn(UserMetadataColumnValue, crdb.ColumnTypeBytes, crdb.Nullable()),
}, },
crdb.NewPrimaryKey(UserMetadataColumnInstanceID, UserMetadataColumnUserID), crdb.NewPrimaryKey(UserMetadataColumnInstanceID, UserMetadataColumnUserID, UserMetadataColumnKey),
crdb.WithIndex(crdb.NewIndex("ro_idx", []string{UserGrantResourceOwner})), crdb.WithIndex(crdb.NewIndex("ro_idx", []string{UserGrantResourceOwner})),
), ),
) )

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

@ -41,7 +41,7 @@ func TestUserMetadataProjection_reduces(t *testing.T) {
executer: &testExecuter{ executer: &testExecuter{
executions: []execution{ executions: []execution{
{ {
expectedStmt: "UPSERT INTO projections.user_metadata (user_id, resource_owner, instance_id, creation_date, change_date, sequence, key, value) VALUES ($1, $2, $3, $4, $5, $6, $7, $8)", expectedStmt: "UPSERT INTO projections.user_metadata2 (user_id, resource_owner, instance_id, creation_date, change_date, sequence, key, value) VALUES ($1, $2, $3, $4, $5, $6, $7, $8)",
expectedArgs: []interface{}{ expectedArgs: []interface{}{
"agg-id", "agg-id",
"ro-id", "ro-id",
@ -77,7 +77,7 @@ func TestUserMetadataProjection_reduces(t *testing.T) {
executer: &testExecuter{ executer: &testExecuter{
executions: []execution{ executions: []execution{
{ {
expectedStmt: "DELETE FROM projections.user_metadata WHERE (user_id = $1) AND (key = $2)", expectedStmt: "DELETE FROM projections.user_metadata2 WHERE (user_id = $1) AND (key = $2)",
expectedArgs: []interface{}{ expectedArgs: []interface{}{
"agg-id", "agg-id",
"key", "key",
@ -105,7 +105,7 @@ func TestUserMetadataProjection_reduces(t *testing.T) {
executer: &testExecuter{ executer: &testExecuter{
executions: []execution{ executions: []execution{
{ {
expectedStmt: "DELETE FROM projections.user_metadata WHERE (user_id = $1)", expectedStmt: "DELETE FROM projections.user_metadata2 WHERE (user_id = $1)",
expectedArgs: []interface{}{ expectedArgs: []interface{}{
"agg-id", "agg-id",
}, },
@ -132,7 +132,7 @@ func TestUserMetadataProjection_reduces(t *testing.T) {
executer: &testExecuter{ executer: &testExecuter{
executions: []execution{ executions: []execution{
{ {
expectedStmt: "DELETE FROM projections.user_metadata WHERE (user_id = $1)", expectedStmt: "DELETE FROM projections.user_metadata2 WHERE (user_id = $1)",
expectedArgs: []interface{}{ expectedArgs: []interface{}{
"agg-id", "agg-id",
}, },

28
internal/query/user_metadata_test.go
View File

@ -12,13 +12,13 @@ import (
) )
var ( var (
userMetadataQuery = `SELECT projections.user_metadata.creation_date,` + userMetadataQuery = `SELECT projections.user_metadata2.creation_date,` +
` projections.user_metadata.change_date,` + ` projections.user_metadata2.change_date,` +
` projections.user_metadata.resource_owner,` + ` projections.user_metadata2.resource_owner,` +
` projections.user_metadata.sequence,` + ` projections.user_metadata2.sequence,` +
` projections.user_metadata.key,` + ` projections.user_metadata2.key,` +
` projections.user_metadata.value` + ` projections.user_metadata2.value` +
` FROM projections.user_metadata` ` FROM projections.user_metadata2`
userMetadataCols = []string{ userMetadataCols = []string{
"creation_date", "creation_date",
"change_date", "change_date",
@ -27,14 +27,14 @@ var (
"key", "key",
"value", "value",
} }
userMetadataListQuery = `SELECT projections.user_metadata.creation_date,` + userMetadataListQuery = `SELECT projections.user_metadata2.creation_date,` +
` projections.user_metadata.change_date,` + ` projections.user_metadata2.change_date,` +
` projections.user_metadata.resource_owner,` + ` projections.user_metadata2.resource_owner,` +
` projections.user_metadata.sequence,` + ` projections.user_metadata2.sequence,` +
` projections.user_metadata.key,` + ` projections.user_metadata2.key,` +
` projections.user_metadata.value,` + ` projections.user_metadata2.value,` +
` COUNT(*) OVER ()` + ` COUNT(*) OVER ()` +
` FROM projections.user_metadata` ` FROM projections.user_metadata2`
userMetadataListCols = []string{ userMetadataListCols = []string{
"creation_date", "creation_date",
"change_date", "change_date",