mirror of
https://github.com/zitadel/zitadel.git
synced 2025-08-12 03:37:34 +00:00
feat(database): support for postgres (#3998)
* beginning with postgres statements * try pgx * use pgx * database * init works for postgres * arrays working * init for cockroach * init * start tests * tests * TESTS * ch * ch * chore: use go 1.18 * read stmts * fix typo * tests * connection string * add missing error handler * cleanup * start all apis * go mod tidy * old update * switch back to minute * on conflict * replace string slice with `database.StringArray` in db models * fix tests and start * update go version in dockerfile * setup go * clean up * remove notification migration * update * docs: add deploy guide for postgres * fix: revert sonyflake * use `database.StringArray` for daos * use `database.StringArray` every where * new tables * index naming, metadata primary key, project grant role key type * docs(postgres): change to beta * chore: correct compose * fix(defaults): add empty postgres config * refactor: remove unused code * docs: add postgres to self hosted * fix broken link * so? * change title * add mdx to link * fix stmt * update goreleaser in test-code * docs: improve postgres example * update more projections * fix: add beta log for postgres * revert index name change * prerelease * fix: add sequence to v1 "reduce paniced" * log if nil * add logging * fix: log output * fix(import): check if org exists and user * refactor: imports * fix(user): ignore malformed events * refactor: method naming * fix: test * refactor: correct errors.Is call * ci: don't build dev binaries on main * fix(go releaser): update version to 1.11.0 * fix(user): projection should not break * fix(user): handle error properly * docs: correct config example * Update .releaserc.js * Update .releaserc.js Co-authored-by: Livio Amstutz <livio.a@gmail.com> Co-authored-by: Elio Bischof <eliobischof@gmail.com>
This commit is contained in:
@@ -8,7 +8,7 @@ import (
|
||||
"regexp"
|
||||
"testing"
|
||||
|
||||
"github.com/lib/pq"
|
||||
"github.com/zitadel/zitadel/internal/database"
|
||||
)
|
||||
|
||||
var (
|
||||
@@ -23,8 +23,8 @@ var (
|
||||
", memberships.id" +
|
||||
", memberships.project_id" +
|
||||
", memberships.grant_id" +
|
||||
", projections.project_grants.granted_org_id" +
|
||||
", projections.projects.name" +
|
||||
", projections.project_grants2.granted_org_id" +
|
||||
", projections.projects2.name" +
|
||||
", projections.orgs.name" +
|
||||
", COUNT(*) OVER ()" +
|
||||
" FROM (" +
|
||||
@@ -36,10 +36,10 @@ var (
|
||||
", members.resource_owner" +
|
||||
", members.instance_id" +
|
||||
", members.org_id" +
|
||||
", NULL::STRING AS id" +
|
||||
", NULL::STRING AS project_id" +
|
||||
", NULL::STRING AS grant_id" +
|
||||
" FROM projections.org_members as members" +
|
||||
", NULL::TEXT AS id" +
|
||||
", NULL::TEXT AS project_id" +
|
||||
", NULL::TEXT AS grant_id" +
|
||||
" FROM projections.org_members2 AS members" +
|
||||
" UNION ALL " +
|
||||
"SELECT members.user_id" +
|
||||
", members.roles" +
|
||||
@@ -48,11 +48,11 @@ var (
|
||||
", members.sequence" +
|
||||
", members.resource_owner" +
|
||||
", members.instance_id" +
|
||||
", NULL::STRING AS org_id" +
|
||||
", NULL::TEXT AS org_id" +
|
||||
", members.id" +
|
||||
", NULL::STRING AS project_id" +
|
||||
", NULL::STRING AS grant_id" +
|
||||
" FROM projections.instance_members as members" +
|
||||
", NULL::TEXT AS project_id" +
|
||||
", NULL::TEXT AS grant_id" +
|
||||
" FROM projections.instance_members2 AS members" +
|
||||
" UNION ALL " +
|
||||
"SELECT members.user_id" +
|
||||
", members.roles" +
|
||||
@@ -61,11 +61,11 @@ var (
|
||||
", members.sequence" +
|
||||
", members.resource_owner" +
|
||||
", members.instance_id" +
|
||||
", NULL::STRING AS org_id" +
|
||||
", NULL::STRING AS id" +
|
||||
", NULL::TEXT AS org_id" +
|
||||
", NULL::TEXT AS id" +
|
||||
", members.project_id" +
|
||||
", NULL::STRING AS grant_id" +
|
||||
" FROM projections.project_members as members" +
|
||||
", NULL::TEXT AS grant_id" +
|
||||
" FROM projections.project_members2 AS members" +
|
||||
" UNION ALL " +
|
||||
"SELECT members.user_id" +
|
||||
", members.roles" +
|
||||
@@ -74,15 +74,15 @@ var (
|
||||
", members.sequence" +
|
||||
", members.resource_owner" +
|
||||
", members.instance_id" +
|
||||
", NULL::STRING AS org_id" +
|
||||
", NULL::STRING AS id" +
|
||||
", NULL::TEXT AS org_id" +
|
||||
", NULL::TEXT AS id" +
|
||||
", members.project_id" +
|
||||
", members.grant_id" +
|
||||
" FROM projections.project_grant_members as members" +
|
||||
" FROM projections.project_grant_members2 AS members" +
|
||||
") AS memberships" +
|
||||
" LEFT JOIN projections.projects ON memberships.project_id = projections.projects.id" +
|
||||
" LEFT JOIN projections.projects2 ON memberships.project_id = projections.projects2.id" +
|
||||
" LEFT JOIN projections.orgs ON memberships.org_id = projections.orgs.id" +
|
||||
" LEFT JOIN projections.project_grants ON memberships.grant_id = projections.project_grants.grant_id")
|
||||
" LEFT JOIN projections.project_grants2 ON memberships.grant_id = projections.project_grants2.grant_id")
|
||||
membershipCols = []string{
|
||||
"user_id",
|
||||
"roles",
|
||||
@@ -134,7 +134,7 @@ func Test_MembershipPrepares(t *testing.T) {
|
||||
[][]driver.Value{
|
||||
{
|
||||
"user-id",
|
||||
pq.StringArray{"role1", "role2"},
|
||||
database.StringArray{"role1", "role2"},
|
||||
testNow,
|
||||
testNow,
|
||||
uint64(20211202),
|
||||
@@ -157,7 +157,7 @@ func Test_MembershipPrepares(t *testing.T) {
|
||||
Memberships: []*Membership{
|
||||
{
|
||||
UserID: "user-id",
|
||||
Roles: []string{"role1", "role2"},
|
||||
Roles: database.StringArray{"role1", "role2"},
|
||||
CreationDate: testNow,
|
||||
ChangeDate: testNow,
|
||||
Sequence: 20211202,
|
||||
@@ -177,7 +177,7 @@ func Test_MembershipPrepares(t *testing.T) {
|
||||
[][]driver.Value{
|
||||
{
|
||||
"user-id",
|
||||
pq.StringArray{"role1", "role2"},
|
||||
database.StringArray{"role1", "role2"},
|
||||
testNow,
|
||||
testNow,
|
||||
uint64(20211202),
|
||||
@@ -200,7 +200,7 @@ func Test_MembershipPrepares(t *testing.T) {
|
||||
Memberships: []*Membership{
|
||||
{
|
||||
UserID: "user-id",
|
||||
Roles: []string{"role1", "role2"},
|
||||
Roles: database.StringArray{"role1", "role2"},
|
||||
CreationDate: testNow,
|
||||
ChangeDate: testNow,
|
||||
Sequence: 20211202,
|
||||
@@ -220,7 +220,7 @@ func Test_MembershipPrepares(t *testing.T) {
|
||||
[][]driver.Value{
|
||||
{
|
||||
"user-id",
|
||||
pq.StringArray{"role1", "role2"},
|
||||
database.StringArray{"role1", "role2"},
|
||||
testNow,
|
||||
testNow,
|
||||
uint64(20211202),
|
||||
@@ -243,7 +243,7 @@ func Test_MembershipPrepares(t *testing.T) {
|
||||
Memberships: []*Membership{
|
||||
{
|
||||
UserID: "user-id",
|
||||
Roles: []string{"role1", "role2"},
|
||||
Roles: database.StringArray{"role1", "role2"},
|
||||
CreationDate: testNow,
|
||||
ChangeDate: testNow,
|
||||
Sequence: 20211202,
|
||||
@@ -263,7 +263,7 @@ func Test_MembershipPrepares(t *testing.T) {
|
||||
[][]driver.Value{
|
||||
{
|
||||
"user-id",
|
||||
pq.StringArray{"role1", "role2"},
|
||||
database.StringArray{"role1", "role2"},
|
||||
testNow,
|
||||
testNow,
|
||||
uint64(20211202),
|
||||
@@ -286,7 +286,7 @@ func Test_MembershipPrepares(t *testing.T) {
|
||||
Memberships: []*Membership{
|
||||
{
|
||||
UserID: "user-id",
|
||||
Roles: []string{"role1", "role2"},
|
||||
Roles: database.StringArray{"role1", "role2"},
|
||||
CreationDate: testNow,
|
||||
ChangeDate: testNow,
|
||||
Sequence: 20211202,
|
||||
@@ -311,7 +311,7 @@ func Test_MembershipPrepares(t *testing.T) {
|
||||
[][]driver.Value{
|
||||
{
|
||||
"user-id",
|
||||
pq.StringArray{"role1", "role2"},
|
||||
database.StringArray{"role1", "role2"},
|
||||
testNow,
|
||||
testNow,
|
||||
uint64(20211202),
|
||||
@@ -326,7 +326,7 @@ func Test_MembershipPrepares(t *testing.T) {
|
||||
},
|
||||
{
|
||||
"user-id",
|
||||
pq.StringArray{"role1", "role2"},
|
||||
database.StringArray{"role1", "role2"},
|
||||
testNow,
|
||||
testNow,
|
||||
uint64(20211202),
|
||||
@@ -341,7 +341,7 @@ func Test_MembershipPrepares(t *testing.T) {
|
||||
},
|
||||
{
|
||||
"user-id",
|
||||
pq.StringArray{"role1", "role2"},
|
||||
database.StringArray{"role1", "role2"},
|
||||
testNow,
|
||||
testNow,
|
||||
uint64(20211202),
|
||||
@@ -356,7 +356,7 @@ func Test_MembershipPrepares(t *testing.T) {
|
||||
},
|
||||
{
|
||||
"user-id",
|
||||
pq.StringArray{"role1", "role2"},
|
||||
database.StringArray{"role1", "role2"},
|
||||
testNow,
|
||||
testNow,
|
||||
uint64(20211202),
|
||||
@@ -379,7 +379,7 @@ func Test_MembershipPrepares(t *testing.T) {
|
||||
Memberships: []*Membership{
|
||||
{
|
||||
UserID: "user-id",
|
||||
Roles: []string{"role1", "role2"},
|
||||
Roles: database.StringArray{"role1", "role2"},
|
||||
CreationDate: testNow,
|
||||
ChangeDate: testNow,
|
||||
Sequence: 20211202,
|
||||
@@ -388,7 +388,7 @@ func Test_MembershipPrepares(t *testing.T) {
|
||||
},
|
||||
{
|
||||
UserID: "user-id",
|
||||
Roles: []string{"role1", "role2"},
|
||||
Roles: database.StringArray{"role1", "role2"},
|
||||
CreationDate: testNow,
|
||||
ChangeDate: testNow,
|
||||
Sequence: 20211202,
|
||||
@@ -397,7 +397,7 @@ func Test_MembershipPrepares(t *testing.T) {
|
||||
},
|
||||
{
|
||||
UserID: "user-id",
|
||||
Roles: []string{"role1", "role2"},
|
||||
Roles: database.StringArray{"role1", "role2"},
|
||||
CreationDate: testNow,
|
||||
ChangeDate: testNow,
|
||||
Sequence: 20211202,
|
||||
@@ -406,7 +406,7 @@ func Test_MembershipPrepares(t *testing.T) {
|
||||
},
|
||||
{
|
||||
UserID: "user-id",
|
||||
Roles: []string{"role1", "role2"},
|
||||
Roles: database.StringArray{"role1", "role2"},
|
||||
CreationDate: testNow,
|
||||
ChangeDate: testNow,
|
||||
Sequence: 20211202,
|
||||
|
Reference in New Issue
Block a user