From 01b879d55ad1249265f23c6fd9ceb5d7730ddb3d Mon Sep 17 00:00:00 2001
From: Jesse Hallam <jesse.hallam@gmail.com>
Date: Thu, 23 Mar 2023 17:31:06 -0300
Subject: [PATCH] Revert "fix default DSN for CI"

This reverts commit e0e69cdbb0645bb50434f6b5bbd12bead1e7ce1d.
---
 server/channels/store/storetest/settings.go | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/server/channels/store/storetest/settings.go b/server/channels/store/storetest/settings.go
index 3a289e3408..d1ea45933f 100644
--- a/server/channels/store/storetest/settings.go
+++ b/server/channels/store/storetest/settings.go
@@ -10,7 +10,6 @@ import (
 	"net/url"
 	"os"
 	"path"
-	"strings"
 
 	"github.com/go-sql-driver/mysql"
 	_ "github.com/go-sql-driver/mysql"
@@ -49,26 +48,12 @@ func log(message string) {
 	}
 }
 
-func getDefaultMysqlDSN() string {
-	if os.Getenv("IS_CI") == "true" {
-		return strings.ReplaceAll(defaultMysqlDSN, "localhost", "mysql")
-	}
-	return defaultMysqlDSN
-}
-
-func getDefaultPostgresqlDSN() string {
-	if os.Getenv("IS_CI") == "true" {
-		return strings.ReplaceAll(defaultPostgresqlDSN, "localhost", "postgres")
-	}
-	return defaultPostgresqlDSN
-}
-
 // MySQLSettings returns the database settings to connect to the MySQL unittesting database.
 // The database name is generated randomly and must be created before use.
 func MySQLSettings(withReplica bool) *model.SqlSettings {
 	dsn := os.Getenv("TEST_DATABASE_MYSQL_DSN")
 	if dsn == "" {
-		dsn = getDefaultMysqlDSN()
+		dsn = defaultMysqlDSN
 		mlog.Info("No TEST_DATABASE_MYSQL_DSN override, using default", mlog.String("default_dsn", dsn))
 	} else {
 		mlog.Info("Using TEST_DATABASE_MYSQL_DSN override", mlog.String("dsn", dsn))
@@ -95,7 +80,7 @@ func MySQLSettings(withReplica bool) *model.SqlSettings {
 func PostgreSQLSettings() *model.SqlSettings {
 	dsn := os.Getenv("TEST_DATABASE_POSTGRESQL_DSN")
 	if dsn == "" {
-		dsn = getDefaultPostgresqlDSN()
+		dsn = defaultPostgresqlDSN
 		mlog.Info("No TEST_DATABASE_POSTGRESQL_DSN override, using default", mlog.String("default_dsn", dsn))
 	} else {
 		mlog.Info("Using TEST_DATABASE_POSTGRESQL_DSN override", mlog.String("dsn", dsn))