You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2018/01/18 22:31:47 UTC
[1/3] trafodion git commit: Catalog Api GetTypeInfo add support of
Tinyint, Bigint unsigned and long varchar. Modify some error values.
Repository: trafodion
Updated Branches:
refs/heads/master f63b28212 -> f06ea68bb
Catalog Api GetTypeInfo add support of Tinyint,Bigint unsigned and long varchar. Modify some error values.
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/0cf25ec5
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/0cf25ec5
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/0cf25ec5
Branch: refs/heads/master
Commit: 0cf25ec568d1961f67ae66dc741096a25d5c7188
Parents: d93d17e
Author: Weixin-Xu <xw...@weixin-1.novalocal>
Authored: Tue Jan 9 18:33:24 2018 +0800
Committer: Weixin-Xu <xw...@weixin-1.novalocal>
Committed: Tue Jan 9 18:42:09 2018 +0800
----------------------------------------------------------------------
.../odbc/src/odbc/nsksrvrcore/srvrothers.cpp | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/0cf25ec5/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 ccbb689..1beb52d 100644
--- a/core/conn/odbc/src/odbc/nsksrvrcore/srvrothers.cpp
+++ b/core/conn/odbc/src/odbc/nsksrvrcore/srvrothers.cpp
@@ -4556,7 +4556,8 @@ odbc_SQLSvc_GetSQLCatalogs_sme_(
"cast(0 as smallint), cast('LARGEINT' as varchar(128)), cast(NULL as smallint), cast(NULL as smallint), cast('LARGEINT' as varchar(128)),"
"cast(10 as smallint), cast(19 as integer), cast(20 as integer), cast(-402 as smallint), cast(NULL as smallint), cast(NULL as smallint),"
"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),"
+ "('BIGINT SIGNED', -5, 19, NULL, NULL, NULL, 1, 0, 2, 0, 0, 0, 'LARGEINT', NULL, NULL, 'SIGNED LARGEINT', 19, 19, -1, -5, NULL, NULL, 0, 0, 3, 0),"
+ "('BIGINT UNSIGNED', -5, 20, NULL, NULL, NULL, 1, 0, 2, 1, 0, 0, 'LARGEINT', NULL, NULL, 'UNSIGNED LARGEINT', 20, 20, -1, -405, 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),"
@@ -4567,8 +4568,8 @@ odbc_SQLSvc_GetSQLCatalogs_sme_(
"('DOUBLE PRECISION', 8, 15, NULL, NULL, NULL, 1, 0, 2, 0, 0, 0, 'DOUBLE', NULL, NULL, 'DOUBLE PRECISION', 2, 54, -1, 8, NULL, NULL, 0, 0, 3, 0),"
"('DOUBLE PRECISION', 8, 15, NULL, NULL, NULL, 1, 0, 2, 0, 0, 0, 'DOUBLE', NULL, NULL, 'DOUBLE', 2, 54, -1, 8, NULL, NULL, 0, 0, 3, 0),"
"('FLOAT', 6, 15, NULL, NULL, NULL, 1, 0, 2, 0, 0, 0, 'FLOAT', NULL, NULL, 'FLOAT', 2, -2, -1, 6, NULL, NULL, 0, 0, 3, 0),"
- "('INTEGER', 4, 10, NULL, NULL, NULL, 1, 0, 2, 0, 0, 0, 'INTEGER', NULL, NULL, 'INTEGER', 10, 10, -1, 4, NULL, NULL, 0, 0, 3, 0),"
- "('INTEGER SIGNED', 4, 10, NULL, NULL, NULL, 1, 0, 2, 0, 0, 0, 'INTEGER', NULL, NULL, 'SIGNED INTEGER', 10, 10, -1, 4, NULL, NULL, 0, 0, 3, 0),"
+ "('INTEGER', 4, 9, NULL, NULL, NULL, 1, 0, 2, 0, 0, 0, 'INTEGER', NULL, NULL, 'INTEGER', 9, 9, -1, 4, NULL, NULL, 0, 0, 3, 0),"
+ "('INTEGER SIGNED', 4, 9, NULL, NULL, NULL, 1, 0, 2, 0, 0, 0, 'INTEGER', NULL, NULL, 'SIGNED INTEGER', 9, 9, -1, 4, NULL, NULL, 0, 0, 3, 0),"
"('INTEGER UNSIGNED', 4, 10, NULL, NULL, NULL, 1, 0, 2, 1, 0, 0, 'INTEGER', NULL, NULL, 'UNSIGNED INTEGER', 10, 10, -1, -401, NULL, NULL, 0, 0, 3, 0),"
"('INTERVAL', 113, 0, '{INTERVAL ''', ''' MINUTE TO SECOND}', NULL, 1, 0, 2, 0, 0, NULL, 'INTERVAL', 0, 0, 'INTERVAL', NULL, 3, 34, 100, 13, 2, 5, 6, 3, 0),"
"('INTERVAL', 105, 0, '{INTERVAL ''', ''' MINUTE}', NULL, 1, 0, 2, 0, 0, NULL, 'INTERVAL', 0, 0, 'INTERVAL', NULL, 0, 34, 100, 5, 2, 5, 5, 3, 0),"
@@ -4587,12 +4588,16 @@ odbc_SQLSvc_GetSQLCatalogs_sme_(
"('NUMERIC SIGNED', 2, 128, NULL, NULL, 'precision,scale', 1, 0, 2, 0, 0, 0, 'NUMERIC', 0, 128, 'SIGNED NUMERIC', 10, -2, -3, 2, NULL, NULL, 0, 0, 3, 0),"
"('NUMERIC UNSIGNED', 2, 128, NULL, NULL, 'precision,scale', 1, 0, 2, 1, 0, 0, 'NUMERIC', 0, 128, 'UNSIGNED NUMERIC', 10, -2, -3, 2, NULL, NULL, 0, 0, 3, 0),"
"('REAL', 7, 7, NULL, NULL, NULL, 1, 0, 2, 0, 0, 0, 'REAL', NULL, NULL, 'REAL', 2, 22, -1, 7, NULL, NULL, 0, 0, 3, 0),"
- "('SMALLINT', 5, 5, NULL, NULL, NULL, 1, 0, 2, 0, 0, 0, 'SMALLINT', NULL, NULL, 'SMALLINT', 10, 5, -1, 5, NULL, NULL, 0, 0, 3, 0),"
- "('SMALLINT SIGNED', 5, 5, NULL, NULL, NULL, 1, 0, 2, 0, 0, 0, 'SMALLINT', NULL, NULL, 'SIGNED SMALLINT', 10, 5, -1, 5, NULL, NULL, 0, 0, 3, 0),"
- "('SMALLINT UNSIGNED', 5, 5, NULL, NULL, NULL, 1, 0, 2, 1, 0, 0, 'SMALLINT', NULL, NULL, 'UNSIGNED SMALLINT', 10, 5, -1, -502, NULL, NULL, 0, 0, 3, 0),"
+ "('SMALLINT', 5, 5, NULL, NULL, NULL, 1, 0, 2, 0, 0, 0, 'SMALLINT', NULL, NULL, 'SMALLINT', 5, 5, -1, 5, NULL, NULL, 0, 0, 3, 0),"
+ "('SMALLINT SIGNED', 5, 5, NULL, NULL, NULL, 1, 0, 2, 0, 0, 0, 'SMALLINT', NULL, NULL, 'SIGNED SMALLINT', 5, 5, -1, 5, NULL, NULL, 0, 0, 3, 0),"
+ "('SMALLINT UNSIGNED', 5, 5, NULL, NULL, NULL, 1, 0, 2, 1, 0, 0, 'SMALLINT', NULL, NULL, 'UNSIGNED SMALLINT', 5, 5, -1, -502, NULL, NULL, 0, 0, 3, 0),"
"('TIME', 92, 8, '{t ''', '''}', NULL, 1, 0, 2, NULL, 0, NULL, 'TIME', NULL, NULL, 'TIME', NULL, 8, 6, 9, 2, NULL, 4, 6, 3, 0),"
"('TIMESTAMP', 93, 26, '{ts ''', '''}', NULL, 1, 0, 2, NULL, 0, NULL, 'TIMESTAMP', 0, 6, 'TIMESTAMP', NULL, 19, 16, 9, 3, NULL, 1, 6, 3, 0),"
- "('VARCHAR', 12, 32000, '''', '''', 'max length', 1, 1, 3, NULL, 0, NULL, 'VARCHAR', NULL, NULL, 'VARCHAR', NULL, -1, -1, 12, NULL, NULL, 0, 0, 3, 0)"
+ "('VARCHAR', 12, 32000, '''', '''', 'max length', 1, 1, 3, NULL, 0, NULL, 'VARCHAR', NULL, NULL, 'VARCHAR', NULL, -1, -1, 12, NULL, NULL, 0, 0, 3, 0),"
+ "('LONG VARCHAR', -1, 2000, '''', '''', 'max length', 1, 1, 3, NULL, 0, NULL, 'LONG VARCHAR', NULL, NULL, 'VARCHAR', NULL, -1, -1, -1, NULL, NULL, 0, 0, 3, 0),"
+ "('TINYINT', -6, 3, NULL, NULL, NULL, 1, 0, 2, 0, 0, 0, 'TINYINT', NULL, NULL, 'TINYINT', 3, 3, -1, 4, NULL, NULL, 0, 0, 3, 0),"
+ "('TINYINT SIGNED', -6, 3, NULL, NULL, NULL, 1, 0, 2, 0, 0, 0, 'TINYINT', NULL, NULL, 'SIGNED TINYINT', 3, 3, -1, 4, NULL, NULL, 0, 0, 3, 0),"
+ "('TINYINT UNSIGNED', -6, 3, NULL, NULL, NULL, 1, 0, 2, 1, 0, 0, 'TINYINT', NULL, NULL, 'UNSIGNED TINYINT', 3, 3, -1, -404, NULL, NULL, 0, 0, 3, 0)"
" ) "
" dt(\"TYPE_NAME\", \"DATA_TYPE\", \"PREC\", \"LITERAL_PREFIX\", \"LITERAL_SUFFIX\", \"CREATE_PARAMS\", \"IS_NULLABLE\", \"CASE_SENSITIVE\", \"SEARCHABLE\","
"\"UNSIGNED_ATTRIBUTE\", \"FIXED_PREC_SCALE\", \"AUTO_UNIQUE_VALUE\", \"LOCAL_TYPE_NAME\", \"MINIMUM_SCALE\", \"MAXIMUM_SCALE\", \"SQL_TYPE_NAME\","
[3/3] trafodion git commit: Merge [TRAFODION-2894] PR 1381 Add new
types to Catalog Api GetTypeInfo
Posted by db...@apache.org.
Merge [TRAFODION-2894] PR 1381 Add new types to Catalog Api GetTypeInfo
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/f06ea68b
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/f06ea68b
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/f06ea68b
Branch: refs/heads/master
Commit: f06ea68bbd1f02c86968b41fc9154730c866a86f
Parents: f63b282 c1cdc22
Author: Dave Birdsall <db...@apache.org>
Authored: Thu Jan 18 22:30:38 2018 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Thu Jan 18 22:30:38 2018 +0000
----------------------------------------------------------------------
.../odbc/src/odbc/nsksrvrcore/srvrothers.cpp | 19 +++--
.../java/org/trafodion/jdbc_test/TestCat.java | 77 +++++++++++---------
2 files changed, 53 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f06ea68b/core/conn/odbc/src/odbc/nsksrvrcore/srvrothers.cpp
----------------------------------------------------------------------
[2/3] trafodion git commit: add data type to testCat in jdbc_test
Posted by db...@apache.org.
add data type to testCat in jdbc_test
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/c1cdc22b
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/c1cdc22b
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/c1cdc22b
Branch: refs/heads/master
Commit: c1cdc22b2ce1b77f5897cf2beed9b6994c3b786e
Parents: 0cf25ec
Author: Weixin-Xu <xw...@weixin-1.novalocal>
Authored: Wed Jan 10 10:02:37 2018 +0800
Committer: Weixin-Xu <xw...@weixin-1.novalocal>
Committed: Wed Jan 10 15:47:54 2018 +0800
----------------------------------------------------------------------
.../java/org/trafodion/jdbc_test/TestCat.java | 77 +++++++++++---------
1 file changed, 41 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/c1cdc22b/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 5faee9a..88cc28e 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
@@ -470,43 +470,48 @@ public class TestCat
{
"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"
+ "3: TYPE_NAME - TINYINT DATA_TYPE - -6 PRECISION - 3",
+ "4: TYPE_NAME - TINYINT SIGNED DATA_TYPE - -6 PRECISION - 3",
+ "5: TYPE_NAME - TINYINT UNSIGNED DATA_TYPE - -6 PRECISION - 3",
+ "6: TYPE_NAME - BIGINT DATA_TYPE - -5 PRECISION - 19",
+ "7: TYPE_NAME - BIGINT SIGNED DATA_TYPE - -5 PRECISION - 19",
+ "8: TYPE_NAME - BIGINT UNSIGNED DATA_TYPE - -5 PRECISION - 20",
+ "9: TYPE_NAME - LONG VARCHAR DATA_TYPE - -1 PRECISION - 2000",
+ "10: TYPE_NAME - CHAR DATA_TYPE - 1 PRECISION - 32000",
+ "11: TYPE_NAME - NUMERIC DATA_TYPE - 2 PRECISION - 128",
+ "12: TYPE_NAME - NUMERIC SIGNED DATA_TYPE - 2 PRECISION - 128",
+ "13: TYPE_NAME - NUMERIC UNSIGNED DATA_TYPE - 2 PRECISION - 128",
+ "14: TYPE_NAME - DECIMAL DATA_TYPE - 3 PRECISION - 18",
+ "15: TYPE_NAME - DECIMAL SIGNED DATA_TYPE - 3 PRECISION - 18",
+ "16: TYPE_NAME - DECIMAL UNSIGNED DATA_TYPE - 3 PRECISION - 18",
+ "17: TYPE_NAME - INTEGER DATA_TYPE - 4 PRECISION - 9",
+ "18: TYPE_NAME - INTEGER SIGNED DATA_TYPE - 4 PRECISION - 9",
+ "19: TYPE_NAME - INTEGER UNSIGNED DATA_TYPE - 4 PRECISION - 10",
+ "20: TYPE_NAME - SMALLINT DATA_TYPE - 5 PRECISION - 5",
+ "21: TYPE_NAME - SMALLINT SIGNED DATA_TYPE - 5 PRECISION - 5",
+ "22: TYPE_NAME - SMALLINT UNSIGNED DATA_TYPE - 5 PRECISION - 5",
+ "23: TYPE_NAME - FLOAT DATA_TYPE - 6 PRECISION - 15",
+ "24: TYPE_NAME - REAL DATA_TYPE - 7 PRECISION - 7",
+ "25: TYPE_NAME - DOUBLE PRECISION DATA_TYPE - 8 PRECISION - 15",
+ "26: TYPE_NAME - VARCHAR DATA_TYPE - 12 PRECISION - 32000",
+ "27: TYPE_NAME - DATE DATA_TYPE - 91 PRECISION - 10",
+ "28: TYPE_NAME - TIME DATA_TYPE - 92 PRECISION - 8",
+ "29: TYPE_NAME - TIMESTAMP DATA_TYPE - 93 PRECISION - 26",
+ "30: TYPE_NAME - INTERVAL DATA_TYPE - 101 PRECISION - 0",
+ "31: TYPE_NAME - INTERVAL DATA_TYPE - 102 PRECISION - 0",
+ "32: TYPE_NAME - INTERVAL DATA_TYPE - 103 PRECISION - 0",
+ "33: TYPE_NAME - INTERVAL DATA_TYPE - 104 PRECISION - 0",
+ "34: TYPE_NAME - INTERVAL DATA_TYPE - 105 PRECISION - 0",
+ "35: TYPE_NAME - INTERVAL DATA_TYPE - 106 PRECISION - 0",
+ "36: TYPE_NAME - INTERVAL DATA_TYPE - 107 PRECISION - 0",
+ "37: TYPE_NAME - INTERVAL DATA_TYPE - 108 PRECISION - 0",
+ "38: TYPE_NAME - INTERVAL DATA_TYPE - 109 PRECISION - 0",
+ "39: TYPE_NAME - INTERVAL DATA_TYPE - 110 PRECISION - 0",
+ "40: TYPE_NAME - INTERVAL DATA_TYPE - 111 PRECISION - 0",
+ "41: TYPE_NAME - INTERVAL DATA_TYPE - 112 PRECISION - 0",
+ "42: TYPE_NAME - INTERVAL DATA_TYPE - 113 PRECISION - 0"
};
- int expTypes = 37;
+ int expTypes = 42;
try
(