TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-01-07 23:07:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(step10): separate executions (#5754)

Browse Source 
* feat: allow skip of success page for native apps (#5627)

add possibility to return to callback directly after login without rendering the successful login page

* build next

* fix(console): disallow inline fonts, critical styles (#5714)

fix: disallow inline

* fix(setup): step 10 for postgres (#5717)

* fix(setup): smaller transactions (#5743)

* fix(step10): split statements

* fix(step10): split into separate execs

* chore: prerelease

* add truncate before insert

* fix: add truncate

* Merge branch 'main' into optimise-step-10

* chore: reset release definition

---------

Co-authored-by: Livio Spring <livio.a@gmail.com>
Co-authored-by: Max Peintner <max@caos.ch>
This commit is contained in:
Silvan 2023-04-27 10:28:26 +02:00 committed by GitHub
parent 5207898f60
commit 86f4477ae1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.releaserc.js
View File

@ -1,7 +1,6 @@
module.exports = { module.exports = {
branches: [ branches: [
{name: 'main', channel: 'next'}, {name: 'main', channel: 'next'},
{name: '1.87.x', range: '1.87.x', channel: '1.87.x'},
{name: 'next', prerelease: true} {name: 'next', prerelease: true}
], ],
plugins: [ plugins: [

20
cmd/setup/10.go
View File

@ -13,8 +13,12 @@ import (
) )
var ( var (
//go:embed 10.sql //go:embed 10_create_temp_table.sql
correctCreationDate10 string correctCreationDate10CreateTable string
//go:embed 10_fill_table.sql
correctCreationDate10FillTable string
//go:embed 10_update.sql
correctCreationDate10Update string
) )
type CorrectCreationDate struct { type CorrectCreationDate struct {
@ -34,7 +38,17 @@ func (mig *CorrectCreationDate) Execute(ctx context.Context) (err error) {
return err return err
} }
} }
res, err := tx.ExecContext(ctx, correctCreationDate10) _, err := tx.ExecContext(ctx, correctCreationDate10CreateTable)
if err != nil {
return err
}
_, err = tx.ExecContext(ctx, correctCreationDate10FillTable)
if err != nil {
return err
}
res, err := tx.ExecContext(ctx, correctCreationDate10Update)
if err != nil { if err != nil {
return err return err
} }

6
cmd/setup/10_create_temp_table.sql Normal file
View File

@ -0,0 +1,6 @@
CREATE temporary TABLE IF NOT EXISTS wrong_events (
instance_id TEXT
, event_sequence BIGINT
, current_cd TIMESTAMPTZ
, next_cd TIMESTAMPTZ
);

9
cmd/setup/10.sql → cmd/setup/10_fill_table.sql
View File

@ -1,9 +1,4 @@
CREATE temporary TABLE IF NOT EXISTS wrong_events ( TRUNCATE wrong_events;
instance_id TEXT
, event_sequence BIGINT
, current_cd TIMESTAMPTZ
, next_cd TIMESTAMPTZ
);
INSERT INTO wrong_events ( INSERT INTO wrong_events (
SELECT * FROM ( SELECT * FROM (
@ -22,5 +17,3 @@ INSERT INTO wrong_events (
ORDER BY ORDER BY
event_sequence DESC event_sequence DESC
); );
UPDATE eventstore.events e SET creation_date = we.next_cd FROM wrong_events we WHERE e.event_sequence = we.event_sequence and e.instance_id = we.instance_id;

1
cmd/setup/10_update.sql Normal file
View File

@ -0,0 +1 @@
UPDATE eventstore.events e SET creation_date = we.next_cd FROM wrong_events we WHERE e.event_sequence = we.event_sequence and e.instance_id = we.instance_id;