Hibernate SVN: r19282 - annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2010-04-22 05:56:24 -0400 (Thu, 22 Apr 2010)
New Revision: 19282
Modified:
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/CompositeIdTest.java
Log:
JBPAPP-3223 HHH-3164 'id in ...' with EmbeddedId and criteria API
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/CompositeIdTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/CompositeIdTest.java 2010-04-22 09:48:57 UTC (rev 19281)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/CompositeIdTest.java 2010-04-22 09:56:24 UTC (rev 19282)
@@ -263,62 +263,62 @@
s.close();
}
- public void testQueryInAndComposite() {
-
- Session s = openSession( );
- Transaction transaction = s.beginTransaction();
-
- SomeEntity someEntity = new SomeEntity();
- someEntity.setId( new SomeEntityId( ) );
- someEntity.getId().setId( 1 );
- someEntity.getId().setVersion( 11 );
- someEntity.setProp( "aa" );
- s.persist( someEntity );
- someEntity = new SomeEntity();
- someEntity.setId( new SomeEntityId( ) );
- someEntity.getId().setId( 1 );
- someEntity.getId().setVersion( 12 );
- someEntity.setProp( "bb" );
- s.persist( someEntity );
- someEntity = new SomeEntity();
- someEntity.setId( new SomeEntityId( ) );
- someEntity.getId().setId( 10 );
- someEntity.getId().setVersion( 21 );
- someEntity.setProp( "cc1" );
- s.persist( someEntity );
- someEntity = new SomeEntity();
- someEntity.setId( new SomeEntityId( ) );
- someEntity.getId().setId( 10 );
- someEntity.getId().setVersion( 22 );
- someEntity.setProp( "cc2" );
- s.persist( someEntity );
- someEntity = new SomeEntity();
- someEntity.setId( new SomeEntityId( ) );
- someEntity.getId().setId( 10 );
- someEntity.getId().setVersion( 23 );
- someEntity.setProp( "cc3" );
- s.persist( someEntity );
-
- s.flush();
- //HHH-4907
- if ( Dialect.getDialect().supportsRowValueConstructorSyntaxInInList() ) {
-
- List ids = new ArrayList<SomeEntityId>( 2 );
- ids.add( new SomeEntityId( 1, 12 ) );
- ids.add( new SomeEntityId( 10, 23 ) );
-
- Criteria criteria = s.createCriteria( SomeEntity.class );
- Disjunction disjunction = Restrictions.disjunction();
-
- disjunction.add( Restrictions.in( "id", ids ) );
- criteria.add( disjunction );
-
- List list = criteria.list();
- assertEquals( 2, list.size() );
- }
- transaction.rollback();
- s.close();
- }
+// public void testQueryInAndComposite() {
+//
+// Session s = openSession( );
+// Transaction transaction = s.beginTransaction();
+//
+// SomeEntity someEntity = new SomeEntity();
+// someEntity.setId( new SomeEntityId( ) );
+// someEntity.getId().setId( 1 );
+// someEntity.getId().setVersion( 11 );
+// someEntity.setProp( "aa" );
+// s.persist( someEntity );
+// someEntity = new SomeEntity();
+// someEntity.setId( new SomeEntityId( ) );
+// someEntity.getId().setId( 1 );
+// someEntity.getId().setVersion( 12 );
+// someEntity.setProp( "bb" );
+// s.persist( someEntity );
+// someEntity = new SomeEntity();
+// someEntity.setId( new SomeEntityId( ) );
+// someEntity.getId().setId( 10 );
+// someEntity.getId().setVersion( 21 );
+// someEntity.setProp( "cc1" );
+// s.persist( someEntity );
+// someEntity = new SomeEntity();
+// someEntity.setId( new SomeEntityId( ) );
+// someEntity.getId().setId( 10 );
+// someEntity.getId().setVersion( 22 );
+// someEntity.setProp( "cc2" );
+// s.persist( someEntity );
+// someEntity = new SomeEntity();
+// someEntity.setId( new SomeEntityId( ) );
+// someEntity.getId().setId( 10 );
+// someEntity.getId().setVersion( 23 );
+// someEntity.setProp( "cc3" );
+// s.persist( someEntity );
+//
+// s.flush();
+// //HHH-4907
+// if ( Dialect.getDialect().supportsRowValueConstructorSyntaxInInList() ) {
+//
+// List ids = new ArrayList<SomeEntityId>( 2 );
+// ids.add( new SomeEntityId( 1, 12 ) );
+// ids.add( new SomeEntityId( 10, 23 ) );
+//
+// Criteria criteria = s.createCriteria( SomeEntity.class );
+// Disjunction disjunction = Restrictions.disjunction();
+//
+// disjunction.add( Restrictions.in( "id", ids ) );
+// criteria.add( disjunction );
+//
+// List list = criteria.list();
+// assertEquals( 2, list.size() );
+// }
+// transaction.rollback();
+// s.close();
+// }
protected Class[] getMappings() {
return new Class[] {
Parent.class,
14 years
Hibernate SVN: r19281 - in core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate: connection and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2010-04-22 05:48:57 -0400 (Thu, 22 Apr 2010)
New Revision: 19281
Modified:
core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/cfg/SettingsFactory.java
core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/connection/ConnectionProviderFactory.java
Log:
JBPAPP-2440 Exceptions due to missing non-supported connection and cache providers are not meaningful
Modified: core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/cfg/SettingsFactory.java
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/cfg/SettingsFactory.java 2010-04-22 09:40:04 UTC (rev 19280)
+++ core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/cfg/SettingsFactory.java 2010-04-22 09:48:57 UTC (rev 19281)
@@ -374,8 +374,13 @@
try {
return (CacheProvider) ReflectHelper.classForName(cacheClassName).newInstance();
}
- catch (Exception cnfe) {
- throw new HibernateException("could not instantiate CacheProvider: " + cacheClassName, cnfe);
+ catch ( Throwable cnfe ) {
+ String msg = "Could not instantiate cache provider: "
+ + cacheClassName
+ + "\nUnsupported cache provider implemention is not included our Product."
+ + "\nThis error may be caused by the configured cache provider was not found in the classpath."
+ + "\nPlease check the cache configuration and make sure the provider is in the classpath.";
+ throw new HibernateException( msg, cnfe );
}
}
Modified: core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/connection/ConnectionProviderFactory.java
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/connection/ConnectionProviderFactory.java 2010-04-22 09:40:04 UTC (rev 19280)
+++ core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/connection/ConnectionProviderFactory.java 2010-04-22 09:48:57 UTC (rev 19281)
@@ -121,7 +121,21 @@
throw new HibernateException("Unable to inject objects into the conenction provider", e);
}
}
- connections.configure(properties);
+ try {
+ connections.configure( properties );
+ } catch ( Throwable e ) {
+ if ( providerClass != null ) {
+ String msg = "Could not instantiate connection provider: "
+ + providerClass
+ + "\nUnsupported connection provider implemention is not included our Product."
+ + "\nThis error may be caused by the configured connection provider was not found in the classpath."
+ + "\nPlease check the connection configuration and make sure the provider is in the classpath.";
+ log.error( msg, e );
+ throw new HibernateException( msg );
+ }else{
+ throw new HibernateException( e );
+ }
+ }
return connections;
}
14 years
Hibernate SVN: r19280 - in core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate: connection and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2010-04-22 05:40:04 -0400 (Thu, 22 Apr 2010)
New Revision: 19280
Modified:
core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/bridge/RegionFactoryCacheProviderBridge.java
core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/connection/ConnectionProviderFactory.java
Log:
JBPAPP-2440 Exceptions due to missing non-supported connection and cache providers are not meaningful
Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/bridge/RegionFactoryCacheProviderBridge.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/bridge/RegionFactoryCacheProviderBridge.java 2010-04-22 08:29:46 UTC (rev 19279)
+++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/bridge/RegionFactoryCacheProviderBridge.java 2010-04-22 09:40:04 UTC (rev 19280)
@@ -62,8 +62,13 @@
try {
cacheProvider = ( CacheProvider ) ReflectHelper.classForName( providerClassName ).newInstance();
}
- catch ( Exception cnfe ) {
- throw new CacheException( "could not instantiate CacheProvider [" + providerClassName + "]", cnfe );
+ catch ( Throwable cnfe ) {
+ String msg = "Could not instantiate cache provider: "
+ + providerClassName
+ + "\nUnsupported cache provider implemention is not included our Product."
+ + "\nThis error may be caused by the configured cache provider was not found in the classpath."
+ + "\nPlease check the cache configuration and make sure the provider is in the classpath.";
+ throw new CacheException( msg, cnfe );
}
}
Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/connection/ConnectionProviderFactory.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/connection/ConnectionProviderFactory.java 2010-04-22 08:29:46 UTC (rev 19279)
+++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/connection/ConnectionProviderFactory.java 2010-04-22 09:40:04 UTC (rev 19280)
@@ -134,7 +134,21 @@
throw new HibernateException("Unable to inject objects into the conenction provider", e);
}
}
- connections.configure(properties);
+ try {
+ connections.configure( properties );
+ } catch ( Throwable e ) {
+ if ( providerClass != null ) {
+ String msg = "Could not instantiate connection provider: "
+ + providerClass
+ + "\nUnsupported connection provider implemention is not included our Product."
+ + "\nThis error may be caused by the configured connection provider was not found in the classpath."
+ + "\nPlease check the connection configuration and make sure the provider is in the classpath.";
+ log.error( msg, e );
+ throw new HibernateException( msg );
+ }else{
+ throw new HibernateException( e );
+ }
+ }
return connections;
}
14 years
Hibernate SVN: r19279 - in search/trunk/hibernate-search/src: main/java/org/hibernate/search/query/dsl/v2/impl and 1 other directories.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2010-04-22 04:29:46 -0400 (Thu, 22 Apr 2010)
New Revision: 19279
Modified:
search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/TermMatchingContext.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedTermMatchingContext.java
search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/query/dsl/DSLTest.java
Log:
HSEARCH-508 use matching() instead of matches() to eliminate the singular / plural issue
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/TermMatchingContext.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/TermMatchingContext.java 2010-04-22 07:15:28 UTC (rev 19278)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/TermMatchingContext.java 2010-04-22 08:29:46 UTC (rev 19279)
@@ -7,7 +7,7 @@
/**
* text searched in the term query (the term is pre-analyzer unless ignoreAnalyzer is called)
*/
- TermTermination matches(String text);
+ TermTermination matching(String text);
/**
* field / property the term query is executed on
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedTermMatchingContext.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedTermMatchingContext.java 2010-04-22 07:15:28 UTC (rev 19278)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedTermMatchingContext.java 2010-04-22 08:29:46 UTC (rev 19279)
@@ -44,7 +44,7 @@
}
}
- public TermTermination matches(String text) {
+ public TermTermination matching(String text) {
return new ConnectedMultiFieldsTermQueryBuilder( queryContext, text, fieldContexts, queryCustomizer, queryAnalyzer, factory);
}
Modified: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/query/dsl/DSLTest.java
===================================================================
--- search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/query/dsl/DSLTest.java 2010-04-22 07:15:28 UTC (rev 19278)
+++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/query/dsl/DSLTest.java 2010-04-22 08:29:46 UTC (rev 19279)
@@ -34,31 +34,31 @@
.buildQueryBuilder().forEntity( Month.class ).get();
Query
//regular term query
- query = monthQb.exact().onField( "mythology" ).matches( "cold" ).createQuery();
+ query = monthQb.exact().onField( "mythology" ).matching( "cold" ).createQuery();
assertEquals( 0, fts.createFullTextQuery( query, Month.class ).getResultSize() );
//term query based on several words
- query = monthQb.exact().onField( "mythology" ).matches( "colder darker" ).createQuery();
+ query = monthQb.exact().onField( "mythology" ).matching( "colder darker" ).createQuery();
assertEquals( 1, fts.createFullTextQuery( query, Month.class ).getResultSize() );
//term query applying the analyzer and generating one term per word
- query = monthQb.exact().onField( "mythology_stem" ).matches( "snowboard" ).createQuery();
+ query = monthQb.exact().onField( "mythology_stem" ).matching( "snowboard" ).createQuery();
assertEquals( 1, fts.createFullTextQuery( query, Month.class ).getResultSize() );
//term query applying the analyzer and generating several terms per word
- query = monthQb.exact().onField( "mythology_ngram" ).matches( "snobored" ).createQuery();
+ query = monthQb.exact().onField( "mythology_ngram" ).matching( "snobored" ).createQuery();
assertEquals( 1, fts.createFullTextQuery( query, Month.class ).getResultSize() );
//term query not using analyzers
- query = monthQb.exact().onField( "mythology" ).ignoreAnalyzer().matches( "Month" ).createQuery();
+ query = monthQb.exact().onField( "mythology" ).ignoreAnalyzer().matching( "Month" ).createQuery();
assertEquals( 0, fts.createFullTextQuery( query, Month.class ).getResultSize() );
- query = monthQb.exact().onField( "mythology" ).matches( "Month" ).createQuery();
+ query = monthQb.exact().onField( "mythology" ).matching( "Month" ).createQuery();
transaction.commit();
@@ -79,7 +79,7 @@
.threshold( .8f )
.prefixLength( 1 )
.onField( "mythology" )
- .matches( "calder" )
+ .matching( "calder" )
.createQuery();
assertEquals( 1, fts.createFullTextQuery( query, Month.class ).getResultSize() );
@@ -88,7 +88,7 @@
query = monthQb
.wildcard()
.onField( "mythology" )
- .matches( "mon*" )
+ .matching( "mon*" )
.createQuery();
assertEquals( 2, fts.createFullTextQuery( query, Month.class ).getResultSize() );
@@ -109,8 +109,8 @@
//combined query, January and february both contain whitening but February in a longer text
query = monthQb
.bool()
- .should( monthQb.exact().onField( "mythology" ).matches( "whitening" ).createQuery() )
- .should( monthQb.exact().onField( "history" ).matches( "whitening" ).createQuery() )
+ .should( monthQb.exact().onField( "mythology" ).matching( "whitening" ).createQuery() )
+ .should( monthQb.exact().onField( "history" ).matching( "whitening" ).createQuery() )
.createQuery();
List<Month> results = fts.createFullTextQuery( query, Month.class ).list();
@@ -121,8 +121,8 @@
//since history is boosted, February should come first though
query = monthQb
.bool()
- .should( monthQb.exact().onField( "mythology" ).matches( "whitening" ).createQuery() )
- .should( monthQb.exact().onField( "history" ).boostedTo( 30 ).matches( "whitening" ).createQuery() )
+ .should( monthQb.exact().onField( "mythology" ).matching( "whitening" ).createQuery() )
+ .should( monthQb.exact().onField( "history" ).boostedTo( 30 ).matching( "whitening" ).createQuery() )
.createQuery();
results = fts.createFullTextQuery( query, Month.class ).list();
@@ -148,7 +148,7 @@
query = monthQb.exact()
.onField( "mythology" )
.andField( "history" )
- .matches( "whitening" ).createQuery();
+ .matching( "whitening" ).createQuery();
List<Month> results = fts.createFullTextQuery( query, Month.class ).list();
assertEquals( 2, results.size() );
@@ -158,7 +158,7 @@
query = monthQb.exact()
.onFields( "mythology", "history" )
.boostedTo( 30 )
- .matches( "whitening" ).createQuery();
+ .matching( "whitening" ).createQuery();
results = fts.createFullTextQuery( query, Month.class ).list();
assertEquals( 2, results.size() );
@@ -170,7 +170,7 @@
.onField( "mythology" )
.andField( "history" )
.boostedTo( 30 )
- .matches( "whitening" )
+ .matching( "whitening" )
.createQuery();
results = fts.createFullTextQuery( query, Month.class ).list();
@@ -195,7 +195,7 @@
//must
query = monthQb
.bool()
- .must( monthQb.exact().onField( "mythology" ).matches( "colder" ).createQuery() )
+ .must( monthQb.exact().onField( "mythology" ).matching( "colder" ).createQuery() )
.createQuery();
List<Month> results = fts.createFullTextQuery( query, Month.class ).list();
@@ -206,7 +206,7 @@
query = monthQb
.bool()
.should( monthQb.all().createQuery() )
- .must( monthQb.exact().onField( "mythology" ).matches( "colder" ).createQuery() )
+ .must( monthQb.exact().onField( "mythology" ).matching( "colder" ).createQuery() )
.not()
.createQuery();
results = fts.createFullTextQuery( query, Month.class ).list();
@@ -216,7 +216,7 @@
//implicit must not + all (not recommended)
query = monthQb
.bool()
- .must( monthQb.exact().onField( "mythology" ).matches( "colder" ).createQuery() )
+ .must( monthQb.exact().onField( "mythology" ).matching( "colder" ).createQuery() )
.not()
.createQuery();
results = fts.createFullTextQuery( query, Month.class ).list();
@@ -226,7 +226,7 @@
//all except (recommended)
query = monthQb
.all()
- .except( monthQb.exact().onField( "mythology" ).matches( "colder" ).createQuery() )
+ .except( monthQb.exact().onField( "mythology" ).matching( "colder" ).createQuery() )
.createQuery();
results = fts.createFullTextQuery( query, Month.class ).list();
14 years
Hibernate SVN: r19278 - in annotations/branches/v3_3_1_GA_CP/src: test/org/hibernate/test/annotations/join and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2010-04-22 03:15:28 -0400 (Thu, 22 Apr 2010)
New Revision: 19278
Added:
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/join/SysGroupsOrm.java
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/join/SysUserOrm.java
Modified:
annotations/branches/v3_3_1_GA_CP/src/java/org/hibernate/cfg/annotations/TableBinder.java
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/join/JoinTest.java
Log:
JBPAPP-4088 HHH-5103 -- Specifying the referencedColumnName in a @JoinColumn with backtics like uid fails
Modified: annotations/branches/v3_3_1_GA_CP/src/java/org/hibernate/cfg/annotations/TableBinder.java
===================================================================
--- annotations/branches/v3_3_1_GA_CP/src/java/org/hibernate/cfg/annotations/TableBinder.java 2010-04-22 06:56:38 UTC (rev 19277)
+++ annotations/branches/v3_3_1_GA_CP/src/java/org/hibernate/cfg/annotations/TableBinder.java 2010-04-22 07:15:28 UTC (rev 19278)
@@ -302,7 +302,7 @@
for (Ejb3JoinColumn joinCol : columns) {
String referencedColumn = joinCol.getReferencedColumn();
referencedColumn = mappings.getPhysicalColumnName( referencedColumn, table );
- if ( referencedColumn.equals( col.getName() ) ) {
+ if ( referencedColumn.equals( col.getQuotedName() ) ) {
//proper join column
if ( joinCol.isNameDeferred() ) {
joinCol.linkValueUsingDefaultColumnNaming(
Modified: annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/join/JoinTest.java
===================================================================
--- annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/join/JoinTest.java 2010-04-22 06:56:38 UTC (rev 19277)
+++ annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/join/JoinTest.java 2010-04-22 07:15:28 UTC (rev 19278)
@@ -1,6 +1,7 @@
//$Id$
package org.hibernate.test.annotations.join;
+import java.util.ArrayList;
import java.util.Date;
import org.hibernate.Criteria;
@@ -118,7 +119,18 @@
tx.commit();
s.close();
}
-
+ public void testReferenceColumnWithBacktics() throws Exception {
+ Session s=openSession();
+ s.beginTransaction();
+ SysGroupsOrm g=new SysGroupsOrm();
+ SysUserOrm u=new SysUserOrm();
+ u.setGroups( new ArrayList<SysGroupsOrm>() );
+ u.getGroups().add( g );
+ s.save( g );
+ s.save( u );
+ s.getTransaction().commit();
+ s.close();
+ }
public void testUniqueConstaintOnSecondaryTable() throws Exception {
Cat cat = new Cat();
cat.setStoryPart2( "My long story" );
@@ -204,7 +216,9 @@
Dog.class,
A.class,
B.class,
- C.class
+ C.class,
+ SysGroupsOrm.class,
+ SysUserOrm.class
};
}
}
Added: annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/join/SysGroupsOrm.java
===================================================================
--- annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/join/SysGroupsOrm.java (rev 0)
+++ annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/join/SysGroupsOrm.java 2010-04-22 07:15:28 UTC (rev 19278)
@@ -0,0 +1,27 @@
+package org.hibernate.test.annotations.join;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table( name = "SYS_GROUPS" )
+public class SysGroupsOrm {
+
+ private long groupId;
+
+ @Id
+ @GeneratedValue
+ @Column( name = "GROUPID" )
+ public long getGroupId() {
+ return groupId;
+ }
+
+ public void setGroupId( long groupId ) {
+ this.groupId = groupId;
+ }
+
+}
\ No newline at end of file
Added: annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/join/SysUserOrm.java
===================================================================
--- annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/join/SysUserOrm.java (rev 0)
+++ annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/join/SysUserOrm.java 2010-04-22 07:15:28 UTC (rev 19278)
@@ -0,0 +1,46 @@
+package org.hibernate.test.annotations.join;
+
+import java.util.Collection;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToMany;
+import javax.persistence.Table;
+
+@Entity( name = "sys_user" )
+@Table( name = "SYS_USER" )
+public class SysUserOrm {
+
+ private long userid;
+
+ private Collection<SysGroupsOrm> groups;
+
+ @Id
+ @GeneratedValue
+ @Column( name = "`auid`" )
+ public long getUserid() {
+ return userid;
+ }
+
+ public void setUserid( long userid ) {
+ this.userid = userid;
+ }
+
+ @ManyToMany( fetch = FetchType.LAZY )
+ @JoinTable( name = "SYS_GROUPS_USERS",
+ joinColumns = @JoinColumn( name = "USERID", referencedColumnName = "`auid`" ),
+ inverseJoinColumns = @JoinColumn( name = "GROUPID", referencedColumnName = "GROUPID" ) )
+ public Collection<SysGroupsOrm> getGroups() {
+ return groups;
+ }
+
+ public void setGroups( Collection<SysGroupsOrm> groups ) {
+ this.groups = groups;
+ }
+}
14 years
Hibernate SVN: r19277 - in annotations/branches/v3_4_0_GA_CP/src: test/java/org/hibernate/test/annotations/join and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2010-04-22 02:56:38 -0400 (Thu, 22 Apr 2010)
New Revision: 19277
Added:
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/SysGroupsOrm.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/SysUserOrm.java
Modified:
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/TableBinder.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/JoinTest.java
Log:
JBPAPP-4088 HHH-5103 -- Specifying the referencedColumnName in a @JoinColumn with backtics like uid fails
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/TableBinder.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/TableBinder.java 2010-04-22 04:35:00 UTC (rev 19276)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/TableBinder.java 2010-04-22 06:56:38 UTC (rev 19277)
@@ -298,7 +298,7 @@
for (Ejb3JoinColumn joinCol : columns) {
String referencedColumn = joinCol.getReferencedColumn();
referencedColumn = mappings.getPhysicalColumnName( referencedColumn, table );
- if ( referencedColumn.equals( col.getName() ) ) {
+ if ( referencedColumn.equals( col.getQuotedName() ) ) {
//proper join column
if ( joinCol.isNameDeferred() ) {
joinCol.linkValueUsingDefaultColumnNaming(
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/JoinTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/JoinTest.java 2010-04-22 04:35:00 UTC (rev 19276)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/JoinTest.java 2010-04-22 06:56:38 UTC (rev 19277)
@@ -1,6 +1,7 @@
//$Id$
package org.hibernate.test.annotations.join;
+import java.util.ArrayList;
import java.util.Date;
import org.hibernate.Criteria;
@@ -114,7 +115,18 @@
tx.commit();
s.close();
}
-
+ public void testReferenceColumnWithBacktics() throws Exception {
+ Session s=openSession();
+ s.beginTransaction();
+ SysGroupsOrm g=new SysGroupsOrm();
+ SysUserOrm u=new SysUserOrm();
+ u.setGroups( new ArrayList<SysGroupsOrm>() );
+ u.getGroups().add( g );
+ s.save( g );
+ s.save( u );
+ s.getTransaction().commit();
+ s.close();
+ }
public void testUniqueConstaintOnSecondaryTable() throws Exception {
Cat cat = new Cat();
cat.setStoryPart2( "My long story" );
@@ -200,7 +212,9 @@
Dog.class,
A.class,
B.class,
- C.class
+ C.class,
+ SysGroupsOrm.class,
+ SysUserOrm.class
};
}
}
Added: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/SysGroupsOrm.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/SysGroupsOrm.java (rev 0)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/SysGroupsOrm.java 2010-04-22 06:56:38 UTC (rev 19277)
@@ -0,0 +1,27 @@
+package org.hibernate.test.annotations.join;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table( name = "SYS_GROUPS" )
+public class SysGroupsOrm {
+
+ private long groupId;
+
+ @Id
+ @GeneratedValue
+ @Column( name = "GROUPID" )
+ public long getGroupId() {
+ return groupId;
+ }
+
+ public void setGroupId( long groupId ) {
+ this.groupId = groupId;
+ }
+
+}
\ No newline at end of file
Added: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/SysUserOrm.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/SysUserOrm.java (rev 0)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/SysUserOrm.java 2010-04-22 06:56:38 UTC (rev 19277)
@@ -0,0 +1,46 @@
+package org.hibernate.test.annotations.join;
+
+import java.util.Collection;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToMany;
+import javax.persistence.Table;
+
+@Entity( name = "sys_user" )
+@Table( name = "SYS_USER" )
+public class SysUserOrm {
+
+ private long userid;
+
+ private Collection<SysGroupsOrm> groups;
+
+ @Id
+ @GeneratedValue
+ @Column( name = "`auid`" )
+ public long getUserid() {
+ return userid;
+ }
+
+ public void setUserid( long userid ) {
+ this.userid = userid;
+ }
+
+ @ManyToMany( fetch = FetchType.LAZY )
+ @JoinTable( name = "SYS_GROUPS_USERS",
+ joinColumns = @JoinColumn( name = "USERID", referencedColumnName = "`auid`" ),
+ inverseJoinColumns = @JoinColumn( name = "GROUPID", referencedColumnName = "GROUPID" ) )
+ public Collection<SysGroupsOrm> getGroups() {
+ return groups;
+ }
+
+ public void setGroups( Collection<SysGroupsOrm> groups ) {
+ this.groups = groups;
+ }
+}
14 years
Hibernate SVN: r19276 - core/trunk/parent.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2010-04-22 00:35:00 -0400 (Thu, 22 Apr 2010)
New Revision: 19276
Modified:
core/trunk/parent/pom.xml
Log:
HHH-5145 Update pom to use the new distributationManagement information
Modified: core/trunk/parent/pom.xml
===================================================================
--- core/trunk/parent/pom.xml 2010-04-22 04:32:52 UTC (rev 19275)
+++ core/trunk/parent/pom.xml 2010-04-22 04:35:00 UTC (rev 19276)
@@ -544,16 +544,14 @@
<distributionManagement>
<repository>
- <!-- Copy the dist to the local checkout of the JBoss maven2 repo ${maven.repository.root} -->
- <!-- It is anticipated that ${maven.repository.root} be set in user's settings.xml -->
- <!-- todo : replace this with direct svn access once the svnkit providers are available -->
- <id>repository.jboss.org</id>
- <url>file://${maven.repository.root}</url>
+ <id>jboss-releases-repository</id>
+ <name>JBoss Releases Repository</name>
+ <url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/</url>
</repository>
<snapshotRepository>
- <id>snapshots.jboss.org</id>
+ <id>jboss-snapshots-repositor</id>
<name>JBoss Snapshot Repository</name>
- <url>dav:https://snapshots.jboss.org/maven2</url>
+ <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
</snapshotRepository>
</distributionManagement>
14 years
Hibernate SVN: r19275 - core/trunk/parent.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2010-04-22 00:32:52 -0400 (Thu, 22 Apr 2010)
New Revision: 19275
Modified:
core/trunk/parent/pom.xml
Log:
HHH-5144 Dont restrict on jdk5 in hibernate core development
Modified: core/trunk/parent/pom.xml
===================================================================
--- core/trunk/parent/pom.xml 2010-04-22 04:19:45 UTC (rev 19274)
+++ core/trunk/parent/pom.xml 2010-04-22 04:32:52 UTC (rev 19275)
@@ -117,6 +117,28 @@
<artifactId>maven-jdocbook-style-plugin</artifactId>
<extensions>true</extensions>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.groovy.maven</groupId>
+ <artifactId>gmaven-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <phase>deploy</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <source><![CDATA[
+ def javaVersion=System.getProperty("java.version")
+ if(!javaVersion.startsWith("1.5")){
+ fail("Please using JDK5 to do Hibernate release!")
+ }
+ ]]>
+ </source>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
@@ -132,7 +154,7 @@
<rules>
<requireJavaVersion>
<!-- require JDK 1.5 to run the build -->
- <version>[1.5,1.6)</version>
+ <version>[1.5,)</version>
</requireJavaVersion>
<requireMavenVersion>
<!-- we need at least Maven 2.0.8 because of a bug fix affecting our antlr usage -->
14 years
Hibernate SVN: r19274 - in core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/test: unionsubclass/alias and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2010-04-22 00:19:45 -0400 (Thu, 22 Apr 2010)
New Revision: 19274
Modified:
core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/test/AllTests.java
core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/test/unionsubclass/alias/SellCarTest.java
Log:
JBPAPP-4115 Add test related to JBPAPP-3487 in AllTests
Modified: core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/test/AllTests.java
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/test/AllTests.java 2010-04-22 02:11:55 UTC (rev 19273)
+++ core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/test/AllTests.java 2010-04-22 04:19:45 UTC (rev 19274)
@@ -130,6 +130,7 @@
import org.hibernate.test.unconstrained.UnconstrainedTest;
import org.hibernate.test.unidir.BackrefTest;
import org.hibernate.test.unionsubclass.UnionSubclassTest;
+import org.hibernate.test.unionsubclass.alias.SellCarTest;
import org.hibernate.test.usercollection.UserCollectionTypeSuite;
import org.hibernate.test.util.UtilSuite;
import org.hibernate.test.version.VersionTest;
@@ -317,6 +318,7 @@
suite.addTest( ReattachmentSuite.suite() );
suite.addTest( MigrationTest.suite() );
suite.addTest( BatchedManyToManyTest.suite() );
+ suite.addTest( SellCarTest.suite() );
return suite;
}
Modified: core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/test/unionsubclass/alias/SellCarTest.java
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/test/unionsubclass/alias/SellCarTest.java 2010-04-22 02:11:55 UTC (rev 19273)
+++ core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/test/unionsubclass/alias/SellCarTest.java 2010-04-22 04:19:45 UTC (rev 19274)
@@ -23,10 +23,13 @@
*/
package org.hibernate.test.unionsubclass.alias;
+import junit.framework.Test;
+
import org.hibernate.Query;
import org.hibernate.Session;
import org.hibernate.Transaction;
import org.hibernate.junit.functional.FunctionalTestCase;
+import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
/**
* http://opensource.atlassian.com/projects/hibernate/browse/HHH-4825
@@ -37,7 +40,9 @@
public SellCarTest( String string ) {
super( string );
}
-
+ public static Test suite() {
+ return new FunctionalTestClassTestSuite( SellCarTest.class );
+ }
public String[] getMappings() {
return new String[] { "unionsubclass/alias/mapping.hbm.xml" };
}
14 years
Hibernate SVN: r19273 - core/branches/Branch_3_5/parent.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2010-04-21 22:11:55 -0400 (Wed, 21 Apr 2010)
New Revision: 19273
Modified:
core/branches/Branch_3_5/parent/pom.xml
Log:
HHH-5145 Update pom to use the new distributationManagement information
Modified: core/branches/Branch_3_5/parent/pom.xml
===================================================================
--- core/branches/Branch_3_5/parent/pom.xml 2010-04-22 02:05:29 UTC (rev 19272)
+++ core/branches/Branch_3_5/parent/pom.xml 2010-04-22 02:11:55 UTC (rev 19273)
@@ -544,16 +544,14 @@
<distributionManagement>
<repository>
- <!-- Copy the dist to the local checkout of the JBoss maven2 repo ${maven.repository.root} -->
- <!-- It is anticipated that ${maven.repository.root} be set in user's settings.xml -->
- <!-- todo : replace this with direct svn access once the svnkit providers are available -->
- <id>repository.jboss.org</id>
- <url>file://${maven.repository.root}</url>
+ <id>jboss-releases-repository</id>
+ <name>JBoss Releases Repository</name>
+ <url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/</url>
</repository>
<snapshotRepository>
- <id>snapshots.jboss.org</id>
+ <id>jboss-snapshots-repositor</id>
<name>JBoss Snapshot Repository</name>
- <url>dav:https://snapshots.jboss.org/maven2</url>
+ <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
</snapshotRepository>
</distributionManagement>
14 years