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

4612 Commits

Author SHA1 Message Date
Brett Meyer 40a58173ad HHH-8721 CoreMessageLogger conflicts 2013-11-19 17:28:35 -05:00
Brett Meyer 328564e038 HHH-8686 FumTest hangs on mysql55 2013-11-18 18:34:42 -05:00
Sanne Grinovero f96eabc08e HHH-8703 Remove need to support EntityKey de-serialization without having access to a SessionFactory 
(cherry picked from commit 9a3b1417c6)

Conflicts:

	hibernate-core/src/main/java/org/hibernate/persister/entity/EntityPersister.java
 2013-11-18 09:41:50 -06:00
Steve Ebersole cfefabcd39 HHH-8703 - Remove NonFlushedChanges api 
(cherry picked from commit d6fa2b2864)

Conflicts:

	hibernate-core/src/main/java/org/hibernate/engine/spi/NonFlushedChanges.java
	hibernate-core/src/main/java/org/hibernate/internal/NonFlushedChangesImpl.java
	hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/CreateTest.java
	hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/MergeTest.java
	hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/SaveOrUpdateTest.java
 2013-11-18 09:40:23 -06:00
Steve Ebersole 531e5d428a HHH-8704 - ManyToOneType#scheduleBatchLoadIfNeeded creates EntityKey instances even if absolutely not necessary 
(cherry picked from commit 7f82763843)
 2013-11-16 14:09:52 -06:00
Sanne Grinovero bf26311474 HHH-8682 org.hibernate.engine.spi.EntityKey consumes a lot of memory 
(cherry picked from commit 2235c43eaae36cc02f51276b69bd258d4ee17174)

Conflicts:

	hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java
	hibernate-core/src/main/java/org/hibernate/engine/spi/EntityKey.java
	hibernate-core/src/main/java/org/hibernate/persister/entity/EntityPersister.java
 2013-11-16 13:54:08 -06:00
Steve Ebersole 8ad5ddeebf HHH-8680 Relax synchronized block in TableGenerator#generate 2013-11-16 13:49:48 -06:00
Steve Ebersole 47114c35b2 HHH-8698 ColumnNameCache wraps and unwraps int to Integer multiple times 2013-11-16 13:49:29 -06:00
Sanne Grinovero 71d5a746e3 HHH-8679 Relax synchronized block in Loader#wrapResultSetIfEnabled 
(cherry picked from commit 8a0cf23f1f8a09dcec0c500f1504c33975f15ba4)
 2013-11-16 13:47:50 -06:00
Sanne Grinovero 687b7718d9 HHH-8698 ColumnNameCache wraps and unwraps int to Integer multiple times 
(cherry picked from commit a0c0ea5361007c21563f5c5ca69489943eb62037)

Conflicts:

	hibernate-core/src/main/java/org/hibernate/engine/jdbc/ColumnNameCache.java
	hibernate-core/src/main/java/org/hibernate/engine/jdbc/ResultSetWrapperProxy.java
 2013-11-16 13:47:32 -06:00
Sanne Grinovero 1fd8f420e4 HHH-8680 Relax synchronized block in TableGenerator#generate 
(cherry picked from commit adbd987fff7bb3a00a5b407741fd8a4270763f19)

Conflicts:

	hibernate-core/src/main/java/org/hibernate/id/enhanced/NoopOptimizer.java
 2013-11-16 13:43:14 -06:00
Sanne Grinovero 184c257f1d HHH-8681 NonNullableTransientDependencies should initialize identityMap lazily 
(cherry picked from commit 46ed0bd7108c233e4e39e5ed884719be13a37704)

Conflicts:

	hibernate-core/src/main/java/org/hibernate/engine/internal/NonNullableTransientDependencies.java
 2013-11-16 13:38:04 -06:00
Sanne Grinovero c668d29257 Whitespace and style fixes (only) 
(cherry picked from commit 0ba7c607780f5b48fc8958cabd1105e235c3dd61)

Conflicts:

	hibernate-core/src/main/java/org/hibernate/loader/Loader.java
	hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
 2013-11-16 13:35:49 -06:00
Steve Ebersole 4605941df1 HHH-8654 - Ability to get notified of interesting Session events 
(cherry picked from commit 449c558365)

Conflicts:

	hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java
 2013-11-15 15:03:26 -06:00
Steve Ebersole 50870c742f HHH-8654 - Ability to get notified of interesting Session events 
(cherry picked from commit 1e74abf511)

Conflicts:

	hibernate-core/src/main/java/org/hibernate/cfg/SettingsFactory.java
	hibernate-core/src/main/java/org/hibernate/engine/spi/SessionDelegatorBaseImpl.java
	hibernate-core/src/main/java/org/hibernate/engine/spi/SessionImplementor.java
	hibernate-core/src/main/java/org/hibernate/internal/AbstractSessionImpl.java
	hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java
	hibernate-core/src/test/resources/log4j.properties
 2013-11-15 14:55:19 -06:00
Steve Ebersole 2d911d215b HHH-8654 - Ability to get noitified of interesting Session events 
(cherry picked from commit f073b979d4)

Conflicts:

	hibernate-core/src/main/java/org/hibernate/action/internal/EntityInsertAction.java
	hibernate-core/src/main/java/org/hibernate/action/internal/EntityUpdateAction.java
	hibernate-core/src/main/java/org/hibernate/cache/internal/StandardQueryCache.java
	hibernate-core/src/main/java/org/hibernate/cache/spi/UpdateTimestampsCache.java
	hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java
	hibernate-core/src/main/java/org/hibernate/cfg/Settings.java
	hibernate-core/src/main/java/org/hibernate/cfg/SettingsFactory.java
	hibernate-core/src/main/java/org/hibernate/engine/internal/TwoPhaseLoad.java
	hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/AbstractBatchImpl.java
	hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/ResultSetReturnImpl.java
	hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/StatementPreparerImpl.java
	hibernate-core/src/main/java/org/hibernate/engine/loading/internal/CollectionLoadContext.java
	hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java
	hibernate-core/src/main/java/org/hibernate/engine/spi/SessionDelegatorBaseImpl.java
	hibernate-core/src/main/java/org/hibernate/engine/spi/SessionImplementor.java
	hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java
	hibernate-core/src/main/java/org/hibernate/id/enhanced/TableStructure.java
	hibernate-core/src/main/java/org/hibernate/internal/AbstractSessionImpl.java
	hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java
	hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java
	hibernate-core/src/test/resources/hibernate.properties
	hibernate-core/src/test/resources/log4j.properties
 2013-11-15 14:09:15 -06:00
Lukasz Antoniak 0fab6a4226 HHH-8497 - Fix and test 2013-11-06 21:31:30 +01:00
Strong Liu fb6d83b828 HHH-8671 WithClauseTest.testWithClause fails on all QA databases 2013-11-06 10:56:10 +08:00
Brett Meyer 93c558046d HHH-6004 improved HashMap performance in StructuredCacheEntry 
Conflicts:
	hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredCacheEntry.java
 2013-10-31 08:42:24 -04:00
Brett Meyer 350171c8ba HHH-7927 Enabling globally_quoted_identifiers breaks schema validation 
if TableGenerator is used
Conflicts:
	hibernate-core/src/test/java/org/hibernate/test/quote/QuoteGlobalTest.java
 2013-10-31 07:04:52 -04:00
Brett Meyer c38533c4ae HHH-6167 correct Ejb3Column.checkPropertyConsistency error message 2013-10-31 05:22:16 -04:00
Steve Ebersole 4b543dc552 HHH-8647 - hibernate.cache.use_reference_entries + queries 
Conflicts:
	hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/ejb3configuration/PersisterClassProviderTest.java
 2013-10-29 06:13:25 -04:00
Brett Meyer 70b9644ca4 HHH-8528 correct docs and quickstarts to support stopping/restarting a 
client bundle

Conflicts:
	documentation/src/main/docbook/devguide/en-US/chapters/osgi/OSGi.xml
	documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/DataPointServiceImpl.java
 2013-10-28 14:34:15 -04:00
Brett Meyer cd55718f71 HHH-8643 corrected TemporalType parameter validation 2013-10-28 07:06:11 -04:00
Brett Meyer 4fad9a4a8f HHH-8643 test case 2013-10-28 06:38:32 -04:00
Brett Meyer 1c43f6f5d3 4.2.7.SP1 post release 2013-10-23 13:37:05 -04:00
Brett Meyer 4fae265451 4.2.7.SP1 release 2013-10-23 13:19:58 -04:00
Brett Meyer e203259041 HHH-8617 correcting test failure 2013-10-23 13:17:13 -04:00
Brett Meyer 60075ce1d5 HHH-8617 Revert "HHH-8517 strip time from Date descriptors" 
This reverts commit 24a36b9cbb.
 2013-10-23 12:54:52 -04:00
Brett Meyer 3fbb7d3c82 4.2.7.Final post-release 2013-10-23 11:31:58 -04:00
Brett Meyer b4d9441ff5 4.2.7.Final release 2013-10-23 11:06:22 -04:00
Brett Meyer e356b77df0 HHH-8579 corrected test case 2013-10-22 22:29:55 -04:00
Brett Meyer d3b7b9b717 HHH-8633 register synch in OsgiJtaPlatform 
Conflicts:
	hibernate-osgi/src/main/java/org/hibernate/osgi/OsgiJtaPlatform.java
 2013-10-22 22:13:16 -04:00
Brett Meyer a97d8318d7 HHH-8579 force english locale for query alias generation 2013-10-22 17:05:18 -04:00
Ståle W. Pedersen 32a5633b35 HHH-8354 - New dirty-checking options based on bytecode enhancement 
Conflicts:
	hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/Enhancer.java
	hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/EnhancerConstants.java
	hibernate-core/src/test/java/org/hibernate/test/cfg/persister/GoofyPersisterClassProvider.java
	hibernate-core/src/test/java/org/hibernate/test/legacy/CustomPersister.java
	hibernate-gradle-plugin/src/main/groovy/org/hibernate/tooling/gradle/EnhancerTask.groovy
	hibernate-maven-plugin/src/main/java/org/hibernate/bytecode/enhance/plugins/HibernateEnhancementMojo.java
 2013-10-17 18:21:29 -04:00
Brett Meyer 851bdbbcc3 HHH-8573 refactored test case 2013-10-16 17:22:35 -04:00
Vasily Kochnev c926fdba03 HHH-8573: Persister is taken according to the actual type of the replaced object 2013-10-16 17:22:31 -04:00
Vasily Kochnev 1cc69b382c HHH-8573: Test case illustrating creation of a superclass instance when 
subclass instance needed
 2013-10-16 17:22:30 -04:00
Brett Meyer 1b441f7720 HHH-8612 correct FumTest's use of Date in a composite PK 2013-10-16 14:35:57 -04:00
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