chore: resolve merge

databendlabs · Sep 6, 2024 · 539915d · 539915d
2 parents b8145fb + 1b209a0
commit 539915d
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 5 deletions.
diff --git a/databend-jdbc/src/main/java/com/databend/jdbc/DatabendConnection.java b/databend-jdbc/src/main/java/com/databend/jdbc/DatabendConnection.java
@@ -758,6 +758,7 @@ void tryAutoDiscovery(OkHttpClient client, ClientSettings settings) {
                 }
             }
         }
+
     }
 
     DatabendClient startQuery(String sql) throws SQLException {

diff --git a/databend-jdbc/src/test/java/com/databend/jdbc/TestBasicDriver.java b/databend-jdbc/src/test/java/com/databend/jdbc/TestBasicDriver.java
@@ -9,7 +9,15 @@
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
-import java.sql.*;
+
+import java.sql.Connection;
+import java.sql.Date;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.sql.Timestamp;
 import java.util.Properties;
 
 import static org.junit.jupiter.api.Assertions.assertThrows;

diff --git a/databend-jdbc/src/test/java/com/databend/jdbc/TestDatabendParameterMetaData.java b/databend-jdbc/src/test/java/com/databend/jdbc/TestDatabendParameterMetaData.java
@@ -5,7 +5,13 @@
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
-import java.sql.*;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ParameterMetaData;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.sql.Types;
 
 
 public class TestDatabendParameterMetaData {

diff --git a/databend-jdbc/src/test/java/com/databend/jdbc/TestFileTransfer.java b/databend-jdbc/src/test/java/com/databend/jdbc/TestFileTransfer.java
@@ -11,7 +11,12 @@
 
 import java.io.*;
 import java.nio.file.Files;
-import java.sql.*;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 

diff --git a/databend-jdbc/src/test/java/com/databend/jdbc/TestMultiHost.java b/databend-jdbc/src/test/java/com/databend/jdbc/TestMultiHost.java
@@ -1,6 +1,7 @@
 package com.databend.jdbc;
 
 import com.databend.client.DiscoveryNode;
+
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
@@ -20,6 +21,7 @@ public class TestMultiHost {
     private final String AUTO_DISCOVERY_JDBC_URL = "jdbc:databend://localhost:8000/default?load_balancing_policy=round_robin&auto_discovery=true";
     private final String UNSUPPORT_AUTO_DISCOVERY_JDBC_URL = "jdbc:databend://localhost:8000/default?load_balancing_policy=round_robin&auto_discovery=true&enable_mock=true";
 
+
     private Connection createConnection(String url)
             throws SQLException {
         return DriverManager.getConnection(url, "databend", "databend");

diff --git a/databend-jdbc/src/test/java/com/databend/jdbc/TestPrepareStatement.java b/databend-jdbc/src/test/java/com/databend/jdbc/TestPrepareStatement.java
@@ -6,7 +6,15 @@
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.Date;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.sql.Timestamp;
+import java.sql.Types;
 import java.util.ArrayList;
 import java.util.List;
 

diff --git a/databend-jdbc/src/test/java/com/databend/jdbc/TestTransaction.java b/databend-jdbc/src/test/java/com/databend/jdbc/TestTransaction.java
@@ -4,7 +4,11 @@
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
 
 public class TestTransaction {
-Original file line number
+Diff line change
@@ Expand Up @@
                     }
                 }
             }
         }
         DatabendClient startQuery(String sql) throws SQLException {
@@ Expand Down @@