Merge pull request #765 from quickfix-j/hsql-isvalid

chrjohn · web-flow · commit 25bbd8a35edd · 2024-02-08T13:22:31.000+01:00
Corrected failing `SessionTest` on Ubuntu runner
diff --git a/quickfixj-core/src/test/java/quickfix/JdbcLogTest.java b/quickfixj-core/src/test/java/quickfix/JdbcLogTest.java
@@ -133,7 +133,6 @@ private void setUpJdbcLog(boolean filterHeartbeats, DataSource dataSource) throw
         if (filterHeartbeats) {
             settings.setBool(JdbcSetting.SETTING_JDBC_LOG_HEARTBEATS, false);
         }
-        settings.setString(sessionID, JdbcSetting.SETTING_JDBC_CONNECTION_TEST_QUERY, "SELECT COUNT(1) FROM INFORMATION_SCHEMA.SYSTEM_USERS WHERE 1 = 0;");
         JdbcTestSupport.setHypersonicSettings(settings);
         initializeTableDefinitions(connection);
         logFactory = new JdbcLogFactory(settings);
diff --git a/quickfixj-core/src/test/java/quickfix/JdbcTestSupport.java b/quickfixj-core/src/test/java/quickfix/JdbcTestSupport.java
@@ -43,6 +43,8 @@ public static void setHypersonicSettings(SessionSettings settings) {
         settings.setString(JdbcSetting.SETTING_JDBC_CONNECTION_URL, HSQL_CONNECTION_URL);
         settings.setString(JdbcSetting.SETTING_JDBC_USER, HSQL_USER);
         settings.setString(JdbcSetting.SETTING_JDBC_PASSWORD, "");
+        // HSQL doesn't support JDBC4 which means that test query has to be supplied to HikariCP
+        settings.setString(JdbcSetting.SETTING_JDBC_CONNECTION_TEST_QUERY, "SELECT COUNT(1) FROM INFORMATION_SCHEMA.SYSTEM_USERS WHERE 1 = 0;");
     }
 
     public static Connection getConnection() throws ClassNotFoundException, SQLException {

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,6 @@ private void setUpJdbcLog(boolean filterHeartbeats, DataSource dataSource) throw`
`133`	`133`	`if (filterHeartbeats) {`
`134`	`134`	`settings.setBool(JdbcSetting.SETTING_JDBC_LOG_HEARTBEATS, false);`
`135`	`135`	`}`
`136`		`- settings.setString(sessionID, JdbcSetting.SETTING_JDBC_CONNECTION_TEST_QUERY, "SELECT COUNT(1) FROM INFORMATION_SCHEMA.SYSTEM_USERS WHERE 1 = 0;");`
`137`	`136`	`JdbcTestSupport.setHypersonicSettings(settings);`
`138`	`137`	`initializeTableDefinitions(connection);`
`139`	`138`	`logFactory = new JdbcLogFactory(settings);`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,8 @@ public static void setHypersonicSettings(SessionSettings settings) {`
`43`	`43`	`settings.setString(JdbcSetting.SETTING_JDBC_CONNECTION_URL, HSQL_CONNECTION_URL);`
`44`	`44`	`settings.setString(JdbcSetting.SETTING_JDBC_USER, HSQL_USER);`
`45`	`45`	`settings.setString(JdbcSetting.SETTING_JDBC_PASSWORD, "");`
	`46`	`+ // HSQL doesn't support JDBC4 which means that test query has to be supplied to HikariCP`
	`47`	`+ settings.setString(JdbcSetting.SETTING_JDBC_CONNECTION_TEST_QUERY, "SELECT COUNT(1) FROM INFORMATION_SCHEMA.SYSTEM_USERS WHERE 1 = 0;");`
`46`	`48`	`}`
`47`	`49`
`48`	`50`	`public static Connection getConnection() throws ClassNotFoundException, SQLException {`