mirror of
https://github.com/andwati/zitadel.git
synced 2026-11-18 11:15:12 +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 <[email protected]> Co-authored-by: Elio Bischof <[email protected]>
This commit is contained in:
co-authored by
Livio Amstutz
Elio Bischof
parent
d6c9815945
commit
77b4fc5487
@@ -7,9 +7,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/query/projection"
|
||||
|
||||
@@ -72,7 +72,7 @@ type PersonalAccessToken struct {
|
||||
|
||||
UserID string
|
||||
Expiration time.Time
|
||||
Scopes []string
|
||||
Scopes database.StringArray
|
||||
}
|
||||
|
||||
type PersonalAccessTokenSearchQueries struct {
|
||||
@@ -161,7 +161,6 @@ func preparePersonalAccessTokenQuery() (sq.SelectBuilder, func(*sql.Row) (*Perso
|
||||
From(personalAccessTokensTable.identifier()).PlaceholderFormat(sq.Dollar),
|
||||
func(row *sql.Row) (*PersonalAccessToken, error) {
|
||||
p := new(PersonalAccessToken)
|
||||
scopes := pq.StringArray{}
|
||||
err := row.Scan(
|
||||
&p.ID,
|
||||
&p.CreationDate,
|
||||
@@ -170,9 +169,8 @@ func preparePersonalAccessTokenQuery() (sq.SelectBuilder, func(*sql.Row) (*Perso
|
||||
&p.Sequence,
|
||||
&p.UserID,
|
||||
&p.Expiration,
|
||||
&scopes,
|
||||
&p.Scopes,
|
||||
)
|
||||
p.Scopes = scopes
|
||||
if err != nil {
|
||||
if errs.Is(err, sql.ErrNoRows) {
|
||||
return nil, errors.ThrowNotFound(err, "QUERY-fk2fs", "Errors.PersonalAccessToken.NotFound")
|
||||
@@ -200,7 +198,6 @@ func preparePersonalAccessTokensQuery() (sq.SelectBuilder, func(*sql.Rows) (*Per
|
||||
var count uint64
|
||||
for rows.Next() {
|
||||
token := new(PersonalAccessToken)
|
||||
scopes := pq.StringArray{}
|
||||
err := rows.Scan(
|
||||
&token.ID,
|
||||
&token.CreationDate,
|
||||
@@ -209,13 +206,12 @@ func preparePersonalAccessTokensQuery() (sq.SelectBuilder, func(*sql.Rows) (*Per
|
||||
&token.Sequence,
|
||||
&token.UserID,
|
||||
&token.Expiration,
|
||||
&scopes,
|
||||
&token.Scopes,
|
||||
&count,
|
||||
)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
token.Scopes = scopes
|
||||
personalAccessTokens = append(personalAccessTokens, token)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user