Skip to content

Commit 5e23ead

Browse files
author
Paultagoras
committed
Conflict between modules
1 parent 38c91bc commit 5e23ead

File tree

11 files changed

+273
-275
lines changed

11 files changed

+273
-275
lines changed

jdbc-v2/src/main/java/com/clickhouse/jdbc/ConnectionImpl.java

Lines changed: 36 additions & 36 deletions
Large diffs are not rendered by default.

jdbc-v2/src/main/java/com/clickhouse/jdbc/DataSourceImpl.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.clickhouse.jdbc;
22

3-
import com.clickhouse.jdbc.internal.SqlExceptionUtils;
3+
import com.clickhouse.jdbc.internal.ExceptionUtils;
44

55
import javax.sql.DataSource;
66
import java.io.PrintWriter;
@@ -70,12 +70,12 @@ public void setLogWriter(PrintWriter out) throws SQLException {
7070

7171
@Override
7272
public void setLoginTimeout(int seconds) throws SQLException {
73-
throw new SQLFeatureNotSupportedException("Method not supported", SqlExceptionUtils.SQL_STATE_FEATURE_NOT_SUPPORTED);
73+
throw new SQLFeatureNotSupportedException("Method not supported", ExceptionUtils.SQL_STATE_FEATURE_NOT_SUPPORTED);
7474
}
7575

7676
@Override
7777
public int getLoginTimeout() throws SQLException {
78-
throw new SQLFeatureNotSupportedException("Method not supported", SqlExceptionUtils.SQL_STATE_FEATURE_NOT_SUPPORTED);
78+
throw new SQLFeatureNotSupportedException("Method not supported", ExceptionUtils.SQL_STATE_FEATURE_NOT_SUPPORTED);
7979
}
8080

8181
@Override
@@ -85,7 +85,7 @@ public ConnectionBuilder createConnectionBuilder() throws SQLException {
8585

8686
@Override
8787
public Logger getParentLogger() throws SQLFeatureNotSupportedException {
88-
throw new SQLFeatureNotSupportedException("Method not supported", SqlExceptionUtils.SQL_STATE_FEATURE_NOT_SUPPORTED);
88+
throw new SQLFeatureNotSupportedException("Method not supported", ExceptionUtils.SQL_STATE_FEATURE_NOT_SUPPORTED);
8989
}
9090

9191
@Override

jdbc-v2/src/main/java/com/clickhouse/jdbc/Driver.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33

44
import com.clickhouse.jdbc.internal.JdbcConfiguration;
5-
import com.clickhouse.jdbc.internal.SqlExceptionUtils;
5+
import com.clickhouse.jdbc.internal.ExceptionUtils;
66
import org.slf4j.Logger;
77
import org.slf4j.LoggerFactory;
88

@@ -158,6 +158,6 @@ public boolean jdbcCompliant() {
158158

159159
@Override
160160
public java.util.logging.Logger getParentLogger() throws SQLFeatureNotSupportedException {
161-
throw new SQLFeatureNotSupportedException("Method not supported", SqlExceptionUtils.SQL_STATE_FEATURE_NOT_SUPPORTED);
161+
throw new SQLFeatureNotSupportedException("Method not supported", ExceptionUtils.SQL_STATE_FEATURE_NOT_SUPPORTED);
162162
}
163163
}

jdbc-v2/src/main/java/com/clickhouse/jdbc/PreparedStatementImpl.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.clickhouse.jdbc;
22

3-
import com.clickhouse.jdbc.internal.SqlExceptionUtils;
3+
import com.clickhouse.jdbc.internal.ExceptionUtils;
44
import org.slf4j.Logger;
55
import org.slf4j.LoggerFactory;
66

@@ -235,7 +235,7 @@ public void setCharacterStream(int parameterIndex, Reader x, int length) throws
235235
@Override
236236
public void setRef(int parameterIndex, Ref x) throws SQLException {
237237
checkClosed();
238-
throw new SQLFeatureNotSupportedException("Ref is not supported.", SqlExceptionUtils.SQL_STATE_FEATURE_NOT_SUPPORTED);
238+
throw new SQLFeatureNotSupportedException("Ref is not supported.", ExceptionUtils.SQL_STATE_FEATURE_NOT_SUPPORTED);
239239
}
240240

241241
@Override
@@ -532,7 +532,7 @@ private static String encodeObject(Object x) throws SQLException {
532532
return escapeString(x.toString());//Escape single quotes
533533
} catch (Exception e) {
534534
LOG.error("Error encoding object", e);
535-
throw new SQLException("Error encoding object", SqlExceptionUtils.SQL_STATE_SQL_ERROR, e);
535+
throw new SQLException("Error encoding object", ExceptionUtils.SQL_STATE_SQL_ERROR, e);
536536
}
537537
}
538538

0 commit comments

Comments
 (0)