Modified:
trunk/
trunk/connector-j/src/testsuite/regression/MetaDataRegressionTest.java
trunk/connector-j/src/testsuite/regression/ResultSetRegressionTest.java
Log:
Merged revisions 6602-6607 via svnmerge from
svn+ssh://mmatthews@stripped/connectors-svnroot/connector-j/branches/branch_5_0
.......
r6607 | mmatthews | 2007-10-03 11:21:54 -0500 (Wed, 03 Oct 2007) | 1 line
Type name for "integer" changed to "int" with fix for bug 27916, adjusting tests accordingly.
.......
Property changes on: trunk
___________________________________________________________________
Name: svnmerge-integrated
- /branches/branch_5_0:1-6601 /branches/branch_5_1:1-6566,6576-6577,6584
+ /branches/branch_5_0:1-6607 /branches/branch_5_1:1-6566,6576-6577,6584
Modified: trunk/connector-j/src/testsuite/regression/MetaDataRegressionTest.java
===================================================================
--- trunk/connector-j/src/testsuite/regression/MetaDataRegressionTest.java 2007-10-03 16:21:54 UTC (rev 6607)
+++ trunk/connector-j/src/testsuite/regression/MetaDataRegressionTest.java 2007-10-03 16:33:16 UTC (rev 6608)
@@ -593,7 +593,7 @@
public void testBug4138() throws Exception {
try {
String[] typesToTest = new String[] { "TINYINT", "SMALLINT",
- "MEDIUMINT", "INTEGER", "BIGINT", "FLOAT", "DOUBLE",
+ "MEDIUMINT", "INT", "BIGINT", "FLOAT", "DOUBLE",
"DECIMAL" };
short[] jdbcMapping = new short[] { Types.TINYINT, Types.SMALLINT,
Modified: trunk/connector-j/src/testsuite/regression/ResultSetRegressionTest.java
===================================================================
--- trunk/connector-j/src/testsuite/regression/ResultSetRegressionTest.java 2007-10-03 16:21:54 UTC (rev 6607)
+++ trunk/connector-j/src/testsuite/regression/ResultSetRegressionTest.java 2007-10-03 16:33:16 UTC (rev 6608)
@@ -4434,7 +4434,7 @@
for (int i = 1; i < tblMD.getColumnCount() + 1; i++) {
switch (i) {
case 1:
- assertEquals("INTEGER", tblMD.getColumnTypeName(i)
+ assertEquals("INT", tblMD.getColumnTypeName(i)
.toUpperCase());
break;
case 2:
| Thread |
|---|
| • Connector/J commit: r6608 - in trunk: . connector-j/src/testsuite/regression | mmatthews | 3 Oct |
