Index: jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/framework/wdf/customizer/AdjustArrayTypeCustomizer.java
===================================================================
--- jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/framework/wdf/customizer/AdjustArrayTypeCustomizer.java	(revision 0)
+++ jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/framework/wdf/customizer/AdjustArrayTypeCustomizer.java	(revision 0)
@@ -0,0 +1,90 @@
+package org.eclipse.persistence.testing.framework.wdf.customizer;
+
+import org.eclipse.persistence.config.DescriptorCustomizer;
+import org.eclipse.persistence.descriptors.ClassDescriptor;
+import org.eclipse.persistence.internal.helper.DatabaseField;
+import org.eclipse.persistence.mappings.DatabaseMapping;
+import org.eclipse.persistence.mappings.ManyToManyMapping;
+import org.eclipse.persistence.mappings.OneToOneMapping;
+import org.eclipse.persistence.platform.database.DatabasePlatform;
+import org.eclipse.persistence.platform.database.MySQLPlatform;
+import org.eclipse.persistence.platform.database.OraclePlatform;
+
+public class AdjustArrayTypeCustomizer implements DescriptorCustomizer {
+
+	private static final String VARCHAR = "VARCHAR";
+	private static final String BINARY = "BINARY";
+	private static Class<? extends DatabasePlatform> databasePlatformClass;
+
+	public static void setDatabasePlatformClass(
+			Class<? extends DatabasePlatform> databasePlatformClass) {
+		AdjustArrayTypeCustomizer.databasePlatformClass = databasePlatformClass;
+	}
+
+	@Override
+	public void customize(ClassDescriptor descriptor) throws Exception {
+
+		Iterable<DatabaseMapping> mappings = descriptor.getMappings();
+		for (DatabaseMapping mapping : mappings) {
+			if (mapping.isDirectToFieldMapping()) {
+				adjustDatabaseField(mapping.getField());
+			}
+			if (mapping.isOneToOneMapping()) {
+				OneToOneMapping oneToOneMapping = (OneToOneMapping) mapping;
+				for (DatabaseField field : oneToOneMapping
+						.getForeignKeyFields()) {
+					adjustDatabaseField(field);
+				}
+			} else if (mapping.isManyToManyMapping()) {
+				ManyToManyMapping manyToManyMapping = (ManyToManyMapping) mapping;
+				for (DatabaseField field : manyToManyMapping
+						.getSourceRelationKeyFields()) {
+					adjustDatabaseField(field);
+				}
+				for (DatabaseField field : manyToManyMapping
+						.getTargetRelationKeyFields()) {
+					adjustDatabaseField(field);
+				}
+			}
+		}
+	}
+
+	private void adjustDatabaseField(DatabaseField field) {
+		String columnDefintion = field.getColumnDefinition();
+		if (columnDefintion != null) {
+			if (columnDefintion.startsWith(BINARY)) {
+				adjustBinaryType(field, columnDefintion);
+			} else if (columnDefintion.startsWith(VARCHAR)) {
+				adjustVarcharType(field, columnDefintion);
+			}
+
+		}
+	}
+
+	private void adjustBinaryType(DatabaseField field, String columnDefintion) {
+		final String newDefinition;
+		if (OraclePlatform.class.isAssignableFrom(databasePlatformClass)) {
+			newDefinition = columnDefintion.replace(BINARY, "RAW");
+		} else if (MySQLPlatform.class.isAssignableFrom(databasePlatformClass)) {
+			newDefinition = columnDefintion.replace(BINARY, "binary");
+		} else if (databasePlatformClass.getName().endsWith("MaxDBPlatform")) {
+			newDefinition = columnDefintion.replace(BINARY, "CHAR") + " BYTE";
+		} else {
+			return;
+		}
+		field.setColumnDefinition(newDefinition);
+	}
+
+	private void adjustVarcharType(DatabaseField field, String columnDefintion) {
+		final String newDefinition;
+		if (OraclePlatform.class.isAssignableFrom(databasePlatformClass)) {
+			newDefinition = columnDefintion.replace(VARCHAR, "VARCHAR2");
+		} else if (databasePlatformClass.getName().endsWith("MaxDBPlatform")) {
+			newDefinition = columnDefintion + " UNICODE";
+		} else {
+			return;
+		}
+		field.setColumnDefinition(newDefinition);
+	}
+
+}
Index: jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/framework/wdf/SkipBugzillaTestRunner.java
===================================================================
--- jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/framework/wdf/SkipBugzillaTestRunner.java	(revision 8042)
+++ jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/framework/wdf/SkipBugzillaTestRunner.java	(working copy)
@@ -26,6 +26,7 @@
 
 import org.eclipse.persistence.config.PersistenceUnitProperties;
 import org.eclipse.persistence.platform.database.DatabasePlatform;
+import org.eclipse.persistence.testing.framework.wdf.customizer.AdjustArrayTypeCustomizer;
 import org.eclipse.persistence.testing.framework.wdf.server.Notification;
 import org.eclipse.persistence.testing.framework.wdf.server.ServerTestRunner;
 import org.junit.Assert;
@@ -112,11 +113,12 @@
         String databasePlatformClassName = testProperties.get(PersistenceUnitProperties.TARGET_DATABASE); 
         
 
-        if (databasePlatformClassName != null) {
-        databasePlatformClass = (Class<? extends DatabasePlatform>) Class.forName(databasePlatformClassName);
-        } else {
-            databasePlatformClass = null; // FIXME
-        }
+		if (databasePlatformClassName != null) {
+			databasePlatformClass = (Class<? extends DatabasePlatform>) Class.forName(databasePlatformClassName);
+			AdjustArrayTypeCustomizer.setDatabasePlatformClass(databasePlatformClass);
+		} else {
+			databasePlatformClass = null; // FIXME
+		}        
 
         String testBugzillaRun = (String) testProperties.get(TEST_BUGZILLA_RUN);
         if ("all".equals(testBugzillaRun)) {
Index: jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/models/wdf/jpa1/employee/Employee.java
===================================================================
--- jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/models/wdf/jpa1/employee/Employee.java	(revision 8042)
+++ jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/models/wdf/jpa1/employee/Employee.java	(working copy)
@@ -48,6 +48,9 @@
 import javax.persistence.Transient;
 import javax.persistence.UniqueConstraint;
 
+import org.eclipse.persistence.annotations.Customizer;
+import org.eclipse.persistence.testing.framework.wdf.customizer.AdjustArrayTypeCustomizer;
+
 @Cacheable(true)
 @Entity
 @Table(name = "TMP_EMP", uniqueConstraints = @UniqueConstraint(columnNames = { "ID", "DEPARTMENT" }))
@@ -55,6 +58,7 @@
 @NamedNativeQueries( {
         @NamedNativeQuery(name = "Employee.schlonz", query = "select \"TMP_EMP\".*  from \"TMP_EMP\"", resultClass = Employee.class),
         @NamedNativeQuery(name = "Employee.schlonzHint", query = "select \"TMP_EMP\".*  from \"TMP_EMP\"", resultClass = Employee.class) })
+@Customizer(AdjustArrayTypeCustomizer.class)        
 public class Employee implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -152,7 +156,7 @@
     // <join-column name="PROFILE_GUID"/>
     // </attribute>
     @OneToOne
-    @JoinColumn(name = "PROFILE_GUID")
+    @JoinColumn(name = "PROFILE_GUID", columnDefinition=TravelProfile.BINARY_16_COLUMN)
     protected TravelProfile travelProfile;
 
     // <attribute name="hobbies">
@@ -186,8 +190,9 @@
     @JoinTable(name = "TMP_EMP_CREDIT", joinColumns = { @JoinColumn(name = "CLIENT_ID") }, inverseJoinColumns = { @JoinColumn(name = "CREDIT_ID") })
     protected Set<CreditCardAccount> creditCardAccounts;
 
-    @OneToOne
-    @JoinColumn(name = "AUTOMOBILE")
+//    @OneToOne
+//    @JoinColumn(name = "AUTOMOBILE")
+    @Transient // EclipseLink has issue with cyclic FKs FIXME: file bug and add id here
     protected MotorVehicle automobile;
 
     @ManyToOne
Index: jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/models/wdf/jpa1/employee/Item_Byte.java
===================================================================
--- jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/models/wdf/jpa1/employee/Item_Byte.java	(revision 8042)
+++ jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/models/wdf/jpa1/employee/Item_Byte.java	(working copy)
@@ -26,11 +26,15 @@
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
 
+import org.eclipse.persistence.annotations.Customizer;
+import org.eclipse.persistence.testing.framework.wdf.customizer.AdjustArrayTypeCustomizer;
+
 @Entity
 @Table(name = "BYTE_ITEM")
+@Customizer(AdjustArrayTypeCustomizer.class)
 public class Item_Byte implements Serializable {
     @Id
-    @Column(name = "ITEM_ID")
+    @Column(name = "ITEM_ID", columnDefinition=TravelProfile.BINARY_16_COLUMN)
     private byte[] itemId;
     private String namespace;
     private String text;
Index: jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/models/wdf/jpa1/employee/TravelProfile.java
===================================================================
--- jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/models/wdf/jpa1/employee/TravelProfile.java	(revision 8042)
+++ jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/models/wdf/jpa1/employee/TravelProfile.java	(working copy)
@@ -22,10 +22,16 @@
 import javax.persistence.ManyToMany;
 import javax.persistence.Table;
 
+import org.eclipse.persistence.annotations.Customizer;
+import org.eclipse.persistence.testing.framework.wdf.customizer.AdjustArrayTypeCustomizer;
+
 @Entity
 @Table(name = "TMP_PROFILE")
+@Customizer(AdjustArrayTypeCustomizer.class)
 public class TravelProfile {
 
+	static final String BINARY_16_COLUMN = "BINARY(16)";
+
     /**
      * @param guid
      *            The guid to set.
@@ -85,6 +91,7 @@
      * @return Returns the guid.
      */
     @Id
+    @Column(length = 16, columnDefinition=BINARY_16_COLUMN)
     public byte[] getGuid() {
         return guid;
     }
Index: jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/models/wdf/jpa1/employee/Vehicle.java
===================================================================
--- jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/models/wdf/jpa1/employee/Vehicle.java	(revision 8042)
+++ jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/models/wdf/jpa1/employee/Vehicle.java	(working copy)
@@ -34,12 +34,16 @@
 import javax.persistence.TableGenerator;
 import javax.persistence.Version;
 
+import org.eclipse.persistence.annotations.Customizer;
+import org.eclipse.persistence.testing.framework.wdf.customizer.AdjustArrayTypeCustomizer;
+
 @Cacheable(value = true)
 @Entity
 @Table(name = "TMP_VEHICLE")
 @EntityListeners( { VehicleListener.class })
 @DiscriminatorColumn(name = "DTYPE", discriminatorType = DiscriminatorType.INTEGER)
 @DiscriminatorValue("-1")
+@Customizer(AdjustArrayTypeCustomizer.class)
 public class Vehicle implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -59,7 +63,7 @@
     int version;
 
     @ManyToMany
-    @JoinTable(name = "TMP_VEHICLE_PROFILE", joinColumns = { @JoinColumn(name = "VEHICLE_ID") }, inverseJoinColumns = { @JoinColumn(name = "PROFILE_ID") })
+    @JoinTable(name = "TMP_VEHICLE_PROFILE", joinColumns = { @JoinColumn(name = "VEHICLE_ID") }, inverseJoinColumns = { @JoinColumn(name = "PROFILE_ID", columnDefinition=TravelProfile.BINARY_16_COLUMN) })
     private Set<TravelProfile> profiles;
 
     public void setId(Short id) {
Index: jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/models/wdf/jpa1/types/BasicTypesFieldAccess.java
===================================================================
--- jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/models/wdf/jpa1/types/BasicTypesFieldAccess.java	(revision 8042)
+++ jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/models/wdf/jpa1/types/BasicTypesFieldAccess.java	(working copy)
@@ -36,7 +36,9 @@
 import javax.persistence.Transient;
 import javax.persistence.Version;
 
+import org.eclipse.persistence.annotations.Customizer;
 import org.eclipse.persistence.annotations.Mutable;
+import org.eclipse.persistence.testing.framework.wdf.customizer.AdjustArrayTypeCustomizer;
 
 /*
  * This entity class contains all supported <i>basic </i> data types.
@@ -49,6 +51,7 @@
 
 @Entity
 @Table(name = "TMP_BASIC_TYPES_FA")
+@Customizer(AdjustArrayTypeCustomizer.class)
 public class BasicTypesFieldAccess {
 
     @Transient
@@ -175,7 +178,7 @@
 
     // arrays
     @Basic
-    @Column(name = "PBA_BINARY", length = 8)
+	@Column(name = "PBA_BINARY", length = 8, columnDefinition = "BINARY(8)")
     @Mutable
     protected byte[] primitiveByteArray2Binary; // BINARY
 
@@ -191,7 +194,7 @@
     protected byte[] primitiveByteArray2Blob; // BLOB
 
     @Basic
-    @Column(name = "WBA_BINARY", length = 8)
+	@Column(name = "WBA_BINARY", length = 8, columnDefinition = "BINARY(8)")
     @Mutable
     protected Byte[] wrapperByteArray2Binary; // BINARY
 
@@ -207,7 +210,7 @@
     protected Byte[] wrapperByteArray2Blob; // BLOB
 
     @Basic
-    @Column(name = "PCA_VARCHAR")
+	@Column(name = "PCA_VARCHAR", columnDefinition = "VARCHAR(255)")
     @Mutable
     protected char[] primitiveCharArray2Varchar; // VARCHAR
 
@@ -218,7 +221,7 @@
     protected char[] primitiveCharArray2Clob; // CLOB
 
     @Basic
-    @Column(name = "WCA_VARCHAR")
+	@Column(name = "WCA_VARCHAR", columnDefinition = "VARCHAR(255)")
     @Mutable
     protected Character[] wrapperCharacterArray2Varchar; // VARCHAR
 
Index: jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/tests/wdf/jpa1/generator/TestSequence.java
===================================================================
--- jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/tests/wdf/jpa1/generator/TestSequence.java	(revision 8042)
+++ jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/tests/wdf/jpa1/generator/TestSequence.java	(working copy)
@@ -19,6 +19,7 @@
 
 import org.eclipse.persistence.platform.database.MySQLPlatform;
 import org.eclipse.persistence.platform.database.OraclePlatform;
+import org.eclipse.persistence.platform.database.SQLServerPlatform;
 import org.eclipse.persistence.testing.framework.wdf.JPAEnvironment;
 import org.eclipse.persistence.testing.framework.wdf.Skip;
 import org.eclipse.persistence.testing.framework.wdf.ToBeInvestigated;
@@ -31,7 +32,7 @@
 public class TestSequence extends JPA1Base {
 
     @Test
-    @Skip(databaseNames = "org.eclipse.persistence.platform.database.MySQLPlatform")
+    @Skip(databaseNames = "org.eclipse.persistence.platform.database.MySQLPlatform", databases=SQLServerPlatform.class)
     public void testPersist() {
         JPAEnvironment env = getEnvironment();
         EntityManager em = env.getEntityManager();
@@ -50,7 +51,7 @@
     }
 
     @Test
-    @Skip(databases = MySQLPlatform.class)
+    @Skip(databases = {MySQLPlatform.class, SQLServerPlatform.class})
     public void testPersistFlock() {
         JPAEnvironment env = getEnvironment();
         EntityManager em = env.getEntityManager();
@@ -74,7 +75,7 @@
     }
 
     @Test
-    @Skip(databases = MySQLPlatform.class)
+    @Skip(databases = {MySQLPlatform.class, SQLServerPlatform.class})
     @ToBeInvestigated(databases = OraclePlatform.class)
     // adjust test
     public void testAllocSize() {
Index: jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/tests/wdf/jpa1/JPA1Base.java
===================================================================
--- jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/tests/wdf/jpa1/JPA1Base.java	(revision 8042)
+++ jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/tests/wdf/jpa1/JPA1Base.java	(working copy)
@@ -20,11 +20,11 @@
 public abstract class JPA1Base extends AbstractBaseTest {
 
     private static final String[] CLEARABLE_TABLE_NAMES = { "TMP_EMP_CREDIT", "TMP_CREDIT_ACC", "TMP_BROKER_ACC",
-            "TMP_SAVE_ACC", "TMP_MARGIN_ACC", "TMP_CHECK_ACC", "TMP_EMP_PROJECT", "TMP_DEP", "TMP_REVIEW_DETAILS",
+            "TMP_SAVE_ACC", "TMP_MARGIN_ACC", "TMP_CHECK_ACC", "TMP_EMP_PROJECT", "TMP_REVIEW_DETAILS",
             "TMP_EMP_REVIEW", "TMP_BASIC_TYPES_FA", "TMP_TEMPORAL_FA", "TMP_BASIC_TYPES_PA", "TMP_NODE", "TMP_EMBEDD_FA",
             "TMP_EMBEDD_PA", "TMP_ISLAND", "TMP_EMP_PATENT", "TMP_PROJECT_DETAILS", "TMP_PROFILE", "TMP_CASC_NODE",
             "TMP_COURSE_EMP", "TMP_COURSE", "TMP_REVIEW", "TMP_PATENT", "TMP_CASC_NODE_DESC", "TMP_EMP_HOBBY", "TMP_HOBBY",
-            "TMP_EMP_BICYCLE", "TMP_VEHICLE", "TMP_EMP", "TMP_OFFICE_CUBICLE", "TMP_OFFICE", "TMP_ALLRELATIONS", "TMP_CUBICLE",
+            "TMP_EMP_BICYCLE", "TMP_VEHICLE", "TMP_EMP", "TMP_DEP", "TMP_OFFICE_CUBICLE", "TMP_OFFICE", "TMP_ALLRELATIONS", "TMP_CUBICLE",
             "TMP_ALLRELATIONS_LIST", "TMP_ALLRELATIONS_SET", "TMP_ALLRELATIONS_COLLECTION", "TMP_ALLRELATIONS_MAPID",
             "TMP_ALLRELATIONS_MAPFIELD", "TMP_TASK", "TMP_PROJECT", "TMP_CITY", "TMP_CITY_TMP_COP", "TMP_CITY_TMP_CRIMINAL",
             "TMP_COP", "TMP_COP_TMP_CRIMINAL", "TMP_COP_TMP_INFORMER", "TMP_CRIMINAL", "TMP_CRIMINAL_TMP_CRIMINAL",
Index: jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestConditionalExpressions.java
===================================================================
--- jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestConditionalExpressions.java	(revision 8042)
+++ jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestConditionalExpressions.java	(working copy)
@@ -19,9 +19,7 @@
 
 import javax.persistence.TemporalType;
 
-import org.eclipse.persistence.platform.database.OraclePlatform;
 import org.eclipse.persistence.testing.framework.wdf.Bugzilla;
-import org.eclipse.persistence.testing.framework.wdf.Issue;
 import org.eclipse.persistence.testing.framework.wdf.ToBeInvestigated;
 import org.junit.Test;
 
@@ -605,7 +603,6 @@
     }
     
     @Test
-    @Issue(issueid=13, databases=OraclePlatform.class)
     public void testInBinary() {
         byte[] byteArr1 = new byte[] { 1, 2, 3, 4, 5, 6, 7, 8 };
         byte[] byteArr2 = new byte[] { 1, 2, 3, 4, 5, 6, 7, 8 };
Index: jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestExtendedQueries.java
===================================================================
--- jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestExtendedQueries.java	(revision 8042)
+++ jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestExtendedQueries.java	(working copy)
@@ -26,8 +26,6 @@
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 
-import org.eclipse.persistence.platform.database.OraclePlatform;
-import org.eclipse.persistence.testing.framework.wdf.Issue;
 import org.eclipse.persistence.testing.framework.wdf.JPAEnvironment;
 import org.eclipse.persistence.testing.framework.wdf.ToBeInvestigated;
 import org.eclipse.persistence.testing.models.wdf.jpa1.employee.Bicycle;
@@ -279,7 +277,6 @@
 
     // @TestProperties(unsupportedDatabaseVendors = { DatabaseVendor.OPEN_SQL })
     @Test
-    @Issue(issueid=13, databases=OraclePlatform.class)
     public void testQueryWithBuiltinAbs() throws Exception {
         EntityManager em = getEnvironment().getEntityManager();
         try {
@@ -294,7 +291,6 @@
 
     // @TestProperties(unsupportedDatabaseVendors = { DatabaseVendor.OPEN_SQL })
     @Test
-    @Issue(issueid=13, databases=OraclePlatform.class)
     public void testQueryWithMemberOf() throws Exception {
         EntityManager em = getEnvironment().getEntityManager();
         try {
Index: jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestGroupByOrderByHaving.java
===================================================================
--- jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestGroupByOrderByHaving.java	(revision 8042)
+++ jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestGroupByOrderByHaving.java	(working copy)
@@ -13,6 +13,7 @@
 
 package org.eclipse.persistence.testing.tests.wdf.jpa1.query;
 
+import org.eclipse.persistence.testing.framework.wdf.Skip;
 import org.eclipse.persistence.testing.framework.wdf.ToBeInvestigated;
 import org.junit.Test;
 
@@ -139,6 +140,13 @@
     }
 
     @Test
+    @Skip(databaseNames="org.eclipse.persistence.platform.database.MaxDBPlatform") 
+	/*
+	 * On MaxDB, the query maps to
+	 * "SELECT t0.ID, t0.COOL, t0.NAME, t0.TYPE, t0.CITY_ENUM, t0.CITY_TESLA_INT, t0.CITY_TESLA_BLOB FROM TMP_CITY t0 WHERE EXISTS (SELECT 1 FROM TMP_COP t2, TMP_COP t1 WHERE (t2.ID = t1.PARTNER_ID) GROUP BY t1.ID HAVING (t2.ID = 5))"
+	 * . The query is invalid (as expected) and should fail on the database as
+	 * t2.ID is no grouping column and must not be used in HAVING.
+	 */
     public void testSubQueryGroupBy3() {
         /* 21 */assertInvalidQuery("select _city from City _city where exists(select max(c.id) from Cop c group by c.id having c.partner.id = 5)");
     }
Index: jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestJoinFetch.java
===================================================================
--- jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestJoinFetch.java	(revision 8042)
+++ jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestJoinFetch.java	(working copy)
@@ -26,8 +26,6 @@
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 
-import org.eclipse.persistence.platform.database.OraclePlatform;
-import org.eclipse.persistence.testing.framework.wdf.Issue;
 import org.eclipse.persistence.testing.framework.wdf.JPAEnvironment;
 import org.eclipse.persistence.testing.framework.wdf.ToBeInvestigated;
 import org.eclipse.persistence.testing.models.wdf.jpa1.employee.Department;
@@ -121,7 +119,6 @@
 
     @SuppressWarnings("unchecked")
     @Test
-    @Issue(issueid=13, databases=OraclePlatform.class)
     public void testJoinFetchProjects() throws SQLException {
         init();
         EntityManager em = getEnvironment().getEntityManager();
@@ -246,7 +243,6 @@
     }
 
     @Test
-    @Issue(issueid=13, databases=OraclePlatform.class)
     public void testDistinctJoinFetchHobbiesWithMultipleSelectItems() throws SQLException {
         init();
         EntityManager em = getEnvironment().getEntityManager();
Index: jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestNativeQuery.java
===================================================================
--- jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestNativeQuery.java	(revision 8042)
+++ jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestNativeQuery.java	(working copy)
@@ -22,7 +22,9 @@
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 
+import org.eclipse.persistence.platform.database.SQLServerPlatform;
 import org.eclipse.persistence.testing.framework.wdf.JPAEnvironment;
+import org.eclipse.persistence.testing.framework.wdf.Skip;
 import org.eclipse.persistence.testing.models.wdf.jpa1.employee.Cubicle;
 import org.eclipse.persistence.testing.models.wdf.jpa1.employee.Department;
 import org.eclipse.persistence.testing.models.wdf.jpa1.employee.Employee;
@@ -146,7 +148,7 @@
         }
     }
 
-    // @TestProperties(unsupportedDatabaseVendors = { DatabaseVendor.MS_SQL_SERVER })
+    @Skip(databases=SQLServerPlatform.class)
     @Test
     public void testColumnResult() throws SQLException {
         init();
@@ -167,7 +169,7 @@
         }
     }
 
-    // @TestProperties(unsupportedDatabaseVendors = { DatabaseVendor.MS_SQL_SERVER })
+    @Skip(databases=SQLServerPlatform.class)
     @Test
     public void testFieldResult() throws SQLException {
         init();
@@ -213,7 +215,7 @@
         }
     }
 
-    // @TestProperties(unsupportedDatabaseVendors = { DatabaseVendor.MS_SQL_SERVER })
+    @Skip(databases=SQLServerPlatform.class)
     @Test
     public void testFieldByField() throws SQLException {
         clearAllTables();
Index: jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestParameterTypes.java
===================================================================
--- jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestParameterTypes.java	(revision 8042)
+++ jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestParameterTypes.java	(working copy)
@@ -22,8 +22,6 @@
 import javax.persistence.Query;
 import javax.persistence.TemporalType;
 
-import org.eclipse.persistence.platform.database.OraclePlatform;
-import org.eclipse.persistence.testing.framework.wdf.Issue;
 import org.eclipse.persistence.testing.framework.wdf.JPAEnvironment;
 import org.eclipse.persistence.testing.models.wdf.jpa1.types.BasicTypesFieldAccess;
 import org.eclipse.persistence.testing.models.wdf.jpa1.types.UserDefinedEnum;
@@ -598,7 +596,6 @@
 
     // arrays
     @Test
-    @Issue(issueid=13, databases=OraclePlatform.class)
     public void testPrimitiveByteArray2Binary() {
         final byte[] UNCHANGED = new byte[] { 0, 1, 2, 3, 4, 5, 6, 7 };
         Validator validator = new Validator() {
@@ -658,7 +655,6 @@
     }
 
     @Test
-    @Issue(issueid=13, databases=OraclePlatform.class)
     public void testPrimitiveCharArray2Varchar() {
         final char[] UNCHANGED = new char[] { 'U', 'N', 'C', 'H', 'A', 'N', 'G', 'E', 'D' };
         Validator validator = new Validator() {
@@ -699,7 +695,6 @@
     }
 
     @Test
-    @Issue(issueid=13, databases=OraclePlatform.class)
     public void testWrapperByteArray2Binary() {
         final Byte[] UNCHANGED = new Byte[] { Byte.valueOf((byte) 0), Byte.valueOf((byte) 1), Byte.valueOf((byte) 2),
                 Byte.valueOf((byte) 3), Byte.valueOf((byte) 4), Byte.valueOf((byte) 5), Byte.valueOf((byte) 6),
@@ -766,7 +761,6 @@
 
     @SuppressWarnings("boxing")
     @Test
-    @Issue(issueid=13, databases=OraclePlatform.class)
     public void testWrapperCharArray2Varchar() {
         final Character[] UNCHANGED = new Character[] { 'U', 'N', 'C', 'H', 'A', 'N', 'G', 'E', 'D' };
         Validator validator = new Validator() {
Index: jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestSelectListTypes.java
===================================================================
--- jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestSelectListTypes.java	(revision 8042)
+++ jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestSelectListTypes.java	(working copy)
@@ -21,8 +21,7 @@
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 
-import org.eclipse.persistence.platform.database.OraclePlatform;
-import org.eclipse.persistence.testing.framework.wdf.Issue;
+import org.eclipse.persistence.testing.framework.wdf.Bugzilla;
 import org.eclipse.persistence.testing.framework.wdf.JPAEnvironment;
 import org.eclipse.persistence.testing.framework.wdf.ToBeInvestigated;
 import org.eclipse.persistence.testing.models.wdf.jpa1.types.BasicTypesFieldAccess;
@@ -50,8 +49,7 @@
         }
     }
 
-    @SuppressWarnings("unchecked")
-    private void validateType(String subList, Class type) {
+    private void validateType(String subList, Class<?> type) {
         JPAEnvironment env = getEnvironment();
         EntityManager em = env.getEntityManager();
         try {
@@ -412,25 +410,21 @@
 
     // arrays
     @Test
-    @Issue(issueid=13, databases=OraclePlatform.class)
     public void testCountPrimitiveByteArray2Binary() {
         validateCount("primitiveByteArray2Binary");
     }
 
     @Test
-    @Issue(issueid=13, databases=OraclePlatform.class)
     public void testCountPrimitiveCharArray2Varchar() {
         validateCount("primitiveCharArray2Varchar");
     }
 
     @Test
-    @Issue(issueid=13, databases=OraclePlatform.class)
     public void testCountWrapperByteArray2Binary() {
         validateCount("wrapperByteArray2Binary");
     }
 
     @Test
-    @Issue(issueid=13, databases=OraclePlatform.class)
     public void testCountWrapperCharArray2Varchar() {
         validateCount("wrapperCharacterArray2Varchar");
     }
@@ -510,6 +504,7 @@
 
     // immutable reference types
     @Test
+    @Bugzilla(bugid=320120, databaseNames="org.eclipse.persistence.platform.database.MaxDBPlatform")
     public void testSumBigDecimal() {
         validateSum("bigDecimal", BigDecimal.class);
     }
@@ -642,7 +637,6 @@
 
     // arrays
     @Test
-    @Issue(issueid=13, databases=OraclePlatform.class)
     public void testMaxPrimitiveByteArray2Binary() {
         validateMax("primitiveByteArray2Binary", byte[].class);
     }
Index: jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestSetFunctions.java
===================================================================
--- jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestSetFunctions.java	(revision 8042)
+++ jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestSetFunctions.java	(working copy)
@@ -20,6 +20,7 @@
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 
+import org.eclipse.persistence.testing.framework.wdf.Bugzilla;
 import org.eclipse.persistence.testing.framework.wdf.JPAEnvironment;
 import org.eclipse.persistence.testing.models.wdf.jpa1.employee.Employee;
 import org.eclipse.persistence.testing.tests.wdf.jpa1.JPA1Base;
@@ -66,6 +67,7 @@
     }
 
     @Test
+    @Bugzilla(bugid=320120, databaseNames="org.eclipse.persistence.platform.database.MaxDBPlatform")
     public void testSum() {
         JPAEnvironment env = getEnvironment();
         EntityManager em = env.getEntityManager();
Index: jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/tests/wdf/jpa1/simple/BufferReadTest.java
===================================================================
--- jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/tests/wdf/jpa1/simple/BufferReadTest.java	(revision 8042)
+++ jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/tests/wdf/jpa1/simple/BufferReadTest.java	(working copy)
@@ -22,8 +22,9 @@
 import javax.persistence.Query;
 import javax.sql.DataSource;
 
+import org.eclipse.persistence.platform.database.SQLServerPlatform;
 import org.eclipse.persistence.testing.framework.wdf.JPAEnvironment;
-import org.eclipse.persistence.testing.framework.wdf.ToBeInvestigated;
+import org.eclipse.persistence.testing.framework.wdf.Skip;
 import org.eclipse.persistence.testing.models.wdf.jpa1.employee.Department;
 import org.eclipse.persistence.testing.models.wdf.jpa1.types.BasicTypesPropertyAccess;
 import org.eclipse.persistence.testing.tests.wdf.jpa1.JPA1Base;
@@ -268,6 +269,7 @@
     }
 
     @Test
+    @Skip(databases=SQLServerPlatform.class)
     public void testNativeFieldsExecuteOnlyOutsideTransactionSmall() {
         final JPAEnvironment environment = getEnvironment();
         final EntityManager myEm = environment.getEntityManager();
Index: jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/tests/wdf/jpa1/simple/TestBasicFieldTypes.java
===================================================================
--- jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/tests/wdf/jpa1/simple/TestBasicFieldTypes.java	(revision 8042)
+++ jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/tests/wdf/jpa1/simple/TestBasicFieldTypes.java	(working copy)
@@ -28,7 +28,7 @@
 
 import org.eclipse.persistence.testing.framework.wdf.Bugzilla;
 import org.eclipse.persistence.testing.framework.wdf.JPAEnvironment;
-import org.eclipse.persistence.testing.framework.wdf.ToBeInvestigated;
+import org.eclipse.persistence.testing.framework.wdf.Skip;
 import org.eclipse.persistence.testing.models.wdf.jpa1.types.BasicTypesFieldAccess;
 import org.eclipse.persistence.testing.models.wdf.jpa1.types.UserDefinedEnum;
 import org.eclipse.persistence.testing.models.wdf.jpa1.types.UserDefinedSerializable;
@@ -856,6 +856,7 @@
     }
 
     @Test
+    @Skip(databaseNames = "org.eclipse.persistence.platform.database.MaxDBPlatform")
     public void testPrimitiveByteArray2Longvarbinary() {
         final byte[] UNCHANGED = new byte[] { 0, 1, 2, 3, 4, 5, 6, 7 };
         MutableValidator validator = new MutableValidator() {
Index: jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/tests/wdf/jpa1/simple/TestBasicPropertyTypes.java
===================================================================
--- jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/tests/wdf/jpa1/simple/TestBasicPropertyTypes.java	(revision 8042)
+++ jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/tests/wdf/jpa1/simple/TestBasicPropertyTypes.java	(working copy)
@@ -28,7 +28,7 @@
 
 import org.eclipse.persistence.testing.framework.wdf.Bugzilla;
 import org.eclipse.persistence.testing.framework.wdf.JPAEnvironment;
-import org.eclipse.persistence.testing.framework.wdf.ToBeInvestigated;
+import org.eclipse.persistence.testing.framework.wdf.Skip;
 import org.eclipse.persistence.testing.models.wdf.jpa1.types.BasicTypesPropertyAccess;
 import org.eclipse.persistence.testing.models.wdf.jpa1.types.UserDefinedEnum;
 import org.eclipse.persistence.testing.models.wdf.jpa1.types.UserDefinedSerializable;
@@ -856,6 +856,7 @@
     }
 
     @Test
+    @Skip(databaseNames = "org.eclipse.persistence.platform.database.MaxDBPlatform")
     public void testPrimitiveByteArray2Longvarbinary() {
         final byte[] UNCHANGED = new byte[] { 0, 1, 2, 3, 4, 5, 6, 7 };
         MutableValidator validator = new MutableValidator() {