rebase

Author: sergiyvamz

wrapper/src/main/java/software/amazon/jdbc/dialect/AuroraPgDialect.java

@@ -20,9 +20,9 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.util.Properties;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Properties;
 import java.util.logging.Logger;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;

wrapper/src/main/java/software/amazon/jdbc/dialect/MariaDbDialect.java

@@ -26,15 +26,15 @@
 import java.util.Properties;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
-import software.amazon.jdbc.HostRole;
 import software.amazon.jdbc.ConnectionPluginManager;
+import software.amazon.jdbc.HostRole;
 import software.amazon.jdbc.HostSpec;
 import software.amazon.jdbc.exceptions.ExceptionHandler;
 import software.amazon.jdbc.exceptions.MariaDBExceptionHandler;
 import software.amazon.jdbc.hostlistprovider.ConnectionStringHostListProvider;
 import software.amazon.jdbc.plugin.failover.FailoverRestriction;
-import software.amazon.jdbc.util.Pair;
 import software.amazon.jdbc.util.DriverInfo;
+import software.amazon.jdbc.util.Pair;
 
 public class MariaDbDialect implements Dialect {
 

wrapper/src/main/java/software/amazon/jdbc/dialect/MysqlDialect.java

@@ -26,15 +26,15 @@
 import java.util.Properties;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
-import software.amazon.jdbc.HostRole;
 import software.amazon.jdbc.ConnectionPluginManager;
+import software.amazon.jdbc.HostRole;
 import software.amazon.jdbc.HostSpec;
 import software.amazon.jdbc.exceptions.ExceptionHandler;
 import software.amazon.jdbc.exceptions.MySQLExceptionHandler;
 import software.amazon.jdbc.hostlistprovider.ConnectionStringHostListProvider;
 import software.amazon.jdbc.plugin.failover.FailoverRestriction;
-import software.amazon.jdbc.util.Pair;
 import software.amazon.jdbc.util.DriverInfo;
+import software.amazon.jdbc.util.Pair;
 
 public class MysqlDialect implements Dialect {
 

wrapper/src/test/java/software/amazon/jdbc/DialectDetectionTests.java

@@ -38,7 +38,6 @@
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mock;
-import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import software.amazon.jdbc.dialect.AuroraMysqlDialect;
 import software.amazon.jdbc.dialect.AuroraPgDialect;

wrapper/src/test/java/software/amazon/jdbc/DialectTests.java

@@ -28,7 +28,6 @@
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.util.Properties;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -110,7 +109,7 @@ void testMysqlIsDialectIncorrectVersionComment() throws SQLException {
   @Test
   void testRdsMysqlIsDialectSuccess() throws SQLException {
     when(mockStatement.executeQuery(any())).thenReturn(successResultSet);
-    when(successResultSet.next()).thenReturn(true, true, true, true);
+    when(successResultSet.next()).thenReturn(true, false, true, true);
     when(successResultSet.getString(2)).thenReturn(
         "Source distribution", "Source distribution", "");
     when(successResultSet.getMetaData()).thenReturn(mockResultSetMetaData);
@@ -143,11 +142,11 @@ void testRdsMysqlIsDialectSuperIsDialectReturnedTrue() throws SQLException {
   @Test
   void testRdsMysqlIsDialectInvalidVersionComment() throws SQLException {
     when(mockStatement.executeQuery(any())).thenReturn(successResultSet);
-    when(successResultSet.next()).thenReturn(true, true, true, false);
+    when(successResultSet.next()).thenReturn(true, false, true, false);
     when(successResultSet.getString(2)).thenReturn("Invalid");
     when(successResultSet.getMetaData()).thenReturn(mockResultSetMetaData);
     assertFalse(rdsMysqlDialect.isDialect(mockConnection));
-    verify(successResultSet, times(2)).next();
+    verify(successResultSet, times(3)).next();
   }
 
   // RDS MULTI A-Z DB CLUSTER MYSQL DIALECT
@@ -170,7 +169,7 @@ void testRdsTazMysqlIsDialectExceptionThrown() throws SQLException {
   void testRdsTazMysqlIsDialectQueryReturnedEmptyResultSet() throws SQLException {
     when(mockStatement.executeQuery(any())).thenReturn(failResultSet);
     assertFalse(rdsTazMysqlDialect.isDialect(mockConnection));
-    verify(failResultSet, times(2)).next();
+    verify(failResultSet, times(1)).next();
   }
 
   // AURORA MYSQL DIALECT
@@ -191,15 +190,14 @@ void testAuroraMysqlIsDialectExceptionThrown() throws SQLException {
   void testAuroraMysqlIsDialectQueryReturnedEmptyResultSet() throws SQLException {
     when(mockStatement.executeQuery(any())).thenReturn(failResultSet);
     assertFalse(auroraMysqlDialect.isDialect(mockConnection));
-    verify(failResultSet, times(2)).next();
+    verify(failResultSet, times(1)).next();
   }
 
   // PG DIALECT
   @Test
   void testPgIsDialectSuccess() throws SQLException {
     when(mockStatement.executeQuery(any())).thenReturn(successResultSet);
     when(successResultSet.next()).thenReturn(true);
-    when(successResultSet.getString(2)).thenReturn("postgresql");
     assertTrue(pgDialect.isDialect(mockConnection));
   }
 
@@ -221,7 +219,6 @@ void testPgIsDialectQueryReturnedEmptyResultSet() throws SQLException {
   void testRdsPgIsDialectSuccess() throws SQLException {
     when(mockStatement.executeQuery(any())).thenReturn(successResultSet);
     when(successResultSet.next()).thenReturn(true);
-    when(successResultSet.getString(2)).thenReturn("postgresql");
     when(successResultSet.getBoolean("rds_tools")).thenReturn(true);
     when(successResultSet.getBoolean("aurora_stat_utils")).thenReturn(false);
     assertTrue(rdsPgDialect.isDialect(mockConnection));
@@ -255,7 +252,6 @@ void testRdsTazPgIsDialectSuccess() throws SQLException {
     when(mockStatement.executeQuery(any())).thenReturn(successResultSet);
     when(successResultSet.next()).thenReturn(true);
     when(successResultSet.getString(1)).thenReturn("id");
-    when(successResultSet.getString(2)).thenReturn("postgresql");
     assertTrue(rdsTazPgDialect.isDialect(mockConnection));
   }
 
@@ -285,7 +281,6 @@ void testRdsTazPgIsDialectIsRdsClusterQueryFailed() throws SQLException {
   void testAuroraPgIsDialectSuccess() throws SQLException {
     when(mockStatement.executeQuery(any())).thenReturn(successResultSet);
     when(successResultSet.next()).thenReturn(true);
-    when(successResultSet.getString(2)).thenReturn("postgresql");
     when(successResultSet.getBoolean("aurora_stat_utils")).thenReturn(true);
     assertTrue(auroraPgDialect.isDialect(mockConnection));
   }
@@ -316,7 +311,7 @@ void testAuroraPgIsDialectMissingAuroraStatUtils() throws SQLException {
   void testMariaDbIsDialectSuccess() throws SQLException {
     when(mockStatement.executeQuery(any())).thenReturn(successResultSet);
     when(successResultSet.next()).thenReturn(true);
-    when(successResultSet.getString(2)).thenReturn("mariadb");
+    when(successResultSet.getString(1)).thenReturn("mariadb");
     assertTrue(mariaDbDialect.isDialect(mockConnection));
   }
 
@@ -337,7 +332,7 @@ void testMariaDbIsDialectQueryReturnedEmptyResultSet() throws SQLException {
   void testMariaDbIsDialectIncorrectVersion() throws SQLException {
     when(mockStatement.executeQuery(any())).thenReturn(successResultSet);
     when(successResultSet.next()).thenReturn(true, false);
-    when(successResultSet.getString(2)).thenReturn("Invalid");
+    when(successResultSet.getString(1)).thenReturn("Invalid");
     assertFalse(mariaDbDialect.isDialect(mockConnection));
   }
 }