You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by dj...@apache.org on 2007/02/20 04:38:43 UTC

svn commit: r509420 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java

Author: djd
Date: Mon Feb 19 19:38:43 2007
New Revision: 509420

URL: http://svn.apache.org/viewvc?view=rev&rev=509420
Log:
Add workaround in DatabaseMetaDataTest for DERBY-584 to stop DatabaseMetaDataTest failing.

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java?view=diff&rev=509420&r1=509419&r2=509420
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java Mon Feb 19 19:38:43 2007
@@ -1253,6 +1253,18 @@
             assertEquals("DATA_TYPE",
                     Types.BINARY, rsmdt.getColumnType(col));                               
         }
+        else if (dmdColumnType == Types.NUMERIC && usingDerbyNetClient())
+        {
+            // DERBY-584 inconsistency in numeric & decimal
+            assertEquals("DATA_TYPE",
+                    Types.DECIMAL, rsmdt.getColumnType(col));
+            
+            assertEquals("TYPE_NAME",
+                    "DECIMAL", rsmdt.getColumnTypeName(col));
+                       
+            assertEquals("TYPE_NAME",
+                    "NUMERIC", rs.getString("TYPE_NAME"));
+        }
         else
         {
             assertEquals("DATA_TYPE",