HHH-10183 - Mapping for NVARCHAR in SqlServer not working with native…

… queries; org.hibernate.MappingException: No Dialect mapping for JDBC type: -9 (cherry picked from commit 0693b54)
hibernate · May 19, 2017 · 3345de7 · 3345de7
1 parent 29bb4e3
commit 3345de7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java
@@ -228,6 +228,7 @@ protected Dialect() {
 		registerHibernateType( Types.TIME, StandardBasicTypes.TIME.getName() );
 		registerHibernateType( Types.TIMESTAMP, StandardBasicTypes.TIMESTAMP.getName() );
 		registerHibernateType( Types.VARCHAR, StandardBasicTypes.STRING.getName() );
+		registerHibernateType( Types.NVARCHAR, StandardBasicTypes.NSTRING.getName() );
 		registerHibernateType( Types.VARBINARY, StandardBasicTypes.BINARY.getName() );
 		registerHibernateType( Types.LONGVARCHAR, StandardBasicTypes.TEXT.getName() );
 		registerHibernateType( Types.LONGVARBINARY, StandardBasicTypes.IMAGE.getName() );

diff --git a/hibernate-core/src/main/java/org/hibernate/type/StandardBasicTypes.java b/hibernate-core/src/main/java/org/hibernate/type/StandardBasicTypes.java
@@ -127,6 +127,11 @@ private StandardBasicTypes() {
 	 */
 	public static final StringType STRING = StringType.INSTANCE;
 
+	/**
+	 * The standard Hibernate type for mapping {@link String} to JDBC {@link java.sql.Types#NVARCHAR NVARCHAR}
+	 */
+	public static final StringNVarcharType NSTRING = StringNVarcharType.INSTANCE;
+
 	/**
 	 * The standard Hibernate type for mapping {@link java.net.URL} to JDBC {@link java.sql.Types#VARCHAR VARCHAR}.
 	 *

diff --git a/hibernate-core/src/test/java/org/hibernate/test/scalar/NationalizedScalarQueryTest.java b/hibernate-core/src/test/java/org/hibernate/test/scalar/NationalizedScalarQueryTest.java
@@ -16,7 +16,6 @@
 import org.hibernate.annotations.Nationalized;
 import org.hibernate.dialect.SQLServer2008Dialect;
 
-import org.hibernate.testing.FailureExpected;
 import org.hibernate.testing.RequiresDialect;
 import org.hibernate.testing.TestForIssue;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
@@ -37,7 +36,6 @@ protected Class<?>[] getAnnotatedClasses() {
 	}
 
 	@Test
-	@FailureExpected(jiraKey = "HHH-10183")
 	public void testScalarResult() {
 
 		User user1 = new User( 1, "Chris" );