Spanner-related fixes (#102376)
* Fix UNION syntax in resourcepermissions package. * Fix migrations in usermig package to work with Spanner. * Fix health query. * Use more connections for integration tests. * Add test-go-integration-spanner target to run integration tests against Spanner emulator. * Add test for enterprise. * Don't delete sequence number for migration_log.id column. * Only bump max open connections to 20 for Spanner. Lower integration test timeout.
This commit is contained in:
+27
@@ -72,6 +72,20 @@ func (p *ServiceAccountsSameLoginCrossOrgs) Exec(sess *xorm.Session, mg *migrato
|
||||
AND is_service_account = 1
|
||||
AND login NOT LIKE 'sa-' || CAST(org_id AS TEXT) || '-%';
|
||||
`)
|
||||
case migrator.Spanner:
|
||||
_, err = p.sess.Exec(`
|
||||
UPDATE user
|
||||
SET login = CONCAT('sa-', CAST(org_id AS STRING), '-',
|
||||
CASE
|
||||
WHEN login LIKE 'sa-%' THEN SUBSTRING(login, 4)
|
||||
ELSE login
|
||||
END
|
||||
)
|
||||
WHERE login IS NOT NULL
|
||||
AND is_service_account
|
||||
AND login NOT LIKE CONCAT('sa-', CAST(org_id AS STRING), '-%')
|
||||
`)
|
||||
|
||||
default:
|
||||
return fmt.Errorf("dialect not supported: %s", p.dialect)
|
||||
}
|
||||
@@ -128,6 +142,19 @@ func (p *ServiceAccountsDeduplicateOrgInLogin) Exec(sess *xorm.Session, mg *migr
|
||||
WHERE u2.login = 'sa-' || CAST(u.org_id AS TEXT) || SUBSTRING(u.login, LENGTH('sa-'||CAST(u.org_id AS TEXT)||'-'||CAST(u.org_id AS TEXT))+1)
|
||||
);;
|
||||
`)
|
||||
case migrator.Spanner:
|
||||
_, err = sess.Exec(`
|
||||
UPDATE ` + dialect.Quote("user") + ` AS u
|
||||
SET login = 'sa-' || CAST(u.org_id AS STRING) || SUBSTRING(u.login, LENGTH('sa-'||CAST(u.org_id AS STRING)||'-'||CAST(u.org_id AS STRING))+1)
|
||||
WHERE u.login IS NOT NULL
|
||||
AND u.is_service_account
|
||||
AND u.login LIKE 'sa-'||CAST(u.org_id AS STRING)||'-'||CAST(u.org_id AS STRING)||'-%'
|
||||
AND NOT EXISTS (
|
||||
SELECT 1
|
||||
FROM ` + dialect.Quote("user") + `AS u2
|
||||
WHERE u2.login = 'sa-' || CAST(u.org_id AS STRING) || SUBSTRING(u.login, LENGTH('sa-'||CAST(u.org_id AS STRING)||'-'||CAST(u.org_id AS STRING))+1)
|
||||
);;
|
||||
`)
|
||||
default:
|
||||
return fmt.Errorf("dialect not supported: %s", dialect)
|
||||
}
|
||||
|
||||
@@ -30,7 +30,7 @@ func (p *UsersLowerCaseLoginAndEmail) SQL(dialect migrator.Dialect) string {
|
||||
func (p *UsersLowerCaseLoginAndEmail) Exec(sess *xorm.Session, mg *migrator.Migrator) error {
|
||||
// Get all users
|
||||
users := make([]*user.User, 0)
|
||||
err := sess.Table("user").Find(&users)
|
||||
err := sess.Table("user").Asc("created").Find(&users)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -147,6 +147,9 @@ func (s *SpannerDialect) TruncateDBTables(engine *xorm.Engine) error {
|
||||
switch table.Name {
|
||||
case "":
|
||||
continue
|
||||
case "autoincrement_sequences":
|
||||
// Don't delete sequence number for migration_log.id column.
|
||||
statements = append(statements, fmt.Sprintf("DELETE FROM %v WHERE name <> 'migration_log:id'", s.Quote(table.Name)))
|
||||
case "migration_log":
|
||||
continue
|
||||
case "dashboard_acl":
|
||||
|
||||
Reference in New Issue
Block a user