HHH-11220 - Auto-detect SQL Server 2016 when the major version is 13

hibernate · Nov 9, 2016 · 36d6563 · 36d6563
1 parent a356a08
commit 36d6563
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 8 deletions.
diff --git a/...ore/src/main/java/org/hibernate/engine/jdbc/dialect/internal/StandardDialectResolver.java b/...ore/src/main/java/org/hibernate/engine/jdbc/dialect/internal/StandardDialectResolver.java
@@ -149,19 +149,32 @@ else if ( majorVersion == 10 && minorVersion == 5 ) {
 			final int majorVersion = info.getDatabaseMajorVersion();
 
 			switch ( majorVersion ) {
-				case 8:
+				case 8: {
 					return new SQLServerDialect();
-				case 9:
+				}
+				case 9: {
 					return new SQLServer2005Dialect();
-				case 10:
+				}
+				case 10: {
 					return new SQLServer2008Dialect();
+				}
 				case 11:
 				case 12:
+				case 13: {
 					return new SQLServer2012Dialect();
-				default:
-					LOG.unknownSqlServerVersion( majorVersion );
+				}
+				default: {
+					if ( majorVersion < 8 ) {
+						LOG.unknownSqlServerVersion( majorVersion, SQLServerDialect.class );
+						return new SQLServerDialect();
+					}
+					else {
+						// assume `majorVersion > 13`
+						LOG.unknownSqlServerVersion( majorVersion, SQLServer2012Dialect.class );
+						return new SQLServer2012Dialect();
+					}
+				}
 			}
-			return new SQLServerDialect();
 		}
 
 		if ( "Sybase SQL Server".equals( databaseName ) || "Adaptive Server Enterprise".equals( databaseName ) ) {

diff --git a/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java b/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java
@@ -1339,8 +1339,8 @@ void unableToWriteCachedFile(
 	void unknownOracleVersion(int databaseMajorVersion);
 
 	@LogMessage(level = WARN)
-	@Message(value = "Unknown Microsoft SQL Server major version [%s] using SQL Server 2000 dialect", id = 385)
-	void unknownSqlServerVersion(int databaseMajorVersion);
+	@Message(value = "Unknown Microsoft SQL Server major version [%s] using [%s] dialect", id = 385)
+	void unknownSqlServerVersion(int databaseMajorVersion, Class<? extends Dialect> dialectClass);
 
 	@LogMessage(level = WARN)
 	@Message(value = "ResultSet had no statement associated with it, but was not yet registered", id = 386)