fixed broken unit tests

- use select version()
firebolt-db · Apr 4, 2024 · bf6c107 · bf6c107
1 parent f372a7d
commit bf6c107
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 29 deletions.
diff --git a/src/main/java/com/firebolt/jdbc/metadata/FireboltDatabaseMetadata.java b/src/main/java/com/firebolt/jdbc/metadata/FireboltDatabaseMetadata.java
@@ -161,7 +161,7 @@ public class FireboltDatabaseMetadata implements DatabaseMetaData {
 
 	private final String url;
 	private final FireboltConnection connection;
-	private String databaseVersion;
+	private volatile String databaseVersion;
 
 	public FireboltDatabaseMetadata(String url, FireboltConnection connection) {
 		this.url = url;
@@ -403,7 +403,7 @@ public int getDriverMinorVersion() {
 	@Override
 	public String getDatabaseProductVersion() throws SQLException {
 		if (databaseVersion == null) {
-			try (Statement statement = connection.createStatement(); ResultSet rs = statement.executeQuery("select version()")) {
+			try (Statement statement = connection.createStatement(); ResultSet rs = statement.executeQuery("SELECT VERSION()")) {
 				databaseVersion = rs.next() ? rs.getString(1) : "";
 			}
 		}

diff --git a/src/main/java/com/firebolt/jdbc/metadata/MetadataUtil.java b/src/main/java/com/firebolt/jdbc/metadata/MetadataUtil.java
@@ -6,7 +6,6 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
@@ -59,12 +58,6 @@ public String getTablesQuery(@SuppressWarnings("java:S1172") String catalog, Str
 		return queryBuilder.conditions(conditions).orderBy("table_schema, table_name").build().toSql();
 	}
 
-	public static String getDatabaseVersionQuery(String engine) {
-		return Query.builder().select("version").from("information_schema.engines")
-				.conditions(Collections.singletonList(format("engine_name iLIKE '%s%%'", engine))).build()
-				.toSql();
-	}
-
 	/**
 	 * Represents a SQL query that can be sent to Firebolt to receive metadata info
 	 */

diff --git a/src/test/java/com/firebolt/jdbc/metadata/FireboltDatabaseMetadataTest.java b/src/test/java/com/firebolt/jdbc/metadata/FireboltDatabaseMetadataTest.java
@@ -367,32 +367,26 @@ void shouldGetJdbcManorVersion() throws SQLException {
 
 	@Test
 	void shouldGetDatabaseProductVersion() throws SQLException {
-		Statement statement = mock(FireboltStatement.class);
-		when(fireboltConnection.createStatement()).thenReturn(statement);
-		when(fireboltConnection.getEngine()).thenReturn("test");
-		when(statement.executeQuery("SELECT version FROM information_schema.engines WHERE engine_name iLIKE 'test%'"))
-				.thenReturn(new FireboltResultSet(getInputStreamForGetVersion()));
+		mockGetDatabaseVersion();
 		assertEquals("abcd_xxx_123", fireboltDatabaseMetadata.getDatabaseProductVersion());
 	}
 
 	@Test
 	void shouldGetDatabaseMajorVersion() throws SQLException {
-		Statement statement = mock(FireboltStatement.class);
-		when(fireboltConnection.createStatement()).thenReturn(statement);
-		when(fireboltConnection.getEngine()).thenReturn("test");
-		when(statement.executeQuery("SELECT version FROM information_schema.engines WHERE engine_name iLIKE 'test%'"))
-				.thenReturn(new FireboltResultSet(getInputStreamForGetVersion()));
+		mockGetDatabaseVersion();
 		assertEquals(0, fireboltDatabaseMetadata.getDatabaseMajorVersion());
 	}
 
 	@Test
 	void shouldGetDatabaseMinorVersion() throws SQLException {
+		mockGetDatabaseVersion();
+		assertEquals(0, fireboltDatabaseMetadata.getDatabaseMinorVersion());
+	}
+
+	private void mockGetDatabaseVersion() throws SQLException {
 		Statement statement = mock(FireboltStatement.class);
 		when(fireboltConnection.createStatement()).thenReturn(statement);
-		when(fireboltConnection.getEngine()).thenReturn("test");
-		when(statement.executeQuery("SELECT version FROM information_schema.engines WHERE engine_name iLIKE 'test%'"))
-				.thenReturn(new FireboltResultSet(getInputStreamForGetVersion()));
-		assertEquals(0, fireboltDatabaseMetadata.getDatabaseMinorVersion());
+		when(statement.executeQuery("SELECT VERSION()")).thenReturn(new FireboltResultSet(getInputStreamForGetVersion()));
 	}
 
 	@Test

diff --git a/src/test/java/com/firebolt/jdbc/metadata/MetadataUtilTest.java b/src/test/java/com/firebolt/jdbc/metadata/MetadataUtilTest.java
@@ -52,10 +52,4 @@ void shouldGetColumnsQueryWhenGettingQueryWithoutArguments() {
 				"SELECT table_schema, table_name, column_name, data_type, column_default, is_nullable, ordinal_position FROM information_schema.columns",
 				MetadataUtil.getColumnsQuery(null, null, null));
 	}
-
-	@Test
-	void shouldGetVersionQuery() {
-		assertEquals("SELECT version FROM information_schema.engines WHERE engine_name iLIKE 'test%'",
-				MetadataUtil.getDatabaseVersionQuery("test"));
-	}
 }