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" ) );

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

@@ -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();
}
} }