TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-11 21:47:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(database): support for postgres (#3998)

Browse Source 
* 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:
Silvan
2022-08-31 09:52:43 +02:00
committed by GitHub
parent d6c9815945
commit 77b4fc5487
189 changed files with 3401 additions and 2956 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
internal/query/user_membership.go
View File

@@ -6,9 +6,9 @@ import (
"time"
sq "github.com/Masterminds/squirrel"
"github.com/lib/pq"
"github.com/zitadel/zitadel/internal/api/authz"
"github.com/zitadel/zitadel/internal/database"
"github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/query/projection"
)
@@ -20,7 +20,7 @@ type Memberships struct {
type Membership struct {
UserID string
Roles []string
Roles database.StringArray
CreationDate time.Time
ChangeDate time.Time
Sequence uint64
@@ -227,14 +227,13 @@ func prepareMembershipsQuery() (sq.SelectBuilder, func(*sql.Rows) (*Memberships,
projectID = sql.NullString{}
grantID = sql.NullString{}
grantedOrgID = sql.NullString{}
roles = pq.StringArray{}
projectName = sql.NullString{}
orgName = sql.NullString{}
)
err := rows.Scan(
&membership.UserID,
&roles,
&membership.Roles,
&membership.CreationDate,
&membership.ChangeDate,
&membership.Sequence,
@@ -253,8 +252,6 @@ func prepareMembershipsQuery() (sq.SelectBuilder, func(*sql.Rows) (*Memberships,
return nil, err
}
membership.Roles = roles
if orgID.Valid {
membership.Org = &OrgMembership{
OrgID: orgID.String,
@@ -305,9 +302,9 @@ func prepareOrgMember() string {
OrgMemberResourceOwner.identifier(),
OrgMemberInstanceID.identifier(),
OrgMemberOrgID.identifier(),
"NULL::STRING AS "+membershipIAMID.name,
"NULL::STRING AS "+membershipProjectID.name,
"NULL::STRING AS "+membershipGrantID.name,
"NULL::TEXT AS "+membershipIAMID.name,
"NULL::TEXT AS "+membershipProjectID.name,
"NULL::TEXT AS "+membershipGrantID.name,
).From(orgMemberTable.identifier()).MustSql()
return stmt
}
@@ -321,10 +318,10 @@ func prepareIAMMember() string {
InstanceMemberSequence.identifier(),
InstanceMemberResourceOwner.identifier(),
InstanceMemberInstanceID.identifier(),
"NULL::STRING AS "+membershipOrgID.name,
"NULL::TEXT AS "+membershipOrgID.name,
InstanceMemberIAMID.identifier(),
"NULL::STRING AS "+membershipProjectID.name,
"NULL::STRING AS "+membershipGrantID.name,
"NULL::TEXT AS "+membershipProjectID.name,
"NULL::TEXT AS "+membershipGrantID.name,
).From(instanceMemberTable.identifier()).MustSql()
return stmt
}
@@ -338,10 +335,10 @@ func prepareProjectMember() string {
ProjectMemberSequence.identifier(),
ProjectMemberResourceOwner.identifier(),
ProjectMemberInstanceID.identifier(),
"NULL::STRING AS "+membershipOrgID.name,
"NULL::STRING AS "+membershipIAMID.name,
"NULL::TEXT AS "+membershipOrgID.name,
"NULL::TEXT AS "+membershipIAMID.name,
ProjectMemberProjectID.identifier(),
"NULL::STRING AS "+membershipGrantID.name,
"NULL::TEXT AS "+membershipGrantID.name,
).From(projectMemberTable.identifier()).MustSql()
return stmt
@@ -356,8 +353,8 @@ func prepareProjectGrantMember() string {
ProjectGrantMemberSequence.identifier(),
ProjectGrantMemberResourceOwner.identifier(),
ProjectGrantMemberInstanceID.identifier(),
"NULL::STRING AS "+membershipOrgID.name,
"NULL::STRING AS "+membershipIAMID.name,
"NULL::TEXT AS "+membershipOrgID.name,
"NULL::TEXT AS "+membershipIAMID.name,
ProjectGrantMemberProjectID.identifier(),
ProjectGrantMemberGrantID.identifier(),
).From(projectGrantMemberTable.identifier()).