inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

REPO-3993 Upgrade MariaDB library 2.2.5 -> 2.6.0 and fix dialect error (#899)

Browse Source 
* REPO-3993 Upgrade MariaDB library 2.2.5 -> 2.6.0 and fix dialect error

* REPO-3993 Override mapping to fix dialect error
This commit is contained in:
Sridharraj Vellingiri
2020-03-30 15:57:23 +01:00
committed by GitHub
parent 023fca3ee8
commit 2f50997b0d
3 changed files with 35 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -57,7 +57,7 @@
<dependency.activiti.version>5.23.0</dependency.activiti.version> <dependency.activiti.version>5.23.0</dependency.activiti.version>
<dependency.postgresql.version>42.2.10</dependency.postgresql.version> <dependency.postgresql.version>42.2.10</dependency.postgresql.version>
<dependency.mysql.version>5.1.48</dependency.mysql.version> <dependency.mysql.version>5.1.48</dependency.mysql.version>
<dependency.mariadb.version>2.2.5</dependency.mariadb.version> <dependency.mariadb.version>2.6.0</dependency.mariadb.version>
<dependency.antlr.version>3.5.2</dependency.antlr.version> <dependency.antlr.version>3.5.2</dependency.antlr.version>
<!-- REPO-4964 --> <!-- REPO-4964 -->
<dependency.keycloak.version>7.0.0</dependency.keycloak.version> <dependency.keycloak.version>7.0.0</dependency.keycloak.version>

2
src/main/java/org/alfresco/repo/domain/dialect/DialectFactory.java
View File

@@ -124,7 +124,7 @@ public class DialectFactory
static { static {
// detectors... // detectors...
MAPPERS.put( "PostgreSQL", new VersionInsensitiveMapper( "org.alfresco.repo.domain.dialect.PostgreSQLDialect" ) ); MAPPERS.put( "PostgreSQL", new VersionInsensitiveMapper( "org.alfresco.repo.domain.dialect.PostgreSQLDialect" ) );
MAPPERS.put( "MariaDB", new VersionInsensitiveMapper( "org.alfresco.repo.domain.dialect.MySQLInnoDBDialect" ) );
MAPPERS.put( "MySQL", new VersionInsensitiveMapper( "org.alfresco.repo.domain.dialect.MySQLInnoDBDialect" ) ); MAPPERS.put( "MySQL", new VersionInsensitiveMapper( "org.alfresco.repo.domain.dialect.MySQLInnoDBDialect" ) );
MAPPERS.put( "Microsoft SQL Server Database", new VersionInsensitiveMapper( "org.alfresco.repo.domain.dialect.SQLServerDialect" ) ); MAPPERS.put( "Microsoft SQL Server Database", new VersionInsensitiveMapper( "org.alfresco.repo.domain.dialect.SQLServerDialect" ) );
MAPPERS.put( "Microsoft SQL Server", new VersionInsensitiveMapper( "org.alfresco.repo.domain.dialect.SQLServerDialect" ) ); MAPPERS.put( "Microsoft SQL Server", new VersionInsensitiveMapper( "org.alfresco.repo.domain.dialect.SQLServerDialect" ) );

58
src/main/java/org/alfresco/repo/workflow/activiti/AlfrescoProcessEngineConfiguration.java
View File

@@ -1,28 +1,28 @@
/* /*
* #%L * #%L
* Alfresco Repository * Alfresco Repository
* %% * %%
* Copyright (C) 2005 - 2016 Alfresco Software Limited * Copyright (C) 2005 - 2016 Alfresco Software Limited
* %% * %%
* This file is part of the Alfresco software. * This file is part of the Alfresco software.
* If the software was purchased under a paid Alfresco license, the terms of * If the software was purchased under a paid Alfresco license, the terms of
* the paid license agreement will prevail. Otherwise, the software is * the paid license agreement will prevail. Otherwise, the software is
* provided under the following open source license terms: * provided under the following open source license terms:
* *
* Alfresco is free software: you can redistribute it and/or modify * Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by * it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* Alfresco is distributed in the hope that it will be useful, * Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details. * GNU Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public License * You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>. * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
* #L% * #L%
*/ */
package org.alfresco.repo.workflow.activiti; package org.alfresco.repo.workflow.activiti;
@@ -107,4 +107,12 @@ public class AlfrescoProcessEngineConfiguration extends SpringProcessEngineConfi
{ {
this.unprotectedNodeService = unprotectedNodeService; this.unprotectedNodeService = unprotectedNodeService;
} }
@Override
public void initDatabaseType()
{
databaseTypeMappings.setProperty("MariaDB", DATABASE_TYPE_MYSQL);
super.initDatabaseType();
}
} }