Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,573 Commits 28 Branches 362 Tags 358 MiB
Commit Graph

4573 Commits

Author SHA1 Message Date
Juergen Zimmermann 3d932aeb33 HHH-8032 OptimisticLockException with message of the wrapped 
StaleObjectStateException

Conflicts:
	hibernate-entitymanager/src/main/java/org/hibernate/jpa/spi/AbstractEntityManagerImpl.java
 2013-10-15 14:41:34 -04:00
Brett Meyer f7b80fb28c HHH-6859 correct AbstractEntityManagerImpl#determineCacheStoreMode 
Conflicts:
	hibernate-entitymanager/src/main/java/org/hibernate/jpa/spi/AbstractEntityManagerImpl.java
 2013-10-14 13:36:21 -04:00
Brett Meyer d5411ed3a7 HHH-8463 upgrade to javassist 3.18.1-GA 2013-10-14 11:21:24 -04:00
Brett Meyer a1dfe69917 HHH-8605 supportsTuplesInSubqueries false in sqlserver/sybase 2013-10-14 10:29:18 -04:00
Brett Meyer 527bca144f HHH-6484 remove orphaned one-to-one when association replaced while 
managed

Conflicts:
	hibernate-core/src/main/java/org/hibernate/action/internal/EntityDeleteAction.java
	hibernate-core/src/main/java/org/hibernate/engine/internal/Cascade.java
	hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java
	hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/bidirectional/DeleteOneToOneOrphansTest.java
	hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/composite/DeleteOneToOneOrphansTest.java
	hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/reversed/bidirectional/DeleteOneToOneOrphansTest.java
	hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/reversed/unidirectional/DeleteOneToOneOrphansTest.java
 2013-10-11 15:30:01 -04:00
Lukasz Antoniak 7d455272ba HHH-8567 - Query identifier properties 2013-10-11 16:24:21 +02:00
Brett Meyer c7dbdf9fd5 HHH-7130 cleanup 2013-10-09 11:38:58 -04:00
Zbyněk Roubalík aec877adb7 HHH-7130 Query cache eviction logging 2013-10-09 11:38:56 -04:00
Brett Meyer e588d2cd6d HHH-8328 Typo in Query.list Javadoc 
Conflicts:
	hibernate-core/src/main/java/org/hibernate/Query.java
 2013-10-08 14:19:37 -04:00
Brett Meyer 1ec00e6199 HHH-7513 check for natural id resolution in NaturalIdCacheKey 
Conflicts:
	hibernate-core/src/main/java/org/hibernate/cache/spi/NaturalIdCacheKey.java
 2013-10-07 17:52:32 -04:00
Brett Meyer a6b5b7f9b9 HHH-7513 test cleanup 2013-10-07 17:51:33 -04:00
Guenther Demetz a7f70a41fd HHH-7513 testcase 2013-10-07 17:51:30 -04:00
Brett Meyer a8393f6490 HHH-6255 correctly handling quoting fk names 
Conflicts:
	hibernate-core/src/main/java/org/hibernate/mapping/ForeignKey.java
 2013-10-07 15:16:45 -04:00
Brett Meyer bc99f16b8e HHH-8580 clearing a map collection caused NPE 2013-10-04 11:50:20 -04:00
Brett Meyer 8d9c594f5f HHH-3812 minor fix in envers docs 2013-10-02 15:54:01 -04:00
Brett Meyer b25b2cbc43 HHH-4118 warn if hibernate.hbm2ddl.auto has unrecognized value 2013-10-02 15:46:32 -04:00
Brett Meyer 13ea5a5d32 HHH-5744 check ResultSet#hasNext in GUIDGenerator 2013-10-02 13:46:03 -04:00
Brett Meyer 5d9162dc3d HHH-5818 exception message typo 2013-10-02 12:58:03 -04:00
Brett Meyer f2120010ac HHH-6576 NPE in Ehcache HibernateEhcacheUtils 
Conflicts:
	hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/internal/util/HibernateEhcacheUtils.java
 2013-10-02 10:03:38 -04:00
Brett Meyer e3419f6d72 HHH-8578 correct DeleteExecutor's use of where-clause 2013-09-30 16:45:39 -04:00
Brett Meyer d42f66dfd1 HHH-8537 @UniqueConstraint naming non-existent column leads to NPE 
Conflicts:
	hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/UniqueConstraintTest.java
 2013-09-27 16:28:55 -04:00
Brett Meyer 1a3be54c85 HHH-7984 Handle Oracle statements on release 2013-09-25 22:31:55 -04:00
Brett Meyer ac55afbd65 HHH-8551 Cannot use with-clause on the RHS of a join 
Conflicts:
	hibernate-core/src/main/java/org/hibernate/engine/internal/JoinSequence.java
	hibernate-core/src/main/java/org/hibernate/hql/internal/ast/HqlSqlWalker.java
 2013-09-25 16:26:47 -04:00
Brett Meyer 17384d6d02 4.2.6.Final post release 2013-09-25 14:46:30 -04:00
Brett Meyer c31d9d3213 HHH-8502 synchronize AuditConfiguration#destroy 2013-09-25 14:21:15 -04:00
Brett Meyer 3be247023b 4.2.6.Final release 2013-09-25 13:57:45 -04:00
Brett Meyer c2ea55b0bd HHH-8553 hibernate-osgi needs to support alternative locations for 
hibernate.cfg.xml
Conflicts:
	documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/features.xml
	documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/features.xml
	documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/features.xml
	hibernate-osgi/src/main/java/org/hibernate/osgi/OsgiSessionFactoryService.java
 2013-09-25 00:05:29 -04:00
Brett Meyer 8b406db4a9 HHH-8503 whoops 2013-09-24 22:31:36 -04:00
Brett Meyer 61e3940057 HHH-8503 invoke determineDialect instead of constructDialect when 
hibernate.dialect is blank
 2013-09-24 22:05:48 -04:00
Brett Meyer d8b58cef67 HHH-8476 Bulk delete doesn't cascade delete on join table 2013-09-24 17:43:52 -04:00
Brett Meyer 24a36b9cbb HHH-8517 strip time from Date descriptors 
Conflicts:
	hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarTimeTypeDescriptor.java
 2013-09-19 15:22:14 -04:00
Brett Meyer 1d53ebb120 HHH-8522 CompositeIdTypeBindingTest.testCompositeTypeBinding fails on 
sybase157
 2013-09-19 12:43:38 -04:00
Lukasz Antoniak 9e3e86388b HHH-8432 - Expanding parameters in IN clause 2013-09-18 17:20:43 -04:00
Brett Meyer 0f1e971e62 HHH-8516 EnumeratedTypeTest.testTrimmedEnum fails on oracle 2013-09-18 11:11:53 -04:00
Steve Ebersole 4cf2005ed5 HHH-8502 - EnversIntegrator#disintegrate needs to check config for null 
Conflicts:
	hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversIntegrator.java
 2013-09-17 18:51:51 -04:00
Brett Meyer 5da80756fe HHH-8363 SessionFactoryServiceRegistryImpl should not call 
parent#destroy, test failures, formatting

Conflicts:
	hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/internal/ClassLoaderServiceImpl.java
	hibernate-core/src/main/java/org/hibernate/boot/registry/internal/StandardServiceRegistryImpl.java
	hibernate-core/src/test/java/org/hibernate/test/service/ClassLoaderServiceImplTest.java
	hibernate-envers/src/main/java/org/hibernate/envers/configuration/spi/AuditConfiguration.java
 2013-09-17 18:50:59 -04:00
Tomaz Cerar 2ce3aa1f09 HHH-8363 Some more mem leak fixes 
Conflicts:
	hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/internal/ClassLoaderServiceImpl.java
	hibernate-envers/src/main/java/org/hibernate/envers/configuration/spi/AuditConfiguration.java
	hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversIntegrator.java
 2013-09-17 18:46:59 -04:00
Brett Meyer a89e88fa18 HHH-8363 destroy the parent ServiceRegistry and stop its provided 
Conflicts:
	hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/internal/ClassLoaderServiceImpl.java
	hibernate-core/src/main/java/org/hibernate/boot/registry/internal/BootstrapServiceRegistryImpl.java
	hibernate-core/src/test/java/org/hibernate/test/service/ClassLoaderServiceImplTest.java
 2013-09-17 18:40:20 -04:00
Brett Meyer db6841e5b4 HHH-8363 cleanup and formatting 
Conflicts:
	hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/internal/ClassLoaderServiceImpl.java
 2013-09-17 18:34:44 -04:00
Tomaz Cerar b09466f1db HHH-8363 ClassLoaderServiceImpl should be defined as Stoppable 
- also fix problem with JpaIntegrator holding references to beanmanager

Conflicts:
	hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/internal/ClassLoaderServiceImpl.java
	hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/spi/ClassLoaderService.java
	hibernate-entitymanager/src/main/java/org/hibernate/jpa/event/spi/JpaIntegrator.java
 2013-09-17 18:33:01 -04:00
Brett Meyer d8cb021e3d HHH-1835 added stddev to MySQLDialect 
Conflicts:
	hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java
 2013-09-17 16:30:28 -04:00
Brett Meyer 67ddd01002 HHH-8504 add MySQL5Dialect to StandardDatabaseInfoDialectResolver 
Conflicts:
	hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/StandardDatabaseInfoDialectResolver.java
 2013-09-17 16:23:12 -04:00
Arlo Louis O'Keeffe 121346c86c HHH-8500 Interbase does not have a boolean type 2013-09-12 13:17:27 -04:00
Brett Meyer 845c367d50 HHH-8496 TableCatalog and TableSchema arguments mistaken in DB update-script. 2013-09-12 10:44:05 -04:00
Brett Meyer 82aef14e07 HHH-8491 formatting and improved readability 2013-09-11 15:47:28 -04:00
Christian Beikov 97854f154a HHH-8491 Improved implementation for locale string parsing 
Conflicts:
	hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LocaleTypeDescriptor.java
 2013-09-11 15:47:24 -04:00
minman 795886245d HHH-8472 @Lob annotation applies to both key and value of Map 
Conflicts:
	hibernate-core/src/main/java/org/hibernate/cfg/annotations/SimpleValueBinder.java
 2013-09-11 14:44:09 -04:00
java4dev@ 9bdf729968 HHH-8297 Typo in error message: "contains phyical column name" 2013-09-11 14:39:47 -04:00
Lukasz Antoniak 063d88013a HHH-5845 - Collection proxy of deleted state 2013-09-11 04:24:17 +02:00
Brett Meyer ca4aeb53f0 HHH-8153 Criteria on Enum mapping defined in hbm.xml fails. 2013-09-09 14:59:27 -04:00