Skip to content

Commit c199f82

Browse files
author
Paultagoras
committed
Code cleanup
1 parent eb0bfaf commit c199f82

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,11 @@
77
import java.io.Reader;
88
import java.math.BigDecimal;
99
import java.net.URL;
10-
import java.nio.charset.StandardCharsets;
1110
import java.sql.*;
12-
import java.time.LocalDateTime;
1311
import java.time.ZoneId;
1412
import java.time.format.DateTimeFormatter;
1513
import java.time.format.DateTimeFormatterBuilder;
1614
import java.time.temporal.ChronoField;
17-
import java.time.temporal.TemporalField;
1815
import java.util.Calendar;
1916
import java.util.GregorianCalendar;
2017

@@ -78,13 +75,13 @@ public void setNull(int parameterIndex, int sqlType) throws SQLException {
7875
@Override
7976
public void setBoolean(int parameterIndex, boolean x) throws SQLException {
8077
checkClosed();
81-
parameters[parameterIndex - 1] = x;
78+
parameters[parameterIndex - 1] = Boolean.toString(x);
8279
}
8380

8481
@Override
8582
public void setByte(int parameterIndex, byte x) throws SQLException {
8683
checkClosed();
87-
parameters[parameterIndex - 1] = x;
84+
parameters[parameterIndex - 1] = Byte.toString(x);
8885
}
8986

9087
@Override
@@ -132,7 +129,7 @@ public void setString(int parameterIndex, String x) throws SQLException {
132129
@Override
133130
public void setBytes(int parameterIndex, byte[] x) throws SQLException {
134131
checkClosed();
135-
parameters[parameterIndex - 1] = new String(x, StandardCharsets.UTF_8);
132+
throw new SQLFeatureNotSupportedException("Bytes is not yet supported.");
136133
}
137134

138135
@Override
@@ -265,7 +262,6 @@ public void setTime(int parameterIndex, Time x, Calendar cal) throws SQLExceptio
265262
ZoneId tz = cal.getTimeZone().toZoneId();
266263
Calendar c = (Calendar) cal.clone();
267264
c.setTime(x);
268-
System.out.println(String.format("'%s'", TIME_FORMATTER.format(c.toInstant().atZone(tz).toLocalTime())));
269265
parameters[parameterIndex - 1] = String.format("'%s'", TIME_FORMATTER.format(c.toInstant().atZone(tz).toLocalTime()));
270266
}
271267

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

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

3+
import org.testng.annotations.Ignore;
34
import org.testng.annotations.Test;
45

56
import java.sql.Connection;
@@ -142,14 +143,15 @@ public void testSetString() throws Exception {
142143
}
143144
}
144145

146+
@Ignore("Not supported yet")
145147
@Test
146148
public void testSetBytes() throws Exception {
147149
try (Connection conn = getJdbcConnection()) {
148150
try (PreparedStatement stmt = conn.prepareStatement("SELECT ?")) {
149151
stmt.setBytes(1, new byte[] { 1, 2, 3 });
150152
try (ResultSet rs = stmt.executeQuery()) {
151153
assertTrue(rs.next());
152-
assertEquals(new byte[] { 1, 2, 3 }, rs.getBytes(1));
154+
assertEquals(rs.getBytes(1), new byte[] { 1, 2, 3 });
153155
assertFalse(rs.next());
154156
}
155157
}
@@ -173,7 +175,7 @@ public void testSetDate() throws Exception {
173175
@Test
174176
public void testSetTime() throws Exception {
175177
try (Connection conn = getJdbcConnection()) {
176-
try (PreparedStatement stmt = conn.prepareStatement("SELECT ?")) {
178+
try (PreparedStatement stmt = conn.prepareStatement("SELECT parseDateTime(?, '%H:%i:%s')")) {
177179
stmt.setTime(1, java.sql.Time.valueOf("12:34:56"));
178180
try (ResultSet rs = stmt.executeQuery()) {
179181
assertTrue(rs.next());

0 commit comments

Comments
 (0)