add some more info (currently unused) to the ExtractedDatabaseMetaData

Author: gavinking

hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/ExtractedDatabaseMetaDataImpl.java

@@ -37,6 +37,9 @@ public class ExtractedDatabaseMetaDataImpl implements ExtractedDatabaseMetaData
 	private final String connectionCatalogName;
 	private final String connectionSchemaName;
 
+	private final String databaseProductName;
+	private final String databaseProductVersion;
+
 	private final boolean supportsRefCursors;
 	private final boolean supportsNamedParameters;
 	private final boolean supportsScrollableResults;
@@ -62,6 +65,8 @@ private ExtractedDatabaseMetaDataImpl(
 			JdbcConnectionAccess connectionAccess,
 			String connectionCatalogName,
 			String connectionSchemaName,
+			String databaseProductName,
+			String databaseProductVersion,
 			boolean supportsRefCursors,
 			boolean supportsNamedParameters,
 			boolean supportsScrollableResults,
@@ -80,6 +85,8 @@ private ExtractedDatabaseMetaDataImpl(
 		this.connectionAccess = connectionAccess;
 		this.connectionCatalogName = connectionCatalogName;
 		this.connectionSchemaName = connectionSchemaName;
+		this.databaseProductName = databaseProductName;
+		this.databaseProductVersion = databaseProductVersion;
 		this.supportsRefCursors = supportsRefCursors;
 		this.supportsNamedParameters = supportsNamedParameters;
 		this.supportsScrollableResults = supportsScrollableResults;
@@ -151,6 +158,16 @@ public String getConnectionSchemaName() {
 		return connectionSchemaName;
 	}
 
+	@Override
+	public String getDatabaseProductName() {
+		return databaseProductName;
+	}
+
+	@Override
+	public String getDatabaseProductVersion() {
+		return databaseProductVersion;
+	}
+
 	@Override
 	public String getUrl() {
 		return url;
@@ -206,6 +223,9 @@ public static class Builder {
 		private String connectionSchemaName;
 		private String connectionCatalogName;
 
+		private String databaseProductName;
+		private String databaseProductVersion;
+
 		private boolean supportsRefCursors;
 		private boolean supportsNamedParameters;
 		private boolean supportsScrollableResults;
@@ -229,7 +249,9 @@ public Builder(JdbcEnvironment jdbcEnvironment, boolean jdbcMetadataIsAccessible
 
 		public Builder apply(DatabaseMetaData databaseMetaData) throws SQLException {
 			connectionCatalogName = databaseMetaData.getConnection().getCatalog();
-			// NOTE : databaseMetaData.getConnection().getSchema() would require java 1.7 as baseline
+			connectionSchemaName = databaseMetaData.getConnection().getSchema();
+			databaseProductName = databaseMetaData.getDatabaseProductName();
+			databaseProductVersion = databaseMetaData.getDatabaseProductVersion();
 			supportsRefCursors = StandardRefCursorSupport.supportsRefCursors( databaseMetaData );
 			supportsNamedParameters = databaseMetaData.supportsNamedParameters();
 			supportsScrollableResults = databaseMetaData.supportsResultSetType( ResultSet.TYPE_SCROLL_INSENSITIVE );
@@ -307,6 +329,8 @@ public ExtractedDatabaseMetaDataImpl build() {
 					connectionAccess,
 					connectionCatalogName,
 					connectionSchemaName,
+					databaseProductName,
+					databaseProductVersion,
 					supportsRefCursors,
 					supportsNamedParameters,
 					supportsScrollableResults,

hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/ExtractedDatabaseMetaData.java

@@ -25,6 +25,10 @@ public interface ExtractedDatabaseMetaData {
 	 */
 	JdbcEnvironment getJdbcEnvironment();
 
+	String getDatabaseProductName();
+
+	String getDatabaseProductVersion();
+
 	/**
 	 * Retrieve the name of the catalog in effect when we connected to the database.
 	 *

hibernate-core/src/test/java/org/hibernate/orm/test/datasource/TestDataSourceConnectionProvider.java

@@ -17,6 +17,7 @@
 import java.util.Map;
 import java.util.logging.Logger;
 
+@SuppressWarnings( "unused" ) // used by DatasourceTest in this package
 public class TestDataSourceConnectionProvider
 		extends DatasourceConnectionProviderImpl
 		implements ServiceRegistryAwareService {