You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2017/04/27 08:58:29 UTC
[2/3] kylin git commit: KYLIN-2571 fix driver version for jdbc driver
KYLIN-2571 fix driver version for jdbc driver
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/6cd1b364
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/6cd1b364
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/6cd1b364
Branch: refs/heads/KYLIN-2535
Commit: 6cd1b3640aecd42ac5860c1c40e94c75cfdfbf59
Parents: 8fa8277
Author: lidongsjtu <li...@apache.org>
Authored: Wed Apr 26 18:41:35 2017 +0800
Committer: lidongsjtu <li...@apache.org>
Committed: Wed Apr 26 18:41:41 2017 +0800
----------------------------------------------------------------------
jdbc/src/main/java/org/apache/kylin/jdbc/Driver.java | 2 +-
jdbc/src/test/java/org/apache/kylin/jdbc/DriverTest.java | 9 +++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/6cd1b364/jdbc/src/main/java/org/apache/kylin/jdbc/Driver.java
----------------------------------------------------------------------
diff --git a/jdbc/src/main/java/org/apache/kylin/jdbc/Driver.java b/jdbc/src/main/java/org/apache/kylin/jdbc/Driver.java
index f9d840a..33d82f80 100644
--- a/jdbc/src/main/java/org/apache/kylin/jdbc/Driver.java
+++ b/jdbc/src/main/java/org/apache/kylin/jdbc/Driver.java
@@ -85,7 +85,7 @@ public class Driver extends UnregisteredDriver {
@Override
protected DriverVersion createDriverVersion() {
- return DriverVersion.load(Driver.class, "kylin-jdbc.properties", "Kylin JDBC Driver", "unknown version", "Kylin", "unknown version");
+ return DriverVersion.load(Driver.class, "org-apache-kylin-jdbc.properties", "Kylin JDBC Driver", "unknown version", "Kylin", "unknown version");
}
@Override
http://git-wip-us.apache.org/repos/asf/kylin/blob/6cd1b364/jdbc/src/test/java/org/apache/kylin/jdbc/DriverTest.java
----------------------------------------------------------------------
diff --git a/jdbc/src/test/java/org/apache/kylin/jdbc/DriverTest.java b/jdbc/src/test/java/org/apache/kylin/jdbc/DriverTest.java
index 99266f3..0887634 100644
--- a/jdbc/src/test/java/org/apache/kylin/jdbc/DriverTest.java
+++ b/jdbc/src/test/java/org/apache/kylin/jdbc/DriverTest.java
@@ -28,6 +28,8 @@ import java.sql.SQLException;
import java.sql.Statement;
import java.util.Properties;
+import org.apache.calcite.avatica.DriverVersion;
+import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
@@ -37,6 +39,13 @@ import org.junit.Test;
public class DriverTest {
@Test
+ public void testVersion() {
+ Driver driver = new DummyDriver();
+ DriverVersion version = driver.getDriverVersion();
+ Assert.assertNotEquals("unknown version", version.productVersion);
+ }
+
+ @Test
public void testStatementWithMockData() throws SQLException {
Driver driver = new DummyDriver();