Skip to content

Added changes for newer MySQL versions. #48

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

Open
nemux wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added changes for newer MySQL versions. #48

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
ccd8a2c
* Added transaction isolation system variable selection according to …
nemux Apr 21, 2020
dbde434
* Updated return values for CommonDatabaseMetaData.getDatabaseMajorVe…
nemux Apr 21, 2020
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
4 changes: 2 additions & 2 deletions src/main/java/org/drizzle/jdbc/CommonDatabaseMetaData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2419,7 +2419,7 @@ public int getResultSetHoldability() throws SQLException {
* @since 1.4
*/
public int getDatabaseMajorVersion() throws SQLException {
return 0;
return Integer.parseInt(version.split("\\.")[0]);
}

/**
Expand All @@ -2430,7 +2430,7 @@ public int getDatabaseMajorVersion() throws SQLException {
* @since 1.4
*/
public int getDatabaseMinorVersion() throws SQLException {
return 1;
return version.split("\\.").length > 1 ? Integer.parseInt(version.split("\\.")[1]) : 0 ;
}

/**
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/drizzle/jdbc/DrizzleConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,8 @@ public void setTransactionIsolation(final int level) throws SQLException {
public int getTransactionIsolation() throws SQLException {
final Statement stmt = createStatement();
try {
final ResultSet rs = stmt.executeQuery("SELECT @@tx_isolation");
String tx_isolation = Integer.parseInt(protocol.getServerVersion().split("\\.")[0]) >= 8 ? "SELECT @@transaction_isolation":"SELECT @@tx_isolation" ;
final ResultSet rs = stmt.executeQuery(tx_isolation);
rs.next();
final String response = rs.getString(1);
if (response.equals("REPEATABLE-READ")) {
Expand Down