From cdb11f9be217792c89e67e036b507e9ad2d463f0 Mon Sep 17 00:00:00 2001 From: Andrea Boriero Date: Fri, 22 Apr 2016 11:38:47 +0100 Subject: [PATCH] HHH-10695 - Fix MySQL should not use the NCLOB type (cherry picked from commit 455d86307b624cc07e40d7308af7295e4cc44112) --- databases.gradle | 6 +++--- .../src/main/java/org/hibernate/dialect/MySQLDialect.java | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/databases.gradle b/databases.gradle index bc5cb8c7cf..0e6b7c5654 100644 --- a/databases.gradle +++ b/databases.gradle @@ -33,9 +33,9 @@ ext { mysql : [ 'db.dialect' : 'org.hibernate.dialect.MySQL57InnoDBDialect', 'jdbc.driver': 'com.mysql.jdbc.Driver', - 'jdbc.user' : 'dballo15', - 'jdbc.pass' : 'dballo15', - 'jdbc.url' : 'jdbc\\:mysql\\://db19.mw.lab.eng.bos.redhat.com\\:3306/dballo15' + 'jdbc.user' : 'hibernateormtest', + 'jdbc.pass' : 'hibernateormtest', + 'jdbc.url' : 'jdbc:mysql://localhost/hibernate_orm_test' ], mariadb : [ 'db.dialect' : 'org.hibernate.dialect.MySQL57InnoDBDialect', diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java index 32aa406af6..773f8c158d 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java @@ -85,6 +85,7 @@ public class MySQLDialect extends Dialect { // registerColumnType( Types.BLOB, 16777215, "mediumblob" ); // registerColumnType( Types.BLOB, 65535, "blob" ); registerColumnType( Types.CLOB, "longtext" ); + registerColumnType( Types.NCLOB, "longtext" ); // registerColumnType( Types.CLOB, 16777215, "mediumtext" ); // registerColumnType( Types.CLOB, 65535, "text" ); registerVarcharTypes();