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

HHH-8175 Test fixes for postgresplus92

This commit is contained in:
Brett Meyer 2013-04-11 12:40:14 -04:00
parent 35bd192556
commit d39272a280
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/Frame.java
View File

@ -2,10 +2,12 @@
package org.hibernate.test.annotations.manytoone; package org.hibernate.test.annotations.manytoone;
import java.io.Serializable; import java.io.Serializable;
import java.util.Set; import java.util.Set;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.GeneratedValue; import javax.persistence.GeneratedValue;
import javax.persistence.Id; import javax.persistence.Id;
import javax.persistence.OneToMany; import javax.persistence.OneToMany;
import javax.persistence.Table;
import org.hibernate.annotations.Formula; import org.hibernate.annotations.Formula;
@ -13,6 +15,8 @@ import org.hibernate.annotations.Formula;
* @author Emmanuel Bernard * @author Emmanuel Bernard
*/ */
@Entity @Entity
// "frame" is reserved in postgresplus
@Table(name = "FrameTable")
public class Frame implements Serializable { public class Frame implements Serializable {
@Id @Id
@GeneratedValue @GeneratedValue

18
hibernate-core/src/test/java/org/hibernate/test/hql/FunctionNameAsColumnTest.java
View File

@ -23,9 +23,11 @@
*/ */
package org.hibernate.test.hql; package org.hibernate.test.hql;
import java.util.List; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.Test; import java.util.List;
import org.hibernate.FetchMode; import org.hibernate.FetchMode;
import org.hibernate.Hibernate; import org.hibernate.Hibernate;
@ -34,22 +36,24 @@ import org.hibernate.Transaction;
import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment; import org.hibernate.cfg.Environment;
import org.hibernate.criterion.Restrictions; import org.hibernate.criterion.Restrictions;
import org.hibernate.dialect.PostgresPlusDialect;
import org.hibernate.dialect.SybaseASE15Dialect; import org.hibernate.dialect.SybaseASE15Dialect;
import org.hibernate.dialect.function.SQLFunction; import org.hibernate.dialect.function.SQLFunction;
import org.hibernate.testing.SkipForDialect; import org.hibernate.testing.SkipForDialect;
import org.hibernate.testing.SkipForDialects;
import org.hibernate.testing.SkipLog; import org.hibernate.testing.SkipLog;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
/** /**
* Tests HQL and Criteria queries using DB columns having the same name as registered functions. * Tests HQL and Criteria queries using DB columns having the same name as registered functions.
* *
* @author Gail Badner * @author Gail Badner
*/ */
@SkipForDialect( value = SybaseASE15Dialect.class, jiraKey = "HHH-6426") @SkipForDialects({
@SkipForDialect( value = SybaseASE15Dialect.class, jiraKey = "HHH-6426"),
@SkipForDialect( value = PostgresPlusDialect.class, comment = "Almost all of the tests result in 'ambiguous column' errors.")
})
public class FunctionNameAsColumnTest extends BaseCoreFunctionalTestCase { public class FunctionNameAsColumnTest extends BaseCoreFunctionalTestCase {
@Override @Override
public String[] getMappings() { public String[] getMappings() {