[pull] master from mattermost:master

e2e-tests/cypress/package.json

@@ -69,7 +69,6 @@
     "mochawesome-merge": "4.4.1",
     "mochawesome-report-generator": "6.2.0",
     "moment-timezone": "0.6.0",
-    "mysql": "2.18.1",
     "path": "0.12.7",
     "pdf-parse": "1.1.1",
     "pg": "8.16.3",

e2e-tests/cypress/tests/plugins/db_request.js

@@ -1,13 +1,6 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-/**
- * Functions here are expected to work with MySQL and PostgreSQL (known as dialect).
- * When updating this file, make sure to test in both dialect.
- * You'll find table and columns names are being converted to lowercase. Reason being is that
- * in MySQL, first letter is capitalized.
- */
-
 const mapKeys = require('lodash.mapkeys');
 
 function convertKeysToLowercase(obj) {
@@ -33,12 +26,12 @@ const dbGetActiveUserSessions = async ({dbConfig, params: {username, userId, lim
     try {
         let user;
         if (username) {
-            user = await knexClient(toLowerCase(dbConfig, 'Users')).where('username', username).first();
+            user = await knexClient('users').where('username', username).first();
             user = convertKeysToLowercase(user);
         }
 
         const now = Date.now();
-        const sessions = await knexClient(toLowerCase(dbConfig, 'Sessions')).
+        const sessions = await knexClient('sessions').
             where('userid', user ? user.id : userId).
             where('expiresat', '>', now).
             orderBy('lastactivityat', 'desc').
@@ -60,7 +53,7 @@ const dbGetUser = async ({dbConfig, params: {username}}) => {
     }
 
     try {
-        const user = await knexClient(toLowerCase(dbConfig, 'Users')).where('username', username).first();
+        const user = await knexClient('users').where('username', username).first();
 
         return {user: convertKeysToLowercase(user)};
     } catch (error) {
@@ -75,7 +68,7 @@ const dbGetUserSession = async ({dbConfig, params: {sessionId}}) => {
     }
 
     try {
-        const session = await knexClient(toLowerCase(dbConfig, 'Sessions')).
+        const session = await knexClient('sessions').
             where('id', '=', sessionId).
             first();
 
@@ -92,7 +85,7 @@ const dbUpdateUserSession = async ({dbConfig, params: {sessionId, userId, fields
     }
 
     try {
-        let user = await knexClient(toLowerCase(dbConfig, 'Users')).where('id', userId).first();
+        let user = await knexClient('users').where('id', userId).first();
         if (!user) {
             return {errorMessage: `No user found with id: ${userId}.`};
         }
@@ -102,12 +95,12 @@ const dbUpdateUserSession = async ({dbConfig, params: {sessionId, userId, fields
 
         user = convertKeysToLowercase(user);
 
-        await knexClient(toLowerCase(dbConfig, 'Sessions')).
+        await knexClient('sessions').
             where('id', '=', sessionId).
             where('userid', '=', user.id).
             update(fieldsToUpdate);
 
-        const session = await knexClient(toLowerCase(dbConfig, 'Sessions')).
+        const session = await knexClient('sessions').
             where('id', '=', sessionId).
             where('userid', '=', user.id).
             first();
@@ -119,27 +112,11 @@ const dbUpdateUserSession = async ({dbConfig, params: {sessionId, userId, fields
     }
 };
 
-function toLowerCase(config, name) {
-    if (config.client === 'mysql') {
-        return name;
-    }
-
-    return name.toLowerCase();
-}
-
 const dbRefreshPostStats = async ({dbConfig}) => {
     if (!knexClient) {
         knexClient = getKnexClient(dbConfig);
     }
 
-    // Only run for PostgreSQL
-    if (dbConfig.client !== 'postgres') {
-        return {
-            skipped: true,
-            message: 'Refresh post stats is only supported for PostgreSQL',
-        };
-    }
-
     try {
         await knexClient.raw('REFRESH MATERIALIZED VIEW posts_by_team_day;');
         await knexClient.raw('REFRESH MATERIALIZED VIEW bot_posts_by_team_day;');

server/build/Dockerfile.fips

@@ -1,5 +1,5 @@
 # First stage - FIPS dev image with dependencies for building
-FROM cgr.dev/mattermost.com/glibc-openssl-fips:15-dev@sha256:9223f9245fb026a3c255ce9b7028a069fe11432aa7710713a331eaa36f44851c AS builder
+FROM cgr.dev/mattermost.com/glibc-openssl-fips:15-dev@sha256:ab5285209fff77fbe56e58aeed6d7f557cf74c6f90d1d8ee26053003f039b419 AS builder
 # Setting bash as our shell, and enabling pipefail option
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 

server/channels/app/platform/service.go

@@ -635,7 +635,7 @@ func (ps *PlatformService) LdapDiagnostic() einterfaces.LdapDiagnosticInterface
 	return ps.ldapDiagnostic
 }
 
-// DatabaseTypeAndSchemaVersion returns the Database type (postgres or mysql) and current version of the schema
+// DatabaseTypeAndSchemaVersion returns the database type and current version of the schema
 func (ps *PlatformService) DatabaseTypeAndSchemaVersion() (string, string, error) {
 	schemaVersion, err := ps.Store.GetDBSchemaVersion()
 	if err != nil {

server/channels/app/platform/service_test.go

@@ -242,13 +242,9 @@ func TestDatabaseTypeAndMattermostVersion(t *testing.T) {
 
 	databaseType, schemaVersion, err := th.Service.DatabaseTypeAndSchemaVersion()
 	require.NoError(t, err)
-	if *th.Service.Config().SqlSettings.DriverName == model.DatabaseDriverPostgres {
-		assert.Equal(t, "postgres", databaseType)
-	} else {
-		assert.Equal(t, "mysql", databaseType)
-	}
+	assert.Equal(t, "postgres", databaseType)
 
-	// It's hard to check wheather the schema version is correct or not.
+	// It's hard to check whether the schema version is correct or not.
 	// So, we just check if it's greater than 1.
 	assert.GreaterOrEqual(t, schemaVersion, strconv.Itoa(1))
 }

server/channels/app/users/main_test.go

@@ -4,21 +4,14 @@
 package users
 
 import (
-	"flag"
 	"testing"
 
 	"github.com/mattermost/mattermost/server/v8/channels/testlib"
 )
 
 var mainHelper *testlib.MainHelper
-var replicaFlag bool
 
 func TestMain(m *testing.M) {
-	if f := flag.Lookup("mysql-replica"); f == nil {
-		flag.BoolVar(&replicaFlag, "mysql-replica", false, "")
-		flag.Parse()
-	}
-
 	var options = testlib.HelperOptions{
 		EnableStore:     true,
 		EnableResources: true,

server/channels/store/searchtest/post_layer.go

@@ -41,17 +41,10 @@ var searchPostStoreTests = []searchTest{
 		Tags: []string{EnginePostgres},
 	},
 	{
-		// Postgres supports search with and without quotes
 		Name: "Should be able to search for email addresses with or without quotes",
 		Fn:   testSearchEmailAddresses,
 		Tags: []string{EnginePostgres, EngineElasticSearch},
 	},
-	{
-		// MySql supports search with quotes only
-		Name: "Should be able to search for email addresses with quotes",
-		Fn:   testSearchEmailAddressesWithQuotes,
-		Tags: []string{EngineElasticSearch},
-	},
 	{
 		Name: "Should be able to search when markdown underscores are applied",
 		Fn:   testSearchMarkdownUnderscores,
@@ -557,21 +550,6 @@ func testSearchEmailAddresses(t *testing.T, th *SearchTestHelper) {
 	})
 }
 
-func testSearchEmailAddressesWithQuotes(t *testing.T, th *SearchTestHelper) {
-	p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "email test@test.com", "", model.PostTypeDefault, 0, false)
-	require.NoError(t, err)
-	_, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "email test2@test.com", "", model.PostTypeDefault, 0, false)
-	require.NoError(t, err)
-	defer th.deleteUserPosts(th.User.Id)
-
-	params := &model.SearchParams{Terms: "\"test@test.com\""}
-	results, err := th.Store.Post().SearchPostsForUser(th.Context, []*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20)
-	require.NoError(t, err)
-
-	require.Len(t, results.Posts, 1)
-	th.checkPostInSearchResults(t, p1.Id, results.Posts)
-}
-
 func testSearchMarkdownUnderscores(t *testing.T, th *SearchTestHelper) {
 	p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "_start middle end_ _another_", "", model.PostTypeDefault, 0, false)
 	require.NoError(t, err)

server/channels/store/sqlstore/access_control_policy_store.go

@@ -359,12 +359,7 @@ func (s *SqlAccessControlPolicyStore) SetActiveStatus(rctx request.CTX, id strin
 
 	if existingPolicy.Type == model.AccessControlPolicyTypeParent {
 		// if the policy is a parent, we need to update the child policies
-		var expr sq.Sqlizer
-		if s.DriverName() == model.DatabaseDriverPostgres {
-			expr = sq.Expr("Data->'imports' @> ?::jsonb", fmt.Sprintf("%q", id))
-		} else {
-			expr = sq.Expr("JSON_CONTAINS(JSON_EXTRACT(Data, '$.imports'), ?)", fmt.Sprintf("%q", id))
-		}
+		expr := sq.Expr("Data->'imports' @> ?::jsonb", fmt.Sprintf("%q", id))
 		query, args, err = s.getQueryBuilder().Update("AccessControlPolicies").Set("Active", active).Where(expr).ToSql()
 		if err != nil {
 			return nil, errors.Wrapf(err, "failed to build query for policy with id=%s", id)
@@ -541,11 +536,7 @@ func (s *SqlAccessControlPolicyStore) GetAll(_ request.CTX, opts model.GetAccess
 	query := s.selectQueryBuilder
 
 	if opts.ParentID != "" {
-		if s.DriverName() == model.DatabaseDriverPostgres {
-			query = query.Where(sq.Expr("Data->'imports' @> ?", fmt.Sprintf("%q", opts.ParentID)))
-		} else {
-			query = query.Where(sq.Expr("JSON_CONTAINS(JSON_EXTRACT(Data, '$.imports'), ?)", fmt.Sprintf("%q", opts.ParentID)))
-		}
+		query = query.Where(sq.Expr("Data->'imports' @> ?", fmt.Sprintf("%q", opts.ParentID)))
 	}
 
 	if opts.Type != "" {