You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by el...@apache.org on 2016/03/30 05:48:45 UTC
[1/2] calcite git commit: [CALCITE-835] Unit test for unicode column
names
Repository: calcite
Updated Branches:
refs/heads/master ba9783f30 -> 3e25f2ffa
[CALCITE-835] Unit test for unicode column names
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/4140927c
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/4140927c
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/4140927c
Branch: refs/heads/master
Commit: 4140927c99b9dceb15ef4b85059b60e7898de0e7
Parents: ba9783f
Author: Josh Elser <el...@apache.org>
Authored: Tue Mar 29 22:45:44 2016 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Tue Mar 29 22:45:44 2016 -0400
----------------------------------------------------------------------
.../calcite/avatica/RemoteDriverTest.java | 21 ++++++++++++++++++++
1 file changed, 21 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite/blob/4140927c/avatica/server/src/test/java/org/apache/calcite/avatica/RemoteDriverTest.java
----------------------------------------------------------------------
diff --git a/avatica/server/src/test/java/org/apache/calcite/avatica/RemoteDriverTest.java b/avatica/server/src/test/java/org/apache/calcite/avatica/RemoteDriverTest.java
index 9f37db5..50223b2 100644
--- a/avatica/server/src/test/java/org/apache/calcite/avatica/RemoteDriverTest.java
+++ b/avatica/server/src/test/java/org/apache/calcite/avatica/RemoteDriverTest.java
@@ -1455,6 +1455,27 @@ public class RemoteDriverTest {
}
}
+ @Test public void testUnicodeColumnNames() throws Exception {
+ final String tableName = "unicodeColumn";
+ final String columnName = "НомерТелефона"; // PhoneNumber in Russian
+ ConnectionSpec.getDatabaseLock().lock();
+ try (Connection conn = getLocalConnection();
+ Statement stmt = conn.createStatement()) {
+ assertFalse(stmt.execute("DROP TABLE IF EXISTS " + tableName));
+ final String sql = "CREATE TABLE " + tableName + "(" + columnName + " integer)";
+ assertFalse(stmt.execute(sql));
+ final ResultSet results = stmt.executeQuery("SELECT * FROM " + tableName);
+ assertNotNull(results);
+ ResultSetMetaData metadata = results.getMetaData();
+ assertNotNull(metadata);
+ String actualColumnName = metadata.getColumnName(1);
+ // HSQLDB is going to upper-case the column name
+ assertEquals(columnName.toUpperCase(), actualColumnName);
+ } finally {
+ ConnectionSpec.getDatabaseLock().unlock();
+ }
+ }
+
/**
* Factory that creates a service based on a local JDBC connection.
*/
[2/2] calcite git commit: [CALCITE-836] Add missing table summary for
javadoc error
Posted by el...@apache.org.
[CALCITE-836] Add missing table summary for javadoc error
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/3e25f2ff
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/3e25f2ff
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/3e25f2ff
Branch: refs/heads/master
Commit: 3e25f2ffa0eab11051f6295fd3706d2397f2524c
Parents: 4140927
Author: Josh Elser <el...@apache.org>
Authored: Tue Mar 29 23:15:31 2016 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Tue Mar 29 23:15:31 2016 -0400
----------------------------------------------------------------------
.../java/org/apache/calcite/avatica/AvaticaDatabaseMetaData.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite/blob/3e25f2ff/avatica/core/src/main/java/org/apache/calcite/avatica/AvaticaDatabaseMetaData.java
----------------------------------------------------------------------
diff --git a/avatica/core/src/main/java/org/apache/calcite/avatica/AvaticaDatabaseMetaData.java b/avatica/core/src/main/java/org/apache/calcite/avatica/AvaticaDatabaseMetaData.java
index 10ced87..1c93fc6 100644
--- a/avatica/core/src/main/java/org/apache/calcite/avatica/AvaticaDatabaseMetaData.java
+++ b/avatica/core/src/main/java/org/apache/calcite/avatica/AvaticaDatabaseMetaData.java
@@ -31,7 +31,7 @@ import java.util.Properties;
*
* <p>Some properties defined in {@link org.apache.calcite.avatica.Meta.DatabaseProperty} do not
* correspond to a typical JDBC method/property. Those are enumerated here:
- * <table>
+ * <table summary="Avatica-Specific Properties">
* <tr><th>Property</th><th>Method</th></tr>
* <tr><td>AVATICA_VERSION</td><td>getAvaticaServerVersion()</td></tr>
* </table>