From c2efb74d0d8ed24e3367510fee4ea6161342f54d Mon Sep 17 00:00:00 2001
From: Scott Bishel <scott.bishel@mattermost.com>
Date: Tue, 14 Mar 2023 11:55:46 -0600
Subject: [PATCH] add check for schema migration

---
 .../services/store/sqlstore/schema_table_migration.go  | 10 ++++++++++
 server/services/store/sqlstore/util.go                 |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/server/services/store/sqlstore/schema_table_migration.go b/server/services/store/sqlstore/schema_table_migration.go
index 2ab075658..dc420d073 100644
--- a/server/services/store/sqlstore/schema_table_migration.go
+++ b/server/services/store/sqlstore/schema_table_migration.go
@@ -123,6 +123,16 @@ func (s *SQLStore) isSchemaMigrationNeeded() (bool, error) {
 			"TABLE_NAME": s.tablePrefix + "schema_migrations",
 		})
 
+	if s.dbType == model.MysqlDBType {
+		query = query.Where(sq.Eq{
+			"TABLE_SCHEMA": s.schemaName,
+		})
+	} else {
+		query = query.Where(sq.Eq{
+			"TABLE_CATALOG": s.schemaName,
+		})
+	}
+
 	rows, err := query.Query()
 	if err != nil {
 		s.logger.Error("failed to fetch columns in schema_migrations table", mlog.Err(err))
diff --git a/server/services/store/sqlstore/util.go b/server/services/store/sqlstore/util.go
index 8f4bde5ed..e458758bd 100644
--- a/server/services/store/sqlstore/util.go
+++ b/server/services/store/sqlstore/util.go
@@ -146,7 +146,7 @@ func (s *SQLStore) GetSchemaName() (string, error) {
 	case model.MysqlDBType:
 		query = s.getQueryBuilder(s.db).Select("DATABASE()")
 	case model.PostgresDBType:
-		query = s.getQueryBuilder(s.db).Select("current_schema()")
+		query = s.getQueryBuilder(s.db).Select("current_catalog")
 	case model.SqliteDBType:
 		return "", nil
 	default: