HHH-11806 - Add support for MariaDB 10.3

HHH-11769 - New MariaDB Dialect for MariaDB >= v10.1

databases.gradle

@@ -59,7 +59,7 @@ ext {
                         'jdbc.url'   : 'jdbc:mysql://127.0.0.1/hibernate_orm_test'
                 ],
                 mariadb : [
-                        'db.dialect' : 'org.hibernate.dialect.MariaDB53Dialect',
+                        'db.dialect' : 'org.hibernate.dialect.MariaDB102Dialect',
                         'jdbc.driver': 'org.mariadb.jdbc.Driver',
                         'jdbc.user'  : 'hibernate_orm_test',
                         'jdbc.pass'  : 'hibernate_orm_test',

hibernate-core/src/main/java/org/hibernate/dialect/Database.java

@@ -257,7 +257,7 @@ public enum Database {
 	MARIADB {
 		@Override
 		public Class<? extends Dialect> latestDialect() {
-			return MariaDB53Dialect.class;
+			return MariaDB102Dialect.class;
 		}
 
 		@Override
@@ -267,11 +267,22 @@ public enum Database {
 				final int majorVersion = info.getDatabaseMajorVersion();
 				final int minorVersion = info.getDatabaseMinorVersion();
 
-				if ( majorVersion < 5 || ( majorVersion == 5 && minorVersion < 3 ) ) {
+				if ( majorVersion == 10 ) {
-					return new MariaDBDialect();
+					if ( minorVersion >= 3 ) {
+						return new MariaDB103Dialect();
+					}
+					else if ( minorVersion == 2 ) {
+						return new MariaDB102Dialect();
+					}
+					else if ( minorVersion >= 0 ) {
+						return new MariaDB10Dialect();
+					}
+					return new MariaDB53Dialect();
 				}
-
+				else if ( majorVersion > 5 || ( majorVersion == 5 && minorVersion >= 3 ) ) {
-				return latestDialectInstance( this );
+					return new MariaDB53Dialect();
+				}
+				return new MariaDBDialect();
 			}
 
 			return null;

hibernate-core/src/main/java/org/hibernate/dialect/MariaDB102Dialect.java

@@ -0,0 +1,28 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+ * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ */
+package org.hibernate.dialect;
+
+import org.hibernate.dialect.function.StandardSQLFunction;
+import org.hibernate.type.StandardBasicTypes;
+
+import java.sql.Types;
+
+public class MariaDB102Dialect extends MariaDB10Dialect {
+
+	public MariaDB102Dialect() {
+		super();
+
+		this.registerColumnType( Types.JAVA_OBJECT, "json" );
+		this.registerFunction( "json_valid", new StandardSQLFunction( "json_valid", StandardBasicTypes.NUMERIC_BOOLEAN ) );
+
+	}
+
+	@Override
+	public boolean supportsColumnCheck() {
+		return true;
+	}
+}

hibernate-core/src/main/java/org/hibernate/dialect/MariaDB103Dialect.java

@@ -0,0 +1,61 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+ * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ */
+package org.hibernate.dialect;
+
+
+import org.hibernate.dialect.function.StandardSQLFunction;
+import org.hibernate.type.StandardBasicTypes;
+
+/**
+ * An SQL dialect for MariaDB 10.3 and later, provides sequence support.
+ * 
+ * @author Philippe Marschall
+ */
+public class MariaDB103Dialect extends MariaDB102Dialect {
+
+	public MariaDB103Dialect() {
+		super();
+
+		this.registerFunction( "chr", new StandardSQLFunction( "chr", StandardBasicTypes.CHARACTER) );
+	}
+
+	@Override
+	public boolean supportsSequences() {
+		return true;
+	}
+
+	@Override
+	public boolean supportsPooledSequences() {
+		return true;
+	}
+
+	@Override
+	public String getCreateSequenceString(String sequenceName) {
+		return "create sequence " + sequenceName;
+	}
+
+	@Override
+	public String getDropSequenceString(String sequenceName) {
+		return "drop sequence " + sequenceName;
+	}
+
+	@Override
+	public String getSequenceNextValString(String sequenceName) {
+		return "select " + getSelectSequenceNextValString( sequenceName );
+	}
+
+	@Override
+	public String getSelectSequenceNextValString(String sequenceName) {
+		return "nextval(" + sequenceName + ")";
+	}
+
+	@Override
+	public String getQuerySequencesString() {
+		return "select table_name from information_schema.TABLES where table_type='SEQUENCE'";
+	}
+
+}

hibernate-core/src/main/java/org/hibernate/dialect/MariaDB10Dialect.java

@@ -0,0 +1,29 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+ * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ */
+package org.hibernate.dialect;
+
+import org.hibernate.dialect.function.StandardSQLFunction;
+import org.hibernate.type.StandardBasicTypes;
+
+public class MariaDB10Dialect extends MariaDB53Dialect {
+
+	public MariaDB10Dialect() {
+		super();
+
+		registerFunction( "regexp_replace", new StandardSQLFunction( "regexp_replace", StandardBasicTypes.STRING ) );
+		registerFunction( "regexp_instr", new StandardSQLFunction( "regexp_instr", StandardBasicTypes.INTEGER ) );
+		registerFunction( "regexp_substr", new StandardSQLFunction( "regexp_substr", StandardBasicTypes.STRING ) );
+		registerFunction( "weight_string", new StandardSQLFunction( "weight_string", StandardBasicTypes.STRING ) );
+		registerFunction( "to_base64", new StandardSQLFunction( "to_base64", StandardBasicTypes.STRING ) );
+		registerFunction( "from_base64", new StandardSQLFunction( "from_base64", StandardBasicTypes.STRING ) );
+	}
+
+	@Override
+	public boolean supportsIfExistsBeforeConstraintName() {
+		return true;
+	}
+}

hibernate-core/src/test/java/org/hibernate/dialect/resolver/DialectFactoryTest.java

@@ -6,11 +6,6 @@
  */
 package org.hibernate.dialect.resolver;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
 import org.hibernate.HibernateException;
 import org.hibernate.boot.registry.BootstrapServiceRegistry;
 import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder;
@@ -18,36 +13,7 @@ import org.hibernate.boot.registry.StandardServiceRegistry;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.boot.registry.selector.spi.StrategySelectionException;
 import org.hibernate.cfg.Environment;
-import org.hibernate.dialect.DB2400Dialect;
+import org.hibernate.dialect.*;
-import org.hibernate.dialect.DB2Dialect;
-import org.hibernate.dialect.DerbyDialect;
-import org.hibernate.dialect.DerbyTenFiveDialect;
-import org.hibernate.dialect.DerbyTenSevenDialect;
-import org.hibernate.dialect.DerbyTenSixDialect;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.dialect.H2Dialect;
-import org.hibernate.dialect.HSQLDialect;
-import org.hibernate.dialect.Informix10Dialect;
-import org.hibernate.dialect.InformixDialect;
-import org.hibernate.dialect.IngresDialect;
-import org.hibernate.dialect.MySQL55Dialect;
-import org.hibernate.dialect.MySQL57Dialect;
-import org.hibernate.dialect.MySQL5Dialect;
-import org.hibernate.dialect.MySQLDialect;
-import org.hibernate.dialect.Oracle10gDialect;
-import org.hibernate.dialect.Oracle8iDialect;
-import org.hibernate.dialect.Oracle9iDialect;
-import org.hibernate.dialect.PostgreSQL81Dialect;
-import org.hibernate.dialect.PostgreSQL82Dialect;
-import org.hibernate.dialect.PostgreSQL92Dialect;
-import org.hibernate.dialect.PostgreSQL94Dialect;
-import org.hibernate.dialect.PostgreSQL95Dialect;
-import org.hibernate.dialect.PostgreSQL9Dialect;
-import org.hibernate.dialect.PostgresPlusDialect;
-import org.hibernate.dialect.SQLServerDialect;
-import org.hibernate.dialect.SybaseASE15Dialect;
-import org.hibernate.dialect.SybaseAnywhereDialect;
-import org.hibernate.dialect.TestingDialects;
 import org.hibernate.engine.jdbc.dialect.internal.DialectFactoryImpl;
 import org.hibernate.engine.jdbc.dialect.internal.DialectResolverSet;
 import org.hibernate.engine.jdbc.dialect.internal.StandardDialectResolver;
@@ -55,14 +21,16 @@ import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo;
 import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfoSource;
 import org.hibernate.engine.jdbc.dialect.spi.DialectResolver;
 import org.hibernate.service.spi.ServiceRegistryImplementor;
-
 import org.hibernate.testing.junit4.BaseUnitTestCase;
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
+import java.util.Collections;
-import static org.junit.Assert.assertNull;
+import java.util.HashMap;
-import static org.junit.Assert.fail;
+import java.util.Map;
+import java.util.Properties;
+
+import static org.junit.Assert.*;
 
 /**
  * @author Steve Ebersole
@@ -146,6 +114,12 @@ public class DialectFactoryTest extends BaseUnitTestCase {
 		testDetermination( "MySQL", 5, 6, MySQL55Dialect.class, resolver );
 		testDetermination( "MySQL", 5, 7, MySQL57Dialect.class, resolver );
 		testDetermination( "MySQL", 8, 0, MySQL57Dialect.class, resolver );
+		testDetermination( "MariaDB", "MariaDB connector/J", 10, 3, MariaDB103Dialect.class, resolver );
+		testDetermination( "MariaDB", "MariaDB connector/J", 10, 2, MariaDB102Dialect.class, resolver );
+		testDetermination( "MariaDB", "MariaDB connector/J", 10, 1, MariaDB10Dialect.class, resolver );
+		testDetermination( "MariaDB", "MariaDB connector/J", 10, 0, MariaDB10Dialect.class, resolver );
+		testDetermination( "MariaDB", "MariaDB connector/J", 5, 5, MariaDB53Dialect.class, resolver );
+		testDetermination( "MariaDB", "MariaDB connector/J", 5, 2, MariaDBDialect.class, resolver );
 		testDetermination( "PostgreSQL", PostgreSQL81Dialect.class, resolver );
 		testDetermination( "PostgreSQL", 8, 2, PostgreSQL82Dialect.class, resolver );
 		testDetermination( "PostgreSQL", 8, 3, PostgreSQL82Dialect.class, resolver );
@@ -250,13 +224,23 @@ public class DialectFactoryTest extends BaseUnitTestCase {
 			final int minorVersion,
 			Class expected,
 			DialectResolver resolver) {
+		testDetermination( databaseName, null, majorVersion, minorVersion, expected, resolver );
+	}
+
+	private void testDetermination(
+			final String databaseName,
+			final String driverName,
+			final int majorVersion,
+			final int minorVersion,
+			Class expected,
+			DialectResolver resolver) {
 		dialectFactory.setDialectResolver( resolver );
 		Dialect resolved = dialectFactory.buildDialect(
 				new Properties(),
 				new DialectResolutionInfoSource() {
 					@Override
 					public DialectResolutionInfo getDialectResolutionInfo() {
-						return TestingDialectResolutionInfo.forDatabaseInfo( databaseName, majorVersion, minorVersion );
+						return TestingDialectResolutionInfo.forDatabaseInfo( databaseName, driverName, majorVersion, minorVersion );
 					}
 				}
 		);

hibernate-core/src/test/java/org/hibernate/dialect/resolver/TestingDialectResolutionInfo.java

@@ -47,6 +47,10 @@ public class TestingDialectResolutionInfo implements DialectResolutionInfo {
 		return new TestingDialectResolutionInfo( name, majorVersion, minorVersion, null, NO_VERSION, NO_VERSION );
 	}
 
+	public static TestingDialectResolutionInfo forDatabaseInfo(String databaseName, String driverName, int majorVersion, int minorVersion) {
+		return new TestingDialectResolutionInfo( databaseName, majorVersion, minorVersion, driverName, NO_VERSION, NO_VERSION );
+	}
+
 	@Override
 	public String getDatabaseName() {
 		return databaseName;

hibernate-core/src/test/java/org/hibernate/engine/jdbc/dialect/internal/StandardDialectResolverTest.java

@@ -6,23 +6,15 @@
  */
 package org.hibernate.engine.jdbc.dialect.internal;
 
-import static org.junit.Assert.assertNotNull;
+import org.hibernate.dialect.*;
-import static org.junit.Assert.assertTrue;
+import org.hibernate.dialect.resolver.TestingDialectResolutionInfo;
+import org.hibernate.testing.junit4.BaseUnitTestCase;
+import org.junit.Test;
 
 import java.sql.SQLException;
 
-import org.hibernate.dialect.Dialect;
+import static org.junit.Assert.assertNotNull;
-import org.hibernate.dialect.PostgreSQL81Dialect;
+import static org.junit.Assert.assertTrue;
-import org.hibernate.dialect.PostgreSQL82Dialect;
-import org.hibernate.dialect.PostgreSQL9Dialect;
-import org.hibernate.dialect.SQLServer2005Dialect;
-import org.hibernate.dialect.SQLServer2008Dialect;
-import org.hibernate.dialect.SQLServer2012Dialect;
-import org.hibernate.dialect.SQLServerDialect;
-import org.hibernate.dialect.resolver.TestingDialectResolutionInfo;
-
-import org.hibernate.testing.junit4.BaseUnitTestCase;
-import org.junit.Test;
 
 /**
  * Unit test of the {@link StandardDialectResolver} class.
@@ -104,6 +96,43 @@ public class StandardDialectResolverTest extends BaseUnitTestCase {
 		runPostgresDialectTest( 9, 2, PostgreSQL9Dialect.class );
 	}
 
+	@Test
+	public void testResolveDialectInternalForMariaDB103() throws SQLException {
+		runMariaDBDialectTest( 10, 3, MariaDB103Dialect.class );
+	}
+
+	@Test
+	public void testResolveDialectInternalForMariaDB102() throws SQLException {
+		runMariaDBDialectTest( 10, 2, MariaDB102Dialect.class );
+	}
+
+	@Test
+	public void testResolveDialectInternalForMariaDB101() throws SQLException {
+		runMariaDBDialectTest( 10, 1, MariaDB10Dialect.class );
+	}
+
+	@Test
+	public void testResolveDialectInternalForMariaDB100() throws SQLException {
+		runMariaDBDialectTest( 10, 0, MariaDB10Dialect.class );
+	}
+
+	@Test
+	public void testResolveDialectInternalForMariaDB55() throws SQLException {
+		runMariaDBDialectTest( 5, 5, MariaDB53Dialect.class );
+	}
+
+	@Test
+	public void testResolveDialectInternalForMariaDB52() throws SQLException {
+		runMariaDBDialectTest( 5, 2, MariaDBDialect.class );
+	}
+
+	private static void runMariaDBDialectTest(
+			int majorVersion, int minorVersion, Class<? extends MariaDBDialect> expectedDialect)
+			throws SQLException {
+		runDialectTest( "MariaDB", "MariaDB connector/J", majorVersion, minorVersion, expectedDialect );
+	}
+
+
 	private static void runSQLServerDialectTest(
 			int version, Class<? extends SQLServerDialect> expectedDialect)
 			throws SQLException {
@@ -123,7 +152,16 @@ public class StandardDialectResolverTest extends BaseUnitTestCase {
 			int majorVersion,
 			int minorVersion,
 			Class<? extends Dialect> expectedDialect) {
-		TestingDialectResolutionInfo info = TestingDialectResolutionInfo.forDatabaseInfo( productName, majorVersion, minorVersion );
+		runDialectTest( productName, null, majorVersion, minorVersion, expectedDialect );
+	}
+
+	private static void runDialectTest(
+			String productName,
+			String driverName,
+			int majorVersion,
+			int minorVersion,
+			Class<? extends Dialect> expectedDialect) {
+		TestingDialectResolutionInfo info = TestingDialectResolutionInfo.forDatabaseInfo( productName, driverName, majorVersion, minorVersion );
 
 		Dialect dialect = StandardDialectResolver.INSTANCE.resolveDialect( info );
 

hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/ForeignKeyDropTest.java

@@ -45,7 +45,7 @@ import static org.junit.Assert.assertThat;
  * @author Andrea Boriero
  */
 @TestForIssue(jiraKey = "HHH-12271")
-@RequiresDialectFeature(DialectChecks.SupportDropCOnstraints.class)
+@RequiresDialectFeature(DialectChecks.SupportDropConstraints.class)
 public class ForeignKeyDropTest extends BaseUnitTestCase {
 	private File output;
 	private MetadataImplementor metadata;
@@ -71,7 +71,7 @@ public class ForeignKeyDropTest extends BaseUnitTestCase {
 
 	@Test
 	@TestForIssue(jiraKey = "HHH-11236")
-	public void testForeignKeyDropIsCOrrectlyGenerated() throws Exception {
+	public void testForeignKeyDropIsCorrectlyGenerated() throws Exception {
 
 		schemaExport
 				.drop( EnumSet.of( TargetType.SCRIPT, TargetType.DATABASE ), metadata );

hibernate-testing/src/main/java/org/hibernate/testing/DialectChecks.java

@@ -230,7 +230,7 @@ abstract public class DialectChecks {
 		}
 	}
 
-	public static class SupportDropCOnstraints implements DialectCheck {
+	public static class SupportDropConstraints implements DialectCheck {
 		public boolean isMatch(Dialect dialect) {
 			return dialect.dropConstraints();
 		}

libraries.gradle

@@ -94,7 +94,7 @@ ext {
             derby:           "org.apache.derby:derby:10.11.1.1",
             postgresql:      'org.postgresql:postgresql:42.1.1',
             mysql:           'mysql:mysql-connector-java:6.0.5',
-            mariadb:         'org.mariadb.jdbc:mariadb-java-client:1.5.7',
+            mariadb:         'org.mariadb.jdbc:mariadb-java-client:2.2.3',
 
             oracle:          'com.oracle.jdbc:ojdbc7:12.1.0.2',
             mssql:           'com.microsoft.sqlserver:mssql-jdbc:6.1.0.jre8',