svn commit: r412864 - /db/ddlutils/trunk/src/test/org/apache/ddlutils/io/TestAlteration.java

[tomdz]

Author: tomdz
Date: Thu Jun  8 14:34:57 2006
New Revision: 412864

URL: http://svn.apache.org/viewvc?rev=412864&view=rev
Log:
Changes alteration tests to avoid conflicts with the strange MySQL behavior 
that column datatypes might be silently changed by the database under certain 
conditions

Modified:
    db/ddlutils/trunk/src/test/org/apache/ddlutils/io/TestAlteration.java

Modified: db/ddlutils/trunk/src/test/org/apache/ddlutils/io/TestAlteration.java
URL: 
http://svn.apache.org/viewvc/db/ddlutils/trunk/src/test/org/apache/ddlutils/io/TestAlteration.java?rev=412864&r1=412863&r2=412864&view=diff
==============================================================================
--- db/ddlutils/trunk/src/test/org/apache/ddlutils/io/TestAlteration.java 
(original)
+++ db/ddlutils/trunk/src/test/org/apache/ddlutils/io/TestAlteration.java Thu 
Jun  8 14:34:57 2006
@@ -509,7 +509,7 @@
             "    <column name='avalue1' type='VARCHAR' size='32'/>\n"+
             "    <column name='avalue2' type='INTEGER'/>\n"+
             "    <column name='avalue3' type='DOUBLE' default='1.0'/>\n"+
-            "    <column name='avalue4' type='CHAR' size='16'/>\n"+
+            "    <column name='avalue4' type='VARCHAR' size='16'/>\n"+
             "  </table>\n"+
             "</database>";
 
@@ -552,7 +552,7 @@
             "    <column name='avalue1' type='VARCHAR' size='32'/>\n"+
             "    <column name='avalue2' type='INTEGER'/>\n"+
             "    <column name='avalue3' type='DOUBLE' default='1.0'/>\n"+
-            "    <column name='avalue4' type='CHAR' size='16'/>\n"+
+            "    <column name='avalue4' type='VARCHAR' size='16'/>\n"+
             "  </table>\n"+
             "</database>";
 
@@ -659,7 +659,7 @@
             "  <table name='roundtrip'>\n"+
             "    <column name='pk' type='INTEGER' primaryKey='true' 
required='true'/>\n"+
             "    <column name='avalue1' type='VARCHAR' size='32'/>\n"+
-            "    <column name='avalue4' type='CHAR' size='5'/>\n"+
+            "    <column name='avalue4' type='VARCHAR' size='5'/>\n"+
             "    <column name='avalue3' type='DOUBLE' default='1.0'/>\n"+
             "    <column name='avalue2' type='INTEGER'/>\n"+
             "  </table>\n"+
@@ -672,7 +672,7 @@
             "    <column name='avalue1' type='VARCHAR' size='32'/>\n"+
             "    <column name='avalue2' type='INTEGER'/>\n"+
             "    <column name='avalue3' type='DOUBLE' default='1.0'/>\n"+
-            "    <column name='avalue4' type='CHAR' size='5'/>\n"+
+            "    <column name='avalue4' type='VARCHAR' size='5'/>\n"+
             "  </table>\n"+
             "</database>";
 
@@ -733,6 +733,11 @@
      */
     public void testDropAutoIncrementColumn()
     {
+        if (!getPlatformInfo().isNonPKIdentityColumnsSupported())
+        {
+            return;
+        }
+
         final String model1Xml = 
             "<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
             "<database name='roundtriptest'>\n"+