Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-5572 clean up Sybase job failures 

git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@20650 1b8cb986-b30d-0410-93ca-fae66ebed9b2
This commit is contained in:
Strong Liu 2010-09-16 11:00:16 +00:00
parent d90cc02c06
commit bdab36f6f2
15 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
parent/pom.xml
View File

@ -916,7 +916,7 @@
<properties>
<db.dialect>org.hibernate.dialect.SybaseASE15Dialect</db.dialect>
<jdbc.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.driver>
<jdbc.url>jdbc:sybase:Tds:vmg07.mw.lab.eng.bos.redhat.com:5000/hibbrtru?DYNAMIC_PREPARE=true</jdbc.url>
<jdbc.url>jdbc:sybase:Tds:vmg07.mw.lab.eng.bos.redhat.com:5000/hibbrtru?SQLINITSTRING=set quoted_identifier on</jdbc.url>
<jdbc.user>hibbrtru</jdbc.user>
<jdbc.pass>hibbrtru</jdbc.pass>
<jdbc.isolation/>
@ -935,7 +935,7 @@
<properties>
<db.dialect>org.hibernate.dialect.SybaseASE15Dialect</db.dialect>
<jdbc.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.driver>
<jdbc.url>jdbc:sybase:Tds:vmg09.mw.lab.eng.bos.redhat.com:5000/hibbrtru?DYNAMIC_PREPARE=true</jdbc.url>
<jdbc.url>jdbc:sybase:Tds:vmg09.mw.lab.eng.bos.redhat.com:5000/hibbrtru?SQLINITSTRING=set quoted_identifier on</jdbc.url>
<jdbc.user>hibbrtru</jdbc.user>
<jdbc.pass>hibbrtru</jdbc.pass>
<jdbc.isolation/>

2
testsuite/src/test/java/org/hibernate/test/annotations/any/PropertyMap.java
View File

@ -61,7 +61,7 @@ public class PropertyMap {
name = "map_properties",
joinColumns = @JoinColumn( name = "map_id" ),
inverseJoinColumns = @JoinColumn( name = "property_id" ) )
@MapKey( columns = { @Column( name = "map_key" ) } ) //keep for legacy test
@MapKey( columns = { @Column( name = "map_key", nullable = false ) } ) //keep for legacy test
public Map<String, Property> getProperties() {
return properties;
}

4
testsuite/src/test/java/org/hibernate/test/annotations/cid/AId.java
View File

@ -14,11 +14,11 @@ import javax.persistence.OneToOne;
public class AId implements Serializable {
@OneToOne
@JoinColumn( name = "bid" )
@JoinColumn( name = "bid", nullable = false )
private B b;
@OneToOne
@JoinColumn( name = "cid" )
@JoinColumn( name = "cid", nullable = false )
private C c;

4
testsuite/src/test/java/org/hibernate/test/annotations/cid/ChildPk.java
View File

@ -17,8 +17,8 @@ public class ChildPk implements Serializable {
public int nthChild;
@ManyToOne()
@JoinColumns({
@JoinColumn(name = "parentLastName", referencedColumnName = "p_lname"),
@JoinColumn(name = "parentFirstName", referencedColumnName = "firstName")
@JoinColumn(name = "parentLastName", referencedColumnName = "p_lname", nullable = false),
@JoinColumn(name = "parentFirstName", referencedColumnName = "firstName", nullable = false)
})
public Parent parent;

5
testsuite/src/test/java/org/hibernate/test/annotations/cid/TvMagazin.java
View File

@ -3,6 +3,7 @@ package org.hibernate.test.annotations.cid;
import java.util.Date;
import javax.persistence.AssociationOverride;
import javax.persistence.AssociationOverrides;
import javax.persistence.EmbeddedId;
import javax.persistence.Entity;
import javax.persistence.JoinColumn;
@ -13,7 +14,9 @@ import javax.persistence.TemporalType;
* @author Emmanuel Bernard
*/
@Entity
@AssociationOverride(name = "id.channel", joinColumns = @JoinColumn(name = "chan_id"))
@AssociationOverrides({
@AssociationOverride(name = "id.channel", joinColumns = @JoinColumn(name = "chan_id", nullable = false)),
@AssociationOverride(name = "id.presenter", joinColumns = @JoinColumn(name = "presenter_name", nullable = false))})
public class TvMagazin {
@EmbeddedId
public TvMagazinPk id;

4
testsuite/src/test/java/org/hibernate/test/annotations/cid/TvMagazinPk.java
View File

@ -2,7 +2,9 @@
package org.hibernate.test.annotations.cid;
import java.io.Serializable;
import javax.persistence.Embeddable;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
/**
@ -11,8 +13,10 @@ import javax.persistence.ManyToOne;
@Embeddable
public class TvMagazinPk implements Serializable {
@ManyToOne
@JoinColumn(nullable=false)
public Channel channel;
@ManyToOne
@JoinColumn(nullable=false)
public Presenter presenter;
}

7
testsuite/src/test/java/org/hibernate/test/annotations/cid/TvProgram.java
View File

@ -2,9 +2,13 @@
package org.hibernate.test.annotations.cid;
import java.util.Date;
import javax.persistence.AssociationOverride;
import javax.persistence.AssociationOverrides;
import javax.persistence.Column;
import javax.persistence.EmbeddedId;
import javax.persistence.Entity;
import javax.persistence.JoinColumn;
import javax.persistence.PrimaryKeyJoinColumn;
import javax.persistence.SecondaryTable;
import javax.persistence.Temporal;
@ -18,6 +22,9 @@ import javax.persistence.TemporalType;
@PrimaryKeyJoinColumn( name = "CHANNEL_ID" ),
@PrimaryKeyJoinColumn( name = "PRESENTER_NAME" )
} )
@AssociationOverrides({
@AssociationOverride(name = "id.channel", joinColumns = @JoinColumn(name = "chan_id", nullable = false)),
@AssociationOverride(name = "id.presenter", joinColumns = @JoinColumn(name = "presenter_name", nullable = false))})
public class TvProgram {
@EmbeddedId
public TvMagazinPk id;

3
testsuite/src/test/java/org/hibernate/test/annotations/cid/TvProgramIdClass.java
View File

@ -6,6 +6,7 @@ import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.IdClass;
import javax.persistence.JoinColumn;
import javax.persistence.PrimaryKeyJoinColumn;
import javax.persistence.SecondaryTable;
import javax.persistence.Temporal;
@ -20,8 +21,10 @@ import javax.persistence.TemporalType;
@IdClass( TvMagazinPk.class )
public class TvProgramIdClass {
@Id
@JoinColumn(nullable=false)
public Channel channel;
@Id
@JoinColumn(nullable=false)
public Presenter presenter;
@Temporal( TemporalType.TIME )

2
testsuite/src/test/java/org/hibernate/test/annotations/cid/keymanytoone/Key.java
View File

@ -26,6 +26,7 @@ package org.hibernate.test.annotations.cid.keymanytoone;
import java.io.Serializable;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
/**
* TODO : javadoc
@ -33,6 +34,7 @@ import javax.persistence.Id;
* @author Steve Ebersole
*/
@Entity
@Table(name="`key`")
public class Key implements Serializable {
@Id
private String id;

4
testsuite/src/test/java/org/hibernate/test/annotations/collectionelement/Boy.java
View File

@ -17,6 +17,7 @@ import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.MapKeyColumn;
import javax.persistence.OrderColumn;
import javax.persistence.Table;
@ -102,6 +103,7 @@ public class Boy {
}
@ElementCollection
@MapKeyColumn(nullable=false)
public Map<String, Integer> getScorePerPreferredName() {
return scorePerPreferredName;
}
@ -113,6 +115,7 @@ public class Boy {
@ElementCollection
@CollectionTable(name = "ScorePerNickName", joinColumns = @JoinColumn(name = "BoyId"))
@Column(name = "score", nullable = false)
@MapKeyColumn(nullable=false)
public Map<String, Integer> getScorePerNickName() {
return scorePerNickName;
}
@ -158,6 +161,7 @@ public class Boy {
@ElementCollection
@Enumerated(EnumType.STRING)
@MapKeyColumn(nullable=false)
public Map<String, FavoriteFood> getFavoriteFood() {
return foods;
}

2
testsuite/src/test/java/org/hibernate/test/annotations/collectionelement/Matrix.java
View File

@ -8,6 +8,7 @@ import javax.persistence.ElementCollection;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.MapKeyColumn;
import org.hibernate.annotations.MapKeyType;
import org.hibernate.annotations.Sort;
@ -27,6 +28,7 @@ public class Matrix {
@ElementCollection
@Sort(type = SortType.NATURAL)
@Type(type = "float")
@MapKeyColumn(nullable = false)
private SortedMap<Integer, Float> mvalues = new TreeMap<Integer, Float>();
public Integer getId() {

2
testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/a/Dependent.java
View File

@ -4,6 +4,7 @@ import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.IdClass;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import org.hibernate.annotations.Cascade;
@ -39,6 +40,7 @@ public class Dependent {
@Id
@ManyToOne( cascade = CascadeType.PERSIST )
@Cascade( org.hibernate.annotations.CascadeType.SAVE_UPDATE )
@JoinColumn(nullable=false)
public Employee getEmp() {
return emp;
}

1
testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/Dependent.java
View File

@ -17,6 +17,7 @@ public class Dependent {
//@JoinColumn(name="FK") // id attribute mapped by join column default
@MapsId("empPK") // maps empPK attribute of embedded id
@ManyToOne
@JoinColumn(nullable=false)
Employee emp;
}

2
testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/ExclusiveDependent.java
View File

@ -14,7 +14,7 @@ public class ExclusiveDependent {
@EmbeddedId
DependentId id;
@JoinColumn(name = "FK")
@JoinColumn(name = "FK", nullable = false)
// id attribute mapped by join column default
@MapsId("empPK")
// maps empPK attribute of embedded id

3
testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/Atmosphere.java
View File

@ -44,10 +44,12 @@ public class Atmosphere {
@MapKeyTemporal(TemporalType.DATE)
@ElementCollection
@MapKeyColumn(nullable=false)
public Map<Date, String> colorPerDate = new HashMap<Date,String>();
@ElementCollection
@MapKeyEnumerated(EnumType.STRING)
@MapKeyColumn(nullable=false)
public Map<Level, String> colorPerLevel = new HashMap<Level,String>();
@ManyToMany(cascade = CascadeType.ALL)
@ -71,6 +73,7 @@ public class Atmosphere {
@ManyToMany(cascade = CascadeType.ALL)
@MapKey
@JoinTable(name="Atm_Gas_DefLeg")
@MapKeyColumn(nullable=false)
public Map<String, Gas> gasesDefLeg = new HashMap<String, Gas>();
@ManyToMany(cascade = CascadeType.ALL)