Hibernate SVN: r15697 - core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/id.
by hibernate-commits@lists.jboss.org
Author: cbredesen
Date: 2008-12-15 12:21:10 -0500 (Mon, 15 Dec 2008)
New Revision: 15697
Modified:
core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/id/IdentityGenerator.java
Log:
JBPAPP-1496 backported
Modified: core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/id/IdentityGenerator.java
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/id/IdentityGenerator.java 2008-12-15 10:46:00 UTC (rev 15696)
+++ core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/id/IdentityGenerator.java 2008-12-15 17:21:10 UTC (rev 15697)
@@ -71,10 +71,19 @@
public Serializable executeAndExtract(PreparedStatement insert) throws SQLException {
insert.executeUpdate();
- return IdentifierGeneratorFactory.getGeneratedIdentity(
- GetGeneratedKeysHelper.getGeneratedKey( insert ),
- persister.getIdentifierType()
- );
+ ResultSet rs = null;
+ try {
+ rs = GetGeneratedKeysHelper.getGeneratedKey( insert );
+ return IdentifierGeneratorFactory.getGeneratedIdentity(
+ rs,
+ persister.getIdentifierType()
+ );
+ }
+ finally {
+ if ( rs != null ) {
+ rs.close();
+ }
+ }
}
}
17 years, 4 months
Hibernate SVN: r15696 - core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test.
by hibernate-commits@lists.jboss.org
Author: jcosta(a)redhat.com
Date: 2008-12-15 05:46:00 -0500 (Mon, 15 Dec 2008)
New Revision: 15696
Modified:
core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/QueryTest.java
Log:
EJB-404 - Changing the order of the predicates in testIsNull. Now it pleases PostgreSQL as well
Modified: core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/QueryTest.java
===================================================================
--- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/QueryTest.java 2008-12-15 10:39:34 UTC (rev 15695)
+++ core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/QueryTest.java 2008-12-15 10:46:00 UTC (rev 15696)
@@ -305,7 +305,7 @@
em.flush();
em.clear();
Query q = em.createQuery(
- "select i from Item i where (i.descr is null and :descr is null) or i.descr = :descr"
+ "select i from Item i where i.descr = :descr or (i.descr is null and :descr is null)"
);
//Query q = em.createQuery( "select i from Item i where (i.descr is null and :descr is null) or (i.descr = :descr");
q.setParameter( "descr", "dd" );
17 years, 4 months
Hibernate SVN: r15695 - core/branches/Branch_3_3/testsuite/src/test/java/org/hibernate/test/collection/backref/map/compkey.
by hibernate-commits@lists.jboss.org
Author: jcosta(a)redhat.com
Date: 2008-12-15 05:39:34 -0500 (Mon, 15 Dec 2008)
New Revision: 15695
Modified:
core/branches/Branch_3_3/testsuite/src/test/java/org/hibernate/test/collection/backref/map/compkey/Mappings.hbm.xml
Log:
HHH-3639 - Column 'role' becomes 'roles_', because 'role' is a reserved keyword in Sybase
Modified: core/branches/Branch_3_3/testsuite/src/test/java/org/hibernate/test/collection/backref/map/compkey/Mappings.hbm.xml
===================================================================
--- core/branches/Branch_3_3/testsuite/src/test/java/org/hibernate/test/collection/backref/map/compkey/Mappings.hbm.xml 2008-12-15 09:53:53 UTC (rev 15694)
+++ core/branches/Branch_3_3/testsuite/src/test/java/org/hibernate/test/collection/backref/map/compkey/Mappings.hbm.xml 2008-12-15 10:39:34 UTC (rev 15695)
@@ -31,7 +31,7 @@
<map name="parts" table="Parts" cascade="all,delete-orphan" fetch="join">
<key column="productName" not-null="true"/>
<composite-map-key class="MapKey">
- <key-property name="role"/>
+ <key-property name="role" column="role_"/>
</composite-map-key>
<one-to-many class="Part"/>
</map>
17 years, 4 months
Hibernate SVN: r15694 - in validator/trunk/validation-api/src/main/java/javax/validation: spi and 1 other directory.
by hibernate-commits@lists.jboss.org
Author: epbernard
Date: 2008-12-15 04:53:53 -0500 (Mon, 15 Dec 2008)
New Revision: 15694
Modified:
validator/trunk/validation-api/src/main/java/javax/validation/Constraint.java
validator/trunk/validation-api/src/main/java/javax/validation/ConstraintViolation.java
validator/trunk/validation-api/src/main/java/javax/validation/Validation.java
validator/trunk/validation-api/src/main/java/javax/validation/spi/ValidationProvider.java
Log:
Reformating
Modified: validator/trunk/validation-api/src/main/java/javax/validation/Constraint.java
===================================================================
--- validator/trunk/validation-api/src/main/java/javax/validation/Constraint.java 2008-12-13 16:25:05 UTC (rev 15693)
+++ validator/trunk/validation-api/src/main/java/javax/validation/Constraint.java 2008-12-15 09:53:53 UTC (rev 15694)
@@ -30,7 +30,8 @@
* Validator parameters for a given constraint definition
* Annotations parameters are passed as key/value into parameters
* <p/>
- * This method is guaranteed to be called before any of the other Constraint implementation methods
+ * This method is guaranteed to be called before any of the other Constraint
+ * implementation methods
*
* @param constraintAnnotation parameters for a given constraint definition
*/
Modified: validator/trunk/validation-api/src/main/java/javax/validation/ConstraintViolation.java
===================================================================
--- validator/trunk/validation-api/src/main/java/javax/validation/ConstraintViolation.java 2008-12-13 16:25:05 UTC (rev 15693)
+++ validator/trunk/validation-api/src/main/java/javax/validation/ConstraintViolation.java 2008-12-15 09:53:53 UTC (rev 15694)
@@ -24,7 +24,8 @@
* well as the message describing the violation.
*
* @author Emmanuel Bernard
- * @todo the rational behind rootBean and propertyPath is to keep the context available to the user
+ * @todo the rational behind rootBean and propertyPath is to keep the context
+ * available to the user
*/
public interface ConstraintViolation<T> {
Modified: validator/trunk/validation-api/src/main/java/javax/validation/Validation.java
===================================================================
--- validator/trunk/validation-api/src/main/java/javax/validation/Validation.java 2008-12-13 16:25:05 UTC (rev 15693)
+++ validator/trunk/validation-api/src/main/java/javax/validation/Validation.java 2008-12-15 09:53:53 UTC (rev 15694)
@@ -131,12 +131,14 @@
* Used by applications targeting a specific provider programmatically.
* <p/>
* <pre>
- * ACMEValidatorFactoryBuilder builder = Validation.builderType(ACMEValidatorFactoryBuilder.class)
- * .providerResolver( new MyResolverStrategy() )
- * .build();
+ * ACMEValidatorFactoryBuilder builder =
+ * Validation.builderType(ACMEValidatorFactoryBuilder.class)
+ * .providerResolver( new MyResolverStrategy() )
+ * .build();
* </pre>,
- * where <code>ACMEValidatorFactoryBuilder</code> is the <code>ValidatorFactoryBuilder</code>
- * sub interface uniquely identifying the ACME Bean Validation provider.
+ * where <code>ACMEValidatorFactoryBuilder</code> is the
+ * <code>ValidatorFactoryBuilder</code> sub interface uniquely identifying the
+ * ACME Bean Validation provider.
*
* @param builderType the <code>ValidatorFactoryBuilder</code> sub interface
* uniquely defining the targeted provider.
Modified: validator/trunk/validation-api/src/main/java/javax/validation/spi/ValidationProvider.java
===================================================================
--- validator/trunk/validation-api/src/main/java/javax/validation/spi/ValidationProvider.java 2008-12-13 16:25:05 UTC (rev 15693)
+++ validator/trunk/validation-api/src/main/java/javax/validation/spi/ValidationProvider.java 2008-12-15 09:53:53 UTC (rev 15694)
@@ -35,8 +35,8 @@
*
* @param builderClass targeted builder class.
*
- * @return <code>true</code> if <code>builderClass</code> is the Bean Validation Provider sub
- * interface for ValidatorFactoryBuilder
+ * @return <code>true</code> if <code>builderClass</code> is the Bean Validation Provider
+ * sub-interface for ValidatorFactoryBuilder
*/
boolean isSuitable(Class<? extends ValidatorFactoryBuilder<?>> builderClass);
17 years, 4 months