From 32c35e254e578416658d9cdab98f2fcd65bd404f Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Mon, 10 Dec 2018 21:51:13 -0500 Subject: [PATCH] Update default MySQL password for unit tests (#9982) * Update default MySQL password for unit tests * stub out AlterColumnDefaultIfExists for SQLite --- store/sqlstore/supplier.go | 4 ++++ store/storetest/settings.go | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/store/sqlstore/supplier.go b/store/sqlstore/supplier.go index 9419e2a870..2ea5ab030c 100644 --- a/store/sqlstore/supplier.go +++ b/store/sqlstore/supplier.go @@ -699,6 +699,10 @@ func (ss *SqlSupplier) AlterColumnDefaultIfExists(tableName string, columnName s tableName = strings.ToLower(tableName) columnName = strings.ToLower(columnName) defaultValue = *postgresColDefault + } else if ss.DriverName() == model.DATABASE_DRIVER_SQLITE { + // SQLite doesn't support altering column defaults, but we don't use this in + // production so just ignore. + return true } else { mlog.Critical("Failed to alter column default because of missing driver") time.Sleep(time.Second) diff --git a/store/storetest/settings.go b/store/storetest/settings.go index faef15e1c5..c81d61b48f 100644 --- a/store/storetest/settings.go +++ b/store/storetest/settings.go @@ -23,7 +23,7 @@ import ( const ( defaultMysqlDSN = "mmuser:mostest@tcp(dockerhost:3306)/mattermost_test?charset=utf8mb4,utf8\u0026readTimeout=30s\u0026writeTimeout=30s" defaultPostgresqlDSN = "postgres://mmuser:mostest@dockerhost:5432/mattermost_test?sslmode=disable&connect_timeout=10" - defaultMysqlRootPWD = "passwd" + defaultMysqlRootPWD = "mostest" ) func getEnv(name, defaultValue string) string {