HHH-7187 - tests fail on sybase

hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/collection/StringMapEntity.java

@@ -28,6 +28,7 @@ import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
+import javax.persistence.MapKeyColumn;
 
 import org.hibernate.envers.Audited;
 
@@ -42,6 +43,7 @@ public class StringMapEntity {
 
     @Audited
     @ElementCollection
+	@MapKeyColumn(nullable=false)
     private Map<String, String> strings;
 
     public StringMapEntity() {

hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/manytomany/MapOwningEntity.java

@@ -27,6 +27,7 @@ import java.util.Map;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.ManyToMany;
+import javax.persistence.MapKeyColumn;
 
 import org.hibernate.envers.Audited;
 
@@ -44,6 +45,7 @@ public class MapOwningEntity {
 
     @Audited
     @ManyToMany
+	@MapKeyColumn(nullable=false)
     private Map<String, MapOwnedEntity> references = new HashMap<String, MapOwnedEntity>();
 
     public MapOwningEntity() { }

hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/manytomany/unidirectional/MapUniEntity.java

@@ -26,6 +26,7 @@ import java.util.Map;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.ManyToMany;
+import javax.persistence.MapKeyColumn;
 
 import org.hibernate.envers.Audited;
 import org.hibernate.envers.test.entities.StrTestEntity;
@@ -44,6 +45,7 @@ public class MapUniEntity {
 
     @Audited
     @ManyToMany
+	@MapKeyColumn(nullable=false)
     private Map<String, StrTestEntity> map;
 
     public MapUniEntity() {

hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/data/LobSerializables.java

@@ -30,10 +30,13 @@ import org.junit.Test;
 
 import org.hibernate.ejb.Ejb3Configuration;
 import org.hibernate.envers.test.AbstractEntityTest;
+import org.hibernate.testing.DialectChecks;
+import org.hibernate.testing.RequiresDialectFeature;
 
 /**
  * @author Adam Warski (adam at warski dot org)
  */
+@RequiresDialectFeature(DialectChecks.SupportsExpectedLobUsagePattern.class)
 public class LobSerializables extends AbstractEntityTest {
     private Integer id1;
 

hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/entities/PartialModifiedFlagsEntity.java

@@ -73,6 +73,7 @@ public class PartialModifiedFlagsEntity {
 
 	@Audited(withModifiedFlag = true)
 	@ElementCollection
+	@MapKeyColumn(nullable=false)
     private Map<String, String> stringMap = new HashMap<String, String>();
 
 	@Audited(withModifiedFlag = true)

hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/quotation/QuotedFieldsEntity.java

@@ -14,14 +14,14 @@ import org.hibernate.envers.Audited;
 public class QuotedFieldsEntity {
     @Id
     @GeneratedValue
-    @Column(name = "`id#`")
+    @Column(name = "`id`")
     private Long id;
 
-    @Column(name = "`#data1`")
+    @Column(name = "`data1`")
     @Audited
     private String data1;
 
-    @Column(name = "`#data2`")
+    @Column(name = "`data2`")
     @Audited
     private Integer data2;