You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by li...@apache.org on 2016/11/04 01:19:47 UTC
[1/2] incubator-trafodion git commit: Fix jira2295
Repository: incubator-trafodion
Updated Branches:
refs/heads/master af79ac47c -> 0237c9512
Fix jira2295
Add SQL_WCHAR (NCHAR) and SQL_WVARCHAR(NCHAR VARYING) supports
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/6dcb16e5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/6dcb16e5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/6dcb16e5
Branch: refs/heads/master
Commit: 6dcb16e5702f135d2a34355ab5e24ab8188d9a0a
Parents: 994f51a
Author: ryzuo <jo...@gmail.com>
Authored: Fri Oct 21 10:07:00 2016 +0000
Committer: ryzuo <jo...@gmail.com>
Committed: Mon Oct 31 07:09:07 2016 +0000
----------------------------------------------------------------------
.../odbc/src/odbc/nsksrvrcore/srvrothers.cpp | 2 +
.../java/org/trafodion/jdbc_test/TestCat.java | 74 ++++++++++----------
2 files changed, 40 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dcb16e5/core/conn/odbc/src/odbc/nsksrvrcore/srvrothers.cpp
----------------------------------------------------------------------
diff --git a/core/conn/odbc/src/odbc/nsksrvrcore/srvrothers.cpp b/core/conn/odbc/src/odbc/nsksrvrcore/srvrothers.cpp
index 694641f..ebd0391 100644
--- a/core/conn/odbc/src/odbc/nsksrvrcore/srvrothers.cpp
+++ b/core/conn/odbc/src/odbc/nsksrvrcore/srvrothers.cpp
@@ -4557,6 +4557,8 @@ odbc_SQLSvc_GetSQLCatalogs_sme_(
"cast(0 as smallint), cast(0 as smallint), cast(3 as smallint), cast(0 as smallint)),"
"('BIGINT SIGNED', -5, 19, NULL, NULL, NULL, 1, 0, 2, 0, 0, 0, 'LARGEINT', NULL, NULL, 'SIGNED LARGEINT', 10, 19, 20, -402, NULL, NULL, 0, 0, 3, 0),"
"('CHAR', 1, 32000, '''', '''', 'max length', 1, 1, 3, NULL, 0, NULL, 'CHARACTER', NULL, NULL, 'CHARACTER', NULL, -1, -1, 1, NULL, NULL, 0, 0, 3, 0),"
+ "('NCHAR', -8, 32000, '''', '''', 'max length', 1, 1, 3, NULL, 0, NULL, 'WCHAR', NULL, NULL, 'WCHAR', NULL, -1, -1, -8, NULL, NULL, 0, 0, 3, 0),"
+ "('NCHAR VARYING', -9, 32000, '''', '''', 'max length', 1, 1, 3, NULL, 0, NULL, 'WCHAR VARYING', NULL, NULL, 'VARWCHAR', NULL, -1, -1, -9, NULL, NULL, 0, 0, 3, 0),"
"('DATE', 91, 10, '{d ''', '''}', NULL, 1, 0, 2, NULL, 0, NULL, 'DATE', NULL, NULL, 'DATE', NULL, 10, 6, 9, 1, NULL, 1, 3, 3, 0),"
"('DECIMAL', 3, 18, NULL, NULL, 'precision,scale', 1, 0, 2, 0, 0, 0, 'DECIMAL', 0, 18, 'DECIMAL', 10, -2, -3, 3, NULL, NULL, 0, 0, 3, 0),"
"('DECIMAL SIGNED', 3, 18, NULL, NULL, 'precision,scale', 1, 0, 2, 0, 0, 0, 'DECIMAL', 0, 18, 'SIGNED DECIMAL', 10, -2, -3, 3, NULL, NULL, 0, 0, 3, 0),"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dcb16e5/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestCat.java
----------------------------------------------------------------------
diff --git a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestCat.java b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestCat.java
index 4aa6178..5faee9a 100644
--- a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestCat.java
+++ b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestCat.java
@@ -468,43 +468,45 @@ public class TestCat
String tableName = "TBLGETTBLS";
String[] strExpTypes =
{
- "1: TYPE_NAME - BIGINT DATA_TYPE - -5 PRECISION - 19",
- "2: TYPE_NAME - BIGINT SIGNED DATA_TYPE - -5 PRECISION - 19",
- "3: TYPE_NAME - CHAR DATA_TYPE - 1 PRECISION - 32000",
- "4: TYPE_NAME - NUMERIC DATA_TYPE - 2 PRECISION - 128",
- "5: TYPE_NAME - NUMERIC SIGNED DATA_TYPE - 2 PRECISION - 128",
- "6: TYPE_NAME - NUMERIC UNSIGNED DATA_TYPE - 2 PRECISION - 128",
- "7: TYPE_NAME - DECIMAL DATA_TYPE - 3 PRECISION - 18",
- "8: TYPE_NAME - DECIMAL SIGNED DATA_TYPE - 3 PRECISION - 18",
- "9: TYPE_NAME - DECIMAL UNSIGNED DATA_TYPE - 3 PRECISION - 18",
- "10: TYPE_NAME - INTEGER DATA_TYPE - 4 PRECISION - 10",
- "11: TYPE_NAME - INTEGER SIGNED DATA_TYPE - 4 PRECISION - 10",
- "12: TYPE_NAME - INTEGER UNSIGNED DATA_TYPE - 4 PRECISION - 10",
- "13: TYPE_NAME - SMALLINT DATA_TYPE - 5 PRECISION - 5",
- "14: TYPE_NAME - SMALLINT SIGNED DATA_TYPE - 5 PRECISION - 5",
- "15: TYPE_NAME - SMALLINT UNSIGNED DATA_TYPE - 5 PRECISION - 5",
- "16: TYPE_NAME - FLOAT DATA_TYPE - 6 PRECISION - 15",
- "17: TYPE_NAME - REAL DATA_TYPE - 7 PRECISION - 7",
- "18: TYPE_NAME - DOUBLE PRECISION DATA_TYPE - 8 PRECISION - 15",
- "19: TYPE_NAME - VARCHAR DATA_TYPE - 12 PRECISION - 32000",
- "20: TYPE_NAME - DATE DATA_TYPE - 91 PRECISION - 10",
- "21: TYPE_NAME - TIME DATA_TYPE - 92 PRECISION - 8",
- "22: TYPE_NAME - TIMESTAMP DATA_TYPE - 93 PRECISION - 26",
- "23: TYPE_NAME - INTERVAL DATA_TYPE - 101 PRECISION - 0",
- "24: TYPE_NAME - INTERVAL DATA_TYPE - 102 PRECISION - 0",
- "25: TYPE_NAME - INTERVAL DATA_TYPE - 103 PRECISION - 0",
- "26: TYPE_NAME - INTERVAL DATA_TYPE - 104 PRECISION - 0",
- "27: TYPE_NAME - INTERVAL DATA_TYPE - 105 PRECISION - 0",
- "28: TYPE_NAME - INTERVAL DATA_TYPE - 106 PRECISION - 0",
- "29: TYPE_NAME - INTERVAL DATA_TYPE - 107 PRECISION - 0",
- "30: TYPE_NAME - INTERVAL DATA_TYPE - 108 PRECISION - 0",
- "31: TYPE_NAME - INTERVAL DATA_TYPE - 109 PRECISION - 0",
- "32: TYPE_NAME - INTERVAL DATA_TYPE - 110 PRECISION - 0",
- "33: TYPE_NAME - INTERVAL DATA_TYPE - 111 PRECISION - 0",
- "34: TYPE_NAME - INTERVAL DATA_TYPE - 112 PRECISION - 0",
- "35: TYPE_NAME - INTERVAL DATA_TYPE - 113 PRECISION - 0"
+ "1: TYPE_NAME - NCHAR VARYING DATA_TYPE - -9 PRECISION - 32000",
+ "2: TYPE_NAME - NCHAR DATA_TYPE - -8 PRECISION - 32000",
+ "3: TYPE_NAME - BIGINT DATA_TYPE - -5 PRECISION - 19",
+ "4: TYPE_NAME - BIGINT SIGNED DATA_TYPE - -5 PRECISION - 19",
+ "5: TYPE_NAME - CHAR DATA_TYPE - 1 PRECISION - 32000",
+ "6: TYPE_NAME - NUMERIC DATA_TYPE - 2 PRECISION - 128",
+ "7: TYPE_NAME - NUMERIC SIGNED DATA_TYPE - 2 PRECISION - 128",
+ "8: TYPE_NAME - NUMERIC UNSIGNED DATA_TYPE - 2 PRECISION - 128",
+ "9: TYPE_NAME - DECIMAL DATA_TYPE - 3 PRECISION - 18",
+ "10: TYPE_NAME - DECIMAL SIGNED DATA_TYPE - 3 PRECISION - 18",
+ "11: TYPE_NAME - DECIMAL UNSIGNED DATA_TYPE - 3 PRECISION - 18",
+ "12: TYPE_NAME - INTEGER DATA_TYPE - 4 PRECISION - 10",
+ "13: TYPE_NAME - INTEGER SIGNED DATA_TYPE - 4 PRECISION - 10",
+ "14: TYPE_NAME - INTEGER UNSIGNED DATA_TYPE - 4 PRECISION - 10",
+ "15: TYPE_NAME - SMALLINT DATA_TYPE - 5 PRECISION - 5",
+ "16: TYPE_NAME - SMALLINT SIGNED DATA_TYPE - 5 PRECISION - 5",
+ "17: TYPE_NAME - SMALLINT UNSIGNED DATA_TYPE - 5 PRECISION - 5",
+ "18: TYPE_NAME - FLOAT DATA_TYPE - 6 PRECISION - 15",
+ "19: TYPE_NAME - REAL DATA_TYPE - 7 PRECISION - 7",
+ "20: TYPE_NAME - DOUBLE PRECISION DATA_TYPE - 8 PRECISION - 15",
+ "21: TYPE_NAME - VARCHAR DATA_TYPE - 12 PRECISION - 32000",
+ "22: TYPE_NAME - DATE DATA_TYPE - 91 PRECISION - 10",
+ "23: TYPE_NAME - TIME DATA_TYPE - 92 PRECISION - 8",
+ "24: TYPE_NAME - TIMESTAMP DATA_TYPE - 93 PRECISION - 26",
+ "25: TYPE_NAME - INTERVAL DATA_TYPE - 101 PRECISION - 0",
+ "26: TYPE_NAME - INTERVAL DATA_TYPE - 102 PRECISION - 0",
+ "27: TYPE_NAME - INTERVAL DATA_TYPE - 103 PRECISION - 0",
+ "28: TYPE_NAME - INTERVAL DATA_TYPE - 104 PRECISION - 0",
+ "29: TYPE_NAME - INTERVAL DATA_TYPE - 105 PRECISION - 0",
+ "30: TYPE_NAME - INTERVAL DATA_TYPE - 106 PRECISION - 0",
+ "31: TYPE_NAME - INTERVAL DATA_TYPE - 107 PRECISION - 0",
+ "32: TYPE_NAME - INTERVAL DATA_TYPE - 108 PRECISION - 0",
+ "33: TYPE_NAME - INTERVAL DATA_TYPE - 109 PRECISION - 0",
+ "34: TYPE_NAME - INTERVAL DATA_TYPE - 110 PRECISION - 0",
+ "35: TYPE_NAME - INTERVAL DATA_TYPE - 111 PRECISION - 0",
+ "36: TYPE_NAME - INTERVAL DATA_TYPE - 112 PRECISION - 0",
+ "37: TYPE_NAME - INTERVAL DATA_TYPE - 113 PRECISION - 0"
};
- int expTypes = 35;
+ int expTypes = 37;
try
(
[2/2] incubator-trafodion git commit: Merge [TRAFODION 2295]
Supporting SQL_WCHAR and SQL_WVARCHAR in SQLGetTypeInfo
Posted by li...@apache.org.
Merge [TRAFODION 2295] Supporting SQL_WCHAR and SQL_WVARCHAR in SQLGetTypeInfo
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/0237c951
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/0237c951
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/0237c951
Branch: refs/heads/master
Commit: 0237c9512a9d032dd10a09ed4da6c38bb0749cab
Parents: af79ac4 6dcb16e
Author: Liu Ming <li...@apache.org>
Authored: Fri Nov 4 01:18:53 2016 +0000
Committer: Liu Ming <li...@apache.org>
Committed: Fri Nov 4 01:18:53 2016 +0000
----------------------------------------------------------------------
.../odbc/src/odbc/nsksrvrcore/srvrothers.cpp | 2 +
.../java/org/trafodion/jdbc_test/TestCat.java | 74 ++++++++++----------
2 files changed, 40 insertions(+), 36 deletions(-)
----------------------------------------------------------------------