Merge [TRAFODION-3226] Fix int precision for SQLGetTypeInfo in ODBC
diff --git a/core/conn/odbc/src/odbc/nsksrvrcore/srvrothers.cpp b/core/conn/odbc/src/odbc/nsksrvrcore/srvrothers.cpp
index 1af8f1e..1842cac 100644
--- a/core/conn/odbc/src/odbc/nsksrvrcore/srvrothers.cpp
+++ b/core/conn/odbc/src/odbc/nsksrvrcore/srvrothers.cpp
@@ -4679,8 +4679,8 @@
"('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, 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', 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 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),"
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 88cc28e..434f1e5 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
@@ -484,8 +484,8 @@
"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",
+ "17: TYPE_NAME - INTEGER DATA_TYPE - 4 PRECISION - 10",
+ "18: TYPE_NAME - INTEGER SIGNED DATA_TYPE - 4 PRECISION - 10",
"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",
