Skip to content

Commit 216b9f1

Browse files
chernserchernser
committed
fixed minor issues
1 parent 6548efb commit 216b9f1

13 files changed

Lines changed: 142 additions & 137 deletions

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,9 @@ public PreparedStatementImpl(ConnectionImpl connection, String sql) throws SQLEx
7979
this.sqlSegments = splitStatement(originalSql);
8080
this.statementType = parseStatementType(originalSql);
8181

82-
switch (statementType) {
83-
case INSERT:
84-
insertIntoSQL = originalSql.substring(0, originalSql.indexOf("VALUES") + 6);
85-
valueSegments = originalSql.substring(originalSql.indexOf("VALUES") + 6).split("\\?");
86-
break;
82+
if (this.statementType == StatementType.INSERT) {
83+
insertIntoSQL = originalSql.substring(0, originalSql.indexOf("VALUES") + 6);
84+
valueSegments = originalSql.substring(originalSql.indexOf("VALUES") + 6).split("\\?");
8785
}
8886

8987
//Create an array of objects to store the parameters

‎jdbc-v2/src/main/java/com/clickhouse/jdbc/ResultSetImpl.java‎

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

3-
import java.io.ByteArrayInputStream;
4-
import java.io.InputStream;
5-
import java.io.Reader;
6-
import java.io.StringReader;
7-
import java.math.BigDecimal;
8-
import java.net.URL;
9-
import java.nio.charset.StandardCharsets;
10-
import java.sql.*;
11-
import java.sql.Date;
12-
import java.time.ZonedDateTime;
13-
import java.util.*;
14-
153
import com.clickhouse.client.api.data_formats.ClickHouseBinaryFormatReader;
164
import com.clickhouse.client.api.metadata.TableSchema;
175
import com.clickhouse.client.api.query.QueryResponse;
@@ -24,6 +12,35 @@
2412
import org.slf4j.Logger;
2513
import org.slf4j.LoggerFactory;
2614

15+
import java.io.ByteArrayInputStream;
16+
import java.io.InputStream;
17+
import java.io.Reader;
18+
import java.io.StringReader;
19+
import java.math.BigDecimal;
20+
import java.net.URL;
21+
import java.nio.charset.StandardCharsets;
22+
import java.sql.Blob;
23+
import java.sql.Clob;
24+
import java.sql.Date;
25+
import java.sql.NClob;
26+
import java.sql.Ref;
27+
import java.sql.ResultSet;
28+
import java.sql.ResultSetMetaData;
29+
import java.sql.RowId;
30+
import java.sql.SQLException;
31+
import java.sql.SQLFeatureNotSupportedException;
32+
import java.sql.SQLType;
33+
import java.sql.SQLWarning;
34+
import java.sql.SQLXML;
35+
import java.sql.Statement;
36+
import java.sql.Time;
37+
import java.sql.Timestamp;
38+
import java.time.ZonedDateTime;
39+
import java.util.Calendar;
40+
import java.util.Collections;
41+
import java.util.List;
42+
import java.util.Map;
43+
2744
public class ResultSetImpl implements ResultSet, JdbcV2Wrapper {
2845
private static final Logger log = LoggerFactory.getLogger(ResultSetImpl.class);
2946
private ResultSetMetaData metaData;

‎jdbc-v2/src/main/java/com/clickhouse/jdbc/internal/ClientInfoProperties.java‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
1-
package com.clickhouse.jdbc.internal;
2-
3-
public enum ClientInfoProperties {
4-
5-
APPLICATION_NAME("ApplicationName", 255, "", "Client application name."),
6-
;
7-
8-
private String key;
9-
private int maxValue;
10-
11-
private String defaultValue;
12-
13-
private String description;
14-
15-
ClientInfoProperties(String key, int maxValue, String defaultValue, String description) {
16-
this.key = key;
17-
this.maxValue = maxValue;
18-
this.defaultValue = defaultValue;
19-
this.description = description;
20-
}
21-
22-
public String getKey() {
23-
return key;
24-
}
25-
26-
public int getMaxValue() {
27-
return maxValue;
28-
}
29-
30-
public String getDefaultValue() {
31-
return defaultValue;
32-
}
33-
34-
public String getDescription() {
35-
return description;
36-
}
37-
}
1+
package com.clickhouse.jdbc.internal;
2+
3+
public enum ClientInfoProperties {
4+
5+
APPLICATION_NAME("ApplicationName", 255, "", "Client application name."),
6+
;
7+
8+
private String key;
9+
private int maxValue;
10+
11+
private String defaultValue;
12+
13+
private String description;
14+
15+
ClientInfoProperties(String key, int maxValue, String defaultValue, String description) {
16+
this.key = key;
17+
this.maxValue = maxValue;
18+
this.defaultValue = defaultValue;
19+
this.description = description;
20+
}
21+
22+
public String getKey() {
23+
return key;
24+
}
25+
26+
public int getMaxValue() {
27+
return maxValue;
28+
}
29+
30+
public String getDefaultValue() {
31+
return defaultValue;
32+
}
33+
34+
public String getDescription() {
35+
return description;
36+
}
37+
}

‎jdbc-v2/src/main/java/com/clickhouse/jdbc/internal/DriverProperties.java‎

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,53 @@
1-
package com.clickhouse.jdbc.internal;
2-
3-
import java.util.Collections;
4-
import java.util.List;
5-
6-
/**
7-
* JDBC driver specific properties. Should not include any of ClientConfigProperties.
8-
* Processing logic should be the follows
9-
* 1. If property is among DriverProperties then Driver handles it specially and will not pass to a client
10-
* 2. If property is not among DriverProperties then it is passed to a client
11-
*/
12-
public enum DriverProperties {
13-
14-
IGNORE_UNSUPPORTED_VALUES("jdbc_ignore_unsupported_values", ""),
15-
SCHEMA_TERM("jdbc_schema_term", ""),
16-
/**
17-
* Indicates if driver should create a secure connection over SSL/TLS
18-
*/
19-
SECURE_CONNECTION("ssl", "false"),
20-
21-
/**
22-
* query settings to be passed along with query operation.
23-
* {@see com.clickhouse.client.api.query.QuerySettings}
24-
*/
25-
DEFAULT_QUERY_SETTINGS("default_query_settings", null);
26-
private final String key;
27-
28-
private final String defaultValue;
29-
30-
private final List<String> choices;
31-
32-
DriverProperties(String key, String defaultValue) {
33-
this(key, defaultValue, Collections.emptyList());
34-
}
35-
36-
DriverProperties(String key, String defaultValue, List<String> choices) {
37-
this.key = key;
38-
this.defaultValue = defaultValue;
39-
this.choices = choices;
40-
}
41-
42-
public String getKey() {
43-
return key;
44-
}
45-
46-
public String getDefaultValue() {
47-
return defaultValue;
48-
}
49-
50-
public List<String> getChoices() {
51-
return choices;
52-
}
53-
}
1+
package com.clickhouse.jdbc.internal;
2+
3+
import java.util.Collections;
4+
import java.util.List;
5+
6+
/**
7+
* JDBC driver specific properties. Should not include any of ClientConfigProperties.
8+
* Processing logic should be the follows
9+
* 1. If property is among DriverProperties then Driver handles it specially and will not pass to a client
10+
* 2. If property is not among DriverProperties then it is passed to a client
11+
*/
12+
public enum DriverProperties {
13+
14+
IGNORE_UNSUPPORTED_VALUES("jdbc_ignore_unsupported_values", ""),
15+
SCHEMA_TERM("jdbc_schema_term", ""),
16+
/**
17+
* Indicates if driver should create a secure connection over SSL/TLS
18+
*/
19+
SECURE_CONNECTION("ssl", "false"),
20+
21+
/**
22+
* query settings to be passed along with query operation.
23+
* {@see com.clickhouse.client.api.query.QuerySettings}
24+
*/
25+
DEFAULT_QUERY_SETTINGS("default_query_settings", null);
26+
private final String key;
27+
28+
private final String defaultValue;
29+
30+
private final List<String> choices;
31+
32+
DriverProperties(String key, String defaultValue) {
33+
this(key, defaultValue, Collections.emptyList());
34+
}
35+
36+
DriverProperties(String key, String defaultValue, List<String> choices) {
37+
this.key = key;
38+
this.defaultValue = defaultValue;
39+
this.choices = choices;
40+
}
41+
42+
public String getKey() {
43+
return key;
44+
}
45+
46+
public String getDefaultValue() {
47+
return defaultValue;
48+
}
49+
50+
public List<String> getChoices() {
51+
return choices;
52+
}
53+
}

‎jdbc-v2/src/main/java/com/clickhouse/jdbc/types/Array.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import java.sql.ResultSet;
88
import java.sql.SQLException;
99
import java.sql.SQLFeatureNotSupportedException;
10-
import java.sql.Types;
1110
import java.util.List;
1211
import java.util.Map;
1312

‎jdbc-v2/src/test/java/com/clickhouse/jdbc/ConnectionTest.java‎

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

3-
import java.nio.ByteBuffer;
43
import java.nio.charset.StandardCharsets;
54
import java.sql.*;
65
import java.util.Arrays;
76
import java.util.Base64;
8-
import java.util.List;
97
import java.util.Properties;
108

119
import java.util.Properties;
12-
import java.util.concurrent.TimeUnit;
1310
import java.util.UUID;
1411

1512
import com.clickhouse.client.ClickHouseNode;
@@ -18,23 +15,17 @@
1815
import com.clickhouse.client.api.Client;
1916
import com.clickhouse.client.api.ClientConfigProperties;
2017
import com.clickhouse.client.api.ServerException;
21-
import com.clickhouse.client.api.enums.Protocol;
2218
import com.clickhouse.client.api.internal.ServerSettings;
23-
import com.clickhouse.client.api.query.GenericRecord;
24-
import com.clickhouse.client.api.query.QueryResponse;
2519
import com.clickhouse.jdbc.internal.ClientInfoProperties;
2620
import com.clickhouse.jdbc.internal.DriverProperties;
2721
import com.github.tomakehurst.wiremock.WireMockServer;
2822
import com.github.tomakehurst.wiremock.client.WireMock;
2923
import com.github.tomakehurst.wiremock.common.ConsoleNotifier;
3024
import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
31-
import org.apache.hc.core5.http.HttpStatus;
32-
import com.clickhouse.jdbc.internal.JdbcUtils;
3325
import org.testng.Assert;
3426
import org.testng.annotations.DataProvider;
3527
import org.testng.annotations.Test;
3628

37-
import static org.testng.Assert.assertEquals;
3829
import static org.testng.Assert.assertThrows;
3930
import static org.testng.Assert.fail;
4031

‎jdbc-v2/src/test/java/com/clickhouse/jdbc/JdbcIntegrationTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import com.clickhouse.client.BaseIntegrationTest;
66
import com.clickhouse.client.ClickHouseProtocol;
77
import com.clickhouse.client.api.ClientConfigProperties;
8-
import com.clickhouse.client.api.internal.ServerSettings;
98
import com.clickhouse.client.api.query.GenericRecord;
109
import com.clickhouse.logging.Logger;
1110
import com.clickhouse.logging.LoggerFactory;

‎jdbc-v2/src/test/java/com/clickhouse/jdbc/PreparedStatementTest.java‎

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

3-
import com.clickhouse.data.ClickHouseDataType;
4-
import com.clickhouse.jdbc.internal.JdbcUtils;
53
import org.apache.commons.lang3.RandomStringUtils;
64
import org.testng.Assert;
75
import org.testng.annotations.DataProvider;
@@ -10,7 +8,6 @@
108

119
import java.sql.Array;
1210
import java.sql.Connection;
13-
import java.sql.JDBCType;
1411
import java.sql.PreparedStatement;
1512
import java.sql.ResultSet;
1613
import java.sql.ResultSetMetaData;
@@ -20,8 +17,13 @@
2017
import java.util.GregorianCalendar;
2118
import java.util.TimeZone;
2219

23-
import static org.testng.Assert.*;
2420
import static org.testng.Assert.assertEquals;
21+
import static org.testng.Assert.assertFalse;
22+
import static org.testng.Assert.assertNotNull;
23+
import static org.testng.Assert.assertNull;
24+
import static org.testng.Assert.assertTrue;
25+
26+
2527

2628

2729
public class PreparedStatementTest extends JdbcIntegrationTest {

‎jdbc-v2/src/test/java/com/clickhouse/jdbc/StatementTest.java‎

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

33
import com.clickhouse.client.api.ClientConfigProperties;
4-
import com.clickhouse.client.api.ClientException;
54
import com.clickhouse.client.api.query.GenericRecord;
6-
import com.clickhouse.client.api.query.QuerySettings;
75
import org.slf4j.Logger;
86
import org.slf4j.LoggerFactory;
97
import org.testng.Assert;
@@ -21,21 +19,16 @@
2119
import java.sql.Statement;
2220
import java.time.LocalDate;
2321
import java.util.Arrays;
24-
import java.util.GregorianCalendar;
2522
import java.util.List;
2623
import java.util.Properties;
27-
import java.util.TimeZone;
28-
import java.util.UUID;
2924
import java.util.concurrent.CountDownLatch;
30-
import java.util.concurrent.atomic.AtomicReference;
3125

3226
import static org.testng.Assert.assertEquals;
3327
import static org.testng.Assert.assertFalse;
3428
import static org.testng.Assert.assertNotNull;
3529
import static org.testng.Assert.assertNull;
3630
import static org.testng.Assert.assertThrows;
3731
import static org.testng.Assert.assertTrue;
38-
import static org.testng.Assert.fail;
3932

4033

4134
public class StatementTest extends JdbcIntegrationTest {

‎jdbc-v2/src/test/java/com/clickhouse/jdbc/internal/JdbcConfigurationTest.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,8 @@
77

88
import java.sql.DriverPropertyInfo;
99
import java.util.Arrays;
10-
import java.util.Collections;
1110
import java.util.Map;
1211
import java.util.Properties;
13-
import java.util.regex.Matcher;
14-
import java.util.regex.Pattern;
1512
import java.util.stream.Collectors;
1613

1714
import static org.testng.Assert.assertEquals;

0 commit comments

Comments
 (0)