Skip to content

Adding issue #2245 test #2296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mzitnik merged 2 commits into from
Apr 10, 2025
Merged

Adding issue #2245 test #2296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8fbc64
Adding issue #2245 test
mzitnik Apr 9, 2025
1e83242
Adding to readVersionFromResource the ability to load from a differen…
mzitnik Apr 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion clickhouse-client/src/main/java/com/clickhouse/client/config/ClickHouseClientOption.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,17 @@ public static String readVersionFromResource(String resourceFilePath) {
tmpVersion = tmp;
}
} catch (Exception e) {
// ignore
try(InputStream in = ClickHouseClientOption.class.getClassLoader().getResourceAsStream(resourceFilePath)) {
Copy link
Contributor

@chernser chernser Apr 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What was the exception?
Should we use this way in default branch?

Properties p = new Properties();
p.load(in);

String tmp = p.getProperty("version");
if (tmp != null && !tmp.isEmpty() && !tmp.equals("${revision}")) {
tmpVersion = tmp;
}
} catch (Exception ee) {
// ignore
}
}
return tmpVersion;
}
Expand Down
15 changes: 10 additions & 5 deletions jdbc-v2/src/test/java/com/clickhouse/jdbc/metadata/DatabaseMetaDataTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,7 @@
import java.util.Properties;
import java.util.Set;

import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;

import static org.testng.Assert.*;


public class DatabaseMetaDataTest extends JdbcIntegrationTest {
Expand Down Expand Up @@ -315,4 +311,13 @@ public void testGetClientInfoProperties() throws Exception {
}
}
}

@Test(groups = { "integration" })
public void testGetDriverVersion() throws Exception {
try (Connection conn = getJdbcConnection()) {
DatabaseMetaData dbmd = conn.getMetaData();
String version = dbmd.getDriverVersion();
assertNotEquals(version, "unknown");
}
}
}
Loading