Skip to content

Commit a4bb4a2

Browse files
committed
fixed the JDBC version in database metadata
1 parent 47734be commit a4bb4a2

2 files changed

Lines changed: 7 additions & 4 deletions

File tree

jdbc-v2/src/main/java/com/clickhouse/jdbc/metadata/DatabaseMetaDataImpl.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@
3232
public class DatabaseMetaDataImpl implements java.sql.DatabaseMetaData, JdbcV2Wrapper {
3333
private static final Logger log = LoggerFactory.getLogger(DatabaseMetaDataImpl.class);
3434

35+
private static final int JDBC_SPEC_MAJOR_VERSION = 4;
36+
private static final int JDBC_SPEC_MINOR_VERSION = 2;
37+
3538
public enum TableType {
3639
DICTIONARY("DICTIONARY"),
3740
LOG_TABLE("LOG TABLE"),
@@ -1410,12 +1413,12 @@ public int getDatabaseMinorVersion() throws SQLException {
14101413

14111414
@Override
14121415
public int getJDBCMajorVersion() throws SQLException {
1413-
return Driver.getDriverMajorVersion();
1416+
return JDBC_SPEC_MAJOR_VERSION;
14141417
}
14151418

14161419
@Override
14171420
public int getJDBCMinorVersion() throws SQLException {
1418-
return Driver.getDriverMinorVersion();
1421+
return JDBC_SPEC_MINOR_VERSION;
14191422
}
14201423

14211424
@Override

jdbc-v2/src/test/java/com/clickhouse/jdbc/metadata/DatabaseMetaDataTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,8 +248,8 @@ public void testSupportFlags() throws Exception {
248248
assertEquals(dbmd.supportsMultipleOpenResults(), false);
249249
assertEquals(dbmd.supportsGetGeneratedKeys(), false);
250250
assertEquals(dbmd.getResultSetHoldability(), 1);
251-
assertEquals(dbmd.getJDBCMajorVersion(), 9);
252-
assertEquals(dbmd.getJDBCMinorVersion(), 6);
251+
assertEquals(dbmd.getJDBCMajorVersion(), 4); // Latest major version (since java 6).
252+
assertEquals(dbmd.getJDBCMinorVersion(), 2); // Most supported minor version (since java 8).
253253
assertEquals(dbmd.getSQLStateType(), 2);
254254
assertEquals(dbmd.supportsStatementPooling(), false);
255255
assertEquals(dbmd.getRowIdLifetime(), ROWID_UNSUPPORTED);

0 commit comments

Comments
 (0)