diff --git a/clickhouse-jdbc.iml b/clickhouse-jdbc.iml index f151c7aa3a5b55363a62c20f10dfa073013af9c1..b854bd52ae6a24e8497b183208557d0319362294 100644 --- a/clickhouse-jdbc.iml +++ b/clickhouse-jdbc.iml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" inherit-compiler-output="false"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false"> <output url="file://$MODULE_DIR$/target/classes" /> <output-test url="file://$MODULE_DIR$/target/test-classes" /> <content url="file://$MODULE_DIR$"> diff --git a/pom.xml b/pom.xml index 101a176046e6f91aa451f0034e5d540e148a484d..5caea755322bfb794744a26f81be351cdc730045 100644 --- a/pom.xml +++ b/pom.xml @@ -36,6 +36,15 @@ <build> <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.2</version> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> diff --git a/src/main/java/ru/yandex/metrika/clickhouse/CHDriver.java b/src/main/java/ru/yandex/metrika/clickhouse/CHDriver.java index 74c371c79534769d34c6260b07fe083b0703bab2..6d475d5d055bc966637590d2aef0b45b04aa043b 100644 --- a/src/main/java/ru/yandex/metrika/clickhouse/CHDriver.java +++ b/src/main/java/ru/yandex/metrika/clickhouse/CHDriver.java @@ -2,7 +2,6 @@ package ru.yandex.metrika.clickhouse; import java.sql.*; import java.util.Properties; -import java.util.logging.Logger; /** * Created by jkee on 14.03.15. @@ -48,8 +47,4 @@ public class CHDriver implements Driver { return false; } - @Override - public Logger getParentLogger() throws SQLFeatureNotSupportedException { - return null; - } } diff --git a/src/main/java/ru/yandex/metrika/clickhouse/CHStatement.java b/src/main/java/ru/yandex/metrika/clickhouse/CHStatement.java index dc58be44e98505e7e935fa941259bfb04bed468e..57a5d97882ff47e24474a358fada341cb20deb75 100644 --- a/src/main/java/ru/yandex/metrika/clickhouse/CHStatement.java +++ b/src/main/java/ru/yandex/metrika/clickhouse/CHStatement.java @@ -11,7 +11,6 @@ import ru.yandex.metrika.clickhouse.copypaste.*; import java.io.IOException; import java.io.InputStream; import java.net.HttpURLConnection; -import java.nio.charset.StandardCharsets; import java.sql.*; /** @@ -59,7 +58,7 @@ public class CHStatement implements Statement { private CountingInputStream getInputStream(String sql) { HttpPost post = new HttpPost(url); - post.setEntity(new StringEntity(sql, StandardCharsets.UTF_8)); + post.setEntity(new StringEntity(sql, CopypasteUtils.UTF_8)); HttpEntity entity = null; InputStream is = null; try { @@ -288,16 +287,6 @@ public class CHStatement implements Statement { return false; } - @Override - public void closeOnCompletion() throws SQLException { - - } - - @Override - public boolean isCloseOnCompletion() throws SQLException { - return false; - } - @Override public <T> T unwrap(Class<T> iface) throws SQLException { return null; diff --git a/src/main/java/ru/yandex/metrika/clickhouse/copypaste/ByteFragment.java b/src/main/java/ru/yandex/metrika/clickhouse/copypaste/ByteFragment.java index 32bcae873abc0072658dc307c2d5f7ebddc274da..5401d7fb2a79f74b391cac58844ccc9190437e0b 100644 --- a/src/main/java/ru/yandex/metrika/clickhouse/copypaste/ByteFragment.java +++ b/src/main/java/ru/yandex/metrika/clickhouse/copypaste/ByteFragment.java @@ -2,7 +2,6 @@ package ru.yandex.metrika.clickhouse.copypaste; import java.io.ByteArrayInputStream; import java.io.IOException; -import java.nio.charset.StandardCharsets; import java.util.Arrays; /** @@ -24,12 +23,12 @@ public class ByteFragment { } public String asString() { - return new String(buf, start, len, StandardCharsets.UTF_8); + return new String(buf, start, len, CopypasteUtils.UTF_8); } public String asString(boolean unescape) { if(unescape) { - return new String(unescape(), StandardCharsets.UTF_8); + return new String(unescape(), CopypasteUtils.UTF_8); } else { return asString(); } diff --git a/src/main/java/ru/yandex/metrika/clickhouse/copypaste/CopypasteUtils.java b/src/main/java/ru/yandex/metrika/clickhouse/copypaste/CopypasteUtils.java new file mode 100644 index 0000000000000000000000000000000000000000..2d6f738775f9db32a252670b2c76c4cdf345ad69 --- /dev/null +++ b/src/main/java/ru/yandex/metrika/clickhouse/copypaste/CopypasteUtils.java @@ -0,0 +1,12 @@ +package ru.yandex.metrika.clickhouse.copypaste; + +import java.nio.charset.Charset; + +/** + * Created by jkee on 16.03.15. + */ +public class CopypasteUtils { + + public static final Charset UTF_8 = Charset.forName("UTF-8"); + +}