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

fix: merge migrations (#363)

Browse Source 
* fix: merge migrations

* fix: rename env variable
This commit is contained in:
Fabi
2020-07-07 16:53:54 +02:00
committed by GitHub
parent c6e8597eeb
commit 5988ec4844
39 changed files with 672 additions and 828 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/admin/repository/eventsourcing/spooler/lock.go
View File

@@ -8,7 +8,7 @@ import (
)
const (
lockTable = "admin_api.locks"
lockTable = "adminapi.locks"
lockedUntilKey = "locked_until"
lockerIDKey = "locker_id"
objectTypeKey = "object_type"

2
internal/admin/repository/eventsourcing/spooler/lock_test.go
View File

@@ -57,7 +57,7 @@ func (db *dbMock) expectReleaseSavepoint() *dbMock {
func (db *dbMock) expectRenew(lockerID, view string, affectedRows int64) *dbMock {
query := db.mock.
ExpectExec(`INSERT INTO admin_api\.locks \(object_type, locker_id, locked_until\) VALUES \(\$1, \$2, now\(\)\+\$3\) ON CONFLICT \(object_type\) DO UPDATE SET locked_until = now\(\)\+\$4, locker_id = \$5 WHERE \(locks\.locked_until < now\(\) OR locks\.locker_id = \$6\) AND locks\.object_type = \$7`).
ExpectExec(`INSERT INTO adminapi\.locks \(object_type, locker_id, locked_until\) VALUES \(\$1, \$2, now\(\)\+\$3\) ON CONFLICT \(object_type\) DO UPDATE SET locked_until = now\(\)\+\$4, locker_id = \$5 WHERE \(locks\.locked_until < now\(\) OR locks\.locker_id = \$6\) AND locks\.object_type = \$7`).
WithArgs(view, lockerID, sqlmock.AnyArg(), sqlmock.AnyArg(), lockerID, lockerID, view).
WillReturnResult(sqlmock.NewResult(1, 1))