Skip to content

Commit 97842ab

Browse files
committed
Backed out changeset 46881e56a8f9
1 parent 0004dfb commit 97842ab

1 file changed

Lines changed: 2 additions & 20 deletions

File tree

src/main/java/org/monetdb/jdbc/MonetConnection.java

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1737,7 +1737,7 @@ void setQueryTimeout(final int seconds) throws SQLException {
17371737

17381738
// as of release Jun2020 (11.37.7) the function sys.settimeout(secs bigint)
17391739
// is deprecated and replaced by new sys.setquerytimeout(secs int)
1740-
if (checkMinimumDBVersion(11, 37, 7))
1740+
if (checkMinimumDBVersion(11, 37))
17411741
callstmt = "CALL sys.\"setquerytimeout\"(" + seconds + ")";
17421742
else
17431743
callstmt = "CALL sys.\"settimeout\"(" + seconds + ")";
@@ -2042,7 +2042,7 @@ boolean checkMinimumDBVersion(int major, int minor) {
20422042
* @return true when the server supports ODBC/JDBC escape sequence syntax else false.
20432043
*/
20442044
boolean supportsEscapeSequenceSyntax() {
2045-
return checkMinimumDBVersion(11, 47, 0);
2045+
return checkMinimumDBVersion(11, 47);
20462046
}
20472047

20482048
/**
@@ -2081,15 +2081,6 @@ boolean supportsLargePrepares() {
20812081
* @return whether the system table sys.privilege_codes exist in the connected server.
20822082
*/
20832083
boolean privilege_codesTableExists() {
2084-
if (hasPrivilege_codesTable)
2085-
return true;
2086-
2087-
// optimisation: servers from Jul2021 (11.41.5) onwards will have the system table. No need to send query.
2088-
if (checkMinimumDBVersion(11, 41, 5)) {
2089-
hasPrivilege_codesTable = true;
2090-
return hasPrivilege_codesTable;
2091-
}
2092-
20932084
if (!queriedPrivilege_codesTable) {
20942085
querySysTable();
20952086
queriedPrivilege_codesTable = true; // set flag, so the querying is done only at first invocation.
@@ -2109,15 +2100,6 @@ boolean privilege_codesTableExists() {
21092100
* @return whether the system table sys.comments exist in the connected server.
21102101
*/
21112102
boolean commentsTableExists() {
2112-
if (hasCommentsTable)
2113-
return true;
2114-
2115-
// optimisation: servers from Jul2021 (11.41.5) onwards will have the system table. No need to send query.
2116-
if (checkMinimumDBVersion(11, 41, 5)) {
2117-
hasCommentsTable = true;
2118-
return hasCommentsTable;
2119-
}
2120-
21212103
if (!queriedCommentsTable) {
21222104
querySysTable();
21232105
queriedCommentsTable = true; // set flag, so the querying is done only at first invocation.

0 commit comments

Comments
 (0)