mirror of
https://github.com/zitadel/zitadel.git
synced 2025-08-11 20:47:32 +00:00
feat: projections auto create their tables (#3324)
* begin init checks for projections * first projection checks * debug notification providers with query fixes * more projections and first index * more projections * more projections * finish projections * fix tests (remove db name) * create tables in setup * fix logging / error handling * add tenant to views * rename tenant to instance_id * add instance_id to all projections * add instance_id to all queries * correct instance_id on projections * add instance_id to failed_events * use separate context for instance * implement features projection * implement features projection * remove unique constraint from setup when migration failed * add error to failed setup event * add instance_id to primary keys * fix IAM projection * remove old migrations folder * fix keysFromYAML test
This commit is contained in:
Livio Amstutz
@@ -8,6 +8,7 @@ import (
|
||||
"regexp"
|
||||
"testing"
|
||||
|
||||
sq "github.com/Masterminds/squirrel"
|
||||
"github.com/lib/pq"
|
||||
"golang.org/x/text/language"
|
||||
|
||||
@@ -16,42 +17,43 @@ import (
|
||||
)
|
||||
|
||||
var (
|
||||
userQuery = `SELECT zitadel.projections.users.id,` +
|
||||
` zitadel.projections.users.creation_date,` +
|
||||
` zitadel.projections.users.change_date,` +
|
||||
` zitadel.projections.users.resource_owner,` +
|
||||
` zitadel.projections.users.sequence,` +
|
||||
` zitadel.projections.users.state,` +
|
||||
` zitadel.projections.users.type,` +
|
||||
` zitadel.projections.users.username,` +
|
||||
userQuery = `SELECT projections.users.id,` +
|
||||
` projections.users.creation_date,` +
|
||||
` projections.users.change_date,` +
|
||||
` projections.users.resource_owner,` +
|
||||
` projections.users.sequence,` +
|
||||
` projections.users.state,` +
|
||||
` projections.users.type,` +
|
||||
` projections.users.username,` +
|
||||
` login_names.loginnames,` +
|
||||
` preferred_login_name.login_name,` +
|
||||
` zitadel.projections.users_humans.user_id,` +
|
||||
` zitadel.projections.users_humans.first_name,` +
|
||||
` zitadel.projections.users_humans.last_name,` +
|
||||
` zitadel.projections.users_humans.nick_name,` +
|
||||
` zitadel.projections.users_humans.display_name,` +
|
||||
` zitadel.projections.users_humans.preferred_language,` +
|
||||
` zitadel.projections.users_humans.gender,` +
|
||||
` zitadel.projections.users_humans.avatar_key,` +
|
||||
` zitadel.projections.users_humans.email,` +
|
||||
` zitadel.projections.users_humans.is_email_verified,` +
|
||||
` zitadel.projections.users_humans.phone,` +
|
||||
` zitadel.projections.users_humans.is_phone_verified,` +
|
||||
` zitadel.projections.users_machines.user_id,` +
|
||||
` zitadel.projections.users_machines.name,` +
|
||||
` zitadel.projections.users_machines.description` +
|
||||
` FROM zitadel.projections.users` +
|
||||
` LEFT JOIN zitadel.projections.users_humans ON zitadel.projections.users.id = zitadel.projections.users_humans.user_id` +
|
||||
` LEFT JOIN zitadel.projections.users_machines ON zitadel.projections.users.id = zitadel.projections.users_machines.user_id` +
|
||||
` projections.users_humans.user_id,` +
|
||||
` projections.users_humans.first_name,` +
|
||||
` projections.users_humans.last_name,` +
|
||||
` projections.users_humans.nick_name,` +
|
||||
` projections.users_humans.display_name,` +
|
||||
` projections.users_humans.preferred_language,` +
|
||||
` projections.users_humans.gender,` +
|
||||
` projections.users_humans.avatar_key,` +
|
||||
` projections.users_humans.email,` +
|
||||
` projections.users_humans.is_email_verified,` +
|
||||
` projections.users_humans.phone,` +
|
||||
` projections.users_humans.is_phone_verified,` +
|
||||
` projections.users_machines.user_id,` +
|
||||
` projections.users_machines.name,` +
|
||||
` projections.users_machines.description` +
|
||||
` FROM projections.users` +
|
||||
` LEFT JOIN projections.users_humans ON projections.users.id = projections.users_humans.user_id` +
|
||||
` LEFT JOIN projections.users_machines ON projections.users.id = projections.users_machines.user_id` +
|
||||
` LEFT JOIN` +
|
||||
` (SELECT login_names.user_id, ARRAY_AGG(login_names.login_name) as loginnames` +
|
||||
` FROM zitadel.projections.login_names as login_names` +
|
||||
` FROM projections.login_names as login_names` +
|
||||
` WHERE login_names.instance_id = $1` +
|
||||
` GROUP BY login_names.user_id) as login_names` +
|
||||
` on login_names.user_id = zitadel.projections.users.id` +
|
||||
` on login_names.user_id = projections.users.id` +
|
||||
` LEFT JOIN` +
|
||||
` (SELECT preferred_login_name.user_id, preferred_login_name.login_name FROM zitadel.projections.login_names as preferred_login_name WHERE preferred_login_name.is_primary = $1) as preferred_login_name` +
|
||||
` on preferred_login_name.user_id = zitadel.projections.users.id`
|
||||
` (SELECT preferred_login_name.user_id, preferred_login_name.login_name FROM projections.login_names as preferred_login_name WHERE preferred_login_name.instance_id = $2 AND preferred_login_name.is_primary = $3) as preferred_login_name` +
|
||||
` on preferred_login_name.user_id = projections.users.id`
|
||||
userCols = []string{
|
||||
"id",
|
||||
"creation_date",
|
||||
@@ -81,22 +83,22 @@ var (
|
||||
"name",
|
||||
"description",
|
||||
}
|
||||
profileQuery = `SELECT zitadel.projections.users.id,` +
|
||||
` zitadel.projections.users.creation_date,` +
|
||||
` zitadel.projections.users.change_date,` +
|
||||
` zitadel.projections.users.resource_owner,` +
|
||||
` zitadel.projections.users.sequence,` +
|
||||
//` zitadel.projections.users.state,` + //TODO:
|
||||
` zitadel.projections.users_humans.user_id,` +
|
||||
` zitadel.projections.users_humans.first_name,` +
|
||||
` zitadel.projections.users_humans.last_name,` +
|
||||
` zitadel.projections.users_humans.nick_name,` +
|
||||
` zitadel.projections.users_humans.display_name,` +
|
||||
` zitadel.projections.users_humans.preferred_language,` +
|
||||
` zitadel.projections.users_humans.gender,` +
|
||||
` zitadel.projections.users_humans.avatar_key` +
|
||||
` FROM zitadel.projections.users` +
|
||||
` LEFT JOIN zitadel.projections.users_humans ON zitadel.projections.users.id = zitadel.projections.users_humans.user_id`
|
||||
profileQuery = `SELECT projections.users.id,` +
|
||||
` projections.users.creation_date,` +
|
||||
` projections.users.change_date,` +
|
||||
` projections.users.resource_owner,` +
|
||||
` projections.users.sequence,` +
|
||||
//` projections.users.state,` + //TODO:
|
||||
` projections.users_humans.user_id,` +
|
||||
` projections.users_humans.first_name,` +
|
||||
` projections.users_humans.last_name,` +
|
||||
` projections.users_humans.nick_name,` +
|
||||
` projections.users_humans.display_name,` +
|
||||
` projections.users_humans.preferred_language,` +
|
||||
` projections.users_humans.gender,` +
|
||||
` projections.users_humans.avatar_key` +
|
||||
` FROM projections.users` +
|
||||
` LEFT JOIN projections.users_humans ON projections.users.id = projections.users_humans.user_id`
|
||||
profileCols = []string{
|
||||
"id",
|
||||
"creation_date",
|
||||
@@ -113,17 +115,17 @@ var (
|
||||
"gender",
|
||||
"avatar_key",
|
||||
}
|
||||
emailQuery = `SELECT zitadel.projections.users.id,` +
|
||||
` zitadel.projections.users.creation_date,` +
|
||||
` zitadel.projections.users.change_date,` +
|
||||
` zitadel.projections.users.resource_owner,` +
|
||||
` zitadel.projections.users.sequence,` +
|
||||
//` zitadel.projections.users.state,` + //TODO:
|
||||
` zitadel.projections.users_humans.user_id,` +
|
||||
` zitadel.projections.users_humans.email,` +
|
||||
` zitadel.projections.users_humans.is_email_verified` +
|
||||
` FROM zitadel.projections.users` +
|
||||
` LEFT JOIN zitadel.projections.users_humans ON zitadel.projections.users.id = zitadel.projections.users_humans.user_id`
|
||||
emailQuery = `SELECT projections.users.id,` +
|
||||
` projections.users.creation_date,` +
|
||||
` projections.users.change_date,` +
|
||||
` projections.users.resource_owner,` +
|
||||
` projections.users.sequence,` +
|
||||
//` projections.users.state,` + //TODO:
|
||||
` projections.users_humans.user_id,` +
|
||||
` projections.users_humans.email,` +
|
||||
` projections.users_humans.is_email_verified` +
|
||||
` FROM projections.users` +
|
||||
` LEFT JOIN projections.users_humans ON projections.users.id = projections.users_humans.user_id`
|
||||
emailCols = []string{
|
||||
"id",
|
||||
"creation_date",
|
||||
@@ -135,17 +137,17 @@ var (
|
||||
"email",
|
||||
"is_email_verified",
|
||||
}
|
||||
phoneQuery = `SELECT zitadel.projections.users.id,` +
|
||||
` zitadel.projections.users.creation_date,` +
|
||||
` zitadel.projections.users.change_date,` +
|
||||
` zitadel.projections.users.resource_owner,` +
|
||||
` zitadel.projections.users.sequence,` +
|
||||
//` zitadel.projections.users.state,` + //TODO:
|
||||
` zitadel.projections.users_humans.user_id,` +
|
||||
` zitadel.projections.users_humans.phone,` +
|
||||
` zitadel.projections.users_humans.is_phone_verified` +
|
||||
` FROM zitadel.projections.users` +
|
||||
` LEFT JOIN zitadel.projections.users_humans ON zitadel.projections.users.id = zitadel.projections.users_humans.user_id`
|
||||
phoneQuery = `SELECT projections.users.id,` +
|
||||
` projections.users.creation_date,` +
|
||||
` projections.users.change_date,` +
|
||||
` projections.users.resource_owner,` +
|
||||
` projections.users.sequence,` +
|
||||
//` projections.users.state,` + //TODO:
|
||||
` projections.users_humans.user_id,` +
|
||||
` projections.users_humans.phone,` +
|
||||
` projections.users_humans.is_phone_verified` +
|
||||
` FROM projections.users` +
|
||||
` LEFT JOIN projections.users_humans ON projections.users.id = projections.users_humans.user_id`
|
||||
phoneCols = []string{
|
||||
"id",
|
||||
"creation_date",
|
||||
@@ -158,24 +160,24 @@ var (
|
||||
"is_phone_verified",
|
||||
}
|
||||
|
||||
userUniqueQuery = `SELECT zitadel.projections.users.id,` +
|
||||
` zitadel.projections.users.state,` +
|
||||
` zitadel.projections.users.username,` +
|
||||
userUniqueQuery = `SELECT projections.users.id,` +
|
||||
` projections.users.state,` +
|
||||
` projections.users.username,` +
|
||||
//` login_names.login_names,` +
|
||||
//` preferred_login_name.login_name,` +
|
||||
` zitadel.projections.users_humans.user_id,` +
|
||||
` zitadel.projections.users_humans.email,` +
|
||||
` zitadel.projections.users_humans.is_email_verified` +
|
||||
` FROM zitadel.projections.users` +
|
||||
` LEFT JOIN zitadel.projections.users_humans ON zitadel.projections.users.id = zitadel.projections.users_humans.user_id`
|
||||
` projections.users_humans.user_id,` +
|
||||
` projections.users_humans.email,` +
|
||||
` projections.users_humans.is_email_verified` +
|
||||
` FROM projections.users` +
|
||||
` LEFT JOIN projections.users_humans ON projections.users.id = projections.users_humans.user_id`
|
||||
//` LEFT JOIN` +
|
||||
//` (SELECT login_names.user_id, ARRAY_AGG(login_names.login_name) as login_names` +
|
||||
//` FROM zitadel.projections.login_names as login_names` +
|
||||
//` FROM projections.login_names as login_names` +
|
||||
//` GROUP BY login_names.user_id) as login_names` +
|
||||
//` on login_names.user_id = zitadel.projections.users.id` +
|
||||
//` on login_names.user_id = projections.users.id` +
|
||||
//` LEFT JOIN` +
|
||||
//` (SELECT preferred_login_name.user_id, preferred_login_name.login_name FROM zitadel.projections.login_names as preferred_login_name WHERE preferred_login_name.is_primary = $1) as preferred_login_name` +
|
||||
//` on preferred_login_name.user_id = zitadel.projections.users.id`
|
||||
//` (SELECT preferred_login_name.user_id, preferred_login_name.login_name FROM projections.login_names as preferred_login_name WHERE preferred_login_name.is_primary = $1) as preferred_login_name` +
|
||||
//` on preferred_login_name.user_id = projections.users.id`
|
||||
userUniqueCols = []string{
|
||||
"id",
|
||||
"state",
|
||||
@@ -187,43 +189,43 @@ var (
|
||||
"email",
|
||||
"is_email_verified",
|
||||
}
|
||||
usersQuery = `SELECT zitadel.projections.users.id,` +
|
||||
` zitadel.projections.users.creation_date,` +
|
||||
` zitadel.projections.users.change_date,` +
|
||||
` zitadel.projections.users.resource_owner,` +
|
||||
` zitadel.projections.users.sequence,` +
|
||||
` zitadel.projections.users.state,` +
|
||||
` zitadel.projections.users.type,` +
|
||||
` zitadel.projections.users.username,` +
|
||||
usersQuery = `SELECT projections.users.id,` +
|
||||
` projections.users.creation_date,` +
|
||||
` projections.users.change_date,` +
|
||||
` projections.users.resource_owner,` +
|
||||
` projections.users.sequence,` +
|
||||
` projections.users.state,` +
|
||||
` projections.users.type,` +
|
||||
` projections.users.username,` +
|
||||
` login_names.loginnames,` +
|
||||
` preferred_login_name.login_name,` +
|
||||
` zitadel.projections.users_humans.user_id,` +
|
||||
` zitadel.projections.users_humans.first_name,` +
|
||||
` zitadel.projections.users_humans.last_name,` +
|
||||
` zitadel.projections.users_humans.nick_name,` +
|
||||
` zitadel.projections.users_humans.display_name,` +
|
||||
` zitadel.projections.users_humans.preferred_language,` +
|
||||
` zitadel.projections.users_humans.gender,` +
|
||||
` zitadel.projections.users_humans.avatar_key,` +
|
||||
` zitadel.projections.users_humans.email,` +
|
||||
` zitadel.projections.users_humans.is_email_verified,` +
|
||||
` zitadel.projections.users_humans.phone,` +
|
||||
` zitadel.projections.users_humans.is_phone_verified,` +
|
||||
` zitadel.projections.users_machines.user_id,` +
|
||||
` zitadel.projections.users_machines.name,` +
|
||||
` zitadel.projections.users_machines.description,` +
|
||||
` projections.users_humans.user_id,` +
|
||||
` projections.users_humans.first_name,` +
|
||||
` projections.users_humans.last_name,` +
|
||||
` projections.users_humans.nick_name,` +
|
||||
` projections.users_humans.display_name,` +
|
||||
` projections.users_humans.preferred_language,` +
|
||||
` projections.users_humans.gender,` +
|
||||
` projections.users_humans.avatar_key,` +
|
||||
` projections.users_humans.email,` +
|
||||
` projections.users_humans.is_email_verified,` +
|
||||
` projections.users_humans.phone,` +
|
||||
` projections.users_humans.is_phone_verified,` +
|
||||
` projections.users_machines.user_id,` +
|
||||
` projections.users_machines.name,` +
|
||||
` projections.users_machines.description,` +
|
||||
` COUNT(*) OVER ()` +
|
||||
` FROM zitadel.projections.users` +
|
||||
` LEFT JOIN zitadel.projections.users_humans ON zitadel.projections.users.id = zitadel.projections.users_humans.user_id` +
|
||||
` LEFT JOIN zitadel.projections.users_machines ON zitadel.projections.users.id = zitadel.projections.users_machines.user_id` +
|
||||
` FROM projections.users` +
|
||||
` LEFT JOIN projections.users_humans ON projections.users.id = projections.users_humans.user_id` +
|
||||
` LEFT JOIN projections.users_machines ON projections.users.id = projections.users_machines.user_id` +
|
||||
` LEFT JOIN` +
|
||||
` (SELECT login_names.user_id, ARRAY_AGG(login_names.login_name) as loginnames` +
|
||||
` FROM zitadel.projections.login_names as login_names` +
|
||||
` FROM projections.login_names as login_names` +
|
||||
` GROUP BY login_names.user_id) as login_names` +
|
||||
` on login_names.user_id = zitadel.projections.users.id` +
|
||||
` on login_names.user_id = projections.users.id` +
|
||||
` LEFT JOIN` +
|
||||
` (SELECT preferred_login_name.user_id, preferred_login_name.login_name FROM zitadel.projections.login_names as preferred_login_name WHERE preferred_login_name.is_primary = $1) as preferred_login_name` +
|
||||
` on preferred_login_name.user_id = zitadel.projections.users.id`
|
||||
` (SELECT preferred_login_name.user_id, preferred_login_name.login_name FROM projections.login_names as preferred_login_name WHERE preferred_login_name.is_primary = $1) as preferred_login_name` +
|
||||
` on preferred_login_name.user_id = projections.users.id`
|
||||
usersCols = []string{
|
||||
"id",
|
||||
"creation_date",
|
||||
@@ -268,8 +270,10 @@ func Test_UserPrepares(t *testing.T) {
|
||||
object interface{}
|
||||
}{
|
||||
{
|
||||
name: "prepareUserQuery no result",
|
||||
prepare: prepareUserQuery,
|
||||
name: "prepareUserQuery no result",
|
||||
prepare: func() (sq.SelectBuilder, func(*sql.Row) (*User, error)) {
|
||||
return prepareUserQuery("instanceID")
|
||||
},
|
||||
want: want{
|
||||
sqlExpectations: mockQuery(
|
||||
regexp.QuoteMeta(userQuery),
|
||||
@@ -286,8 +290,10 @@ func Test_UserPrepares(t *testing.T) {
|
||||
object: (*User)(nil),
|
||||
},
|
||||
{
|
||||
name: "prepareUserQuery human found",
|
||||
prepare: prepareUserQuery,
|
||||
name: "prepareUserQuery human found",
|
||||
prepare: func() (sq.SelectBuilder, func(*sql.Row) (*User, error)) {
|
||||
return prepareUserQuery("instanceID")
|
||||
},
|
||||
want: want{
|
||||
sqlExpectations: mockQuery(
|
||||
regexp.QuoteMeta(userQuery),
|
||||
@@ -350,8 +356,10 @@ func Test_UserPrepares(t *testing.T) {
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "prepareUserQuery machine found",
|
||||
prepare: prepareUserQuery,
|
||||
name: "prepareUserQuery machine found",
|
||||
prepare: func() (sq.SelectBuilder, func(*sql.Row) (*User, error)) {
|
||||
return prepareUserQuery("instanceID")
|
||||
},
|
||||
want: want{
|
||||
sqlExpectations: mockQuery(
|
||||
regexp.QuoteMeta(userQuery),
|
||||
@@ -405,8 +413,10 @@ func Test_UserPrepares(t *testing.T) {
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "prepareUserQuery sql err",
|
||||
prepare: prepareUserQuery,
|
||||
name: "prepareUserQuery sql err",
|
||||
prepare: func() (sq.SelectBuilder, func(*sql.Row) (*User, error)) {
|
||||
return prepareUserQuery("instanceID")
|
||||
},
|
||||
want: want{
|
||||
sqlExpectations: mockQueryErr(
|
||||
regexp.QuoteMeta(userQuery),
|
||||
|
||||
Reference in New Issue
Block a user