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

4644 Commits

Author SHA1 Message Date
Brett Meyer 04c08cb9fd HHH-8790 add "escape" keyword to Template 2013-12-17 10:09:36 -05:00
Brett Meyer d436b98557 HHH-8655 Classloader conflicts with embedded OSGi frameworks 
Conflicts:
	hibernate-osgi/src/main/java/org/hibernate/osgi/OsgiClassLoader.java
 2013-12-16 14:12:49 -05:00
Steve Ebersole e99f889bfd HHH-6911 - Write DiscriminatorValue to DiscriminatorColumn when combined 
with InheritanceType#JOINED

Conflicts:
	hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java
 2013-12-16 12:36:38 -05:00
Steve Ebersole d847a171eb HHH-6911 - Write DiscriminatorValue to DiscriminatorColumn when combined 
with InheritanceType#JOINED

Conflicts:
	hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java
 2013-12-16 12:34:55 -05:00
Steve Ebersole b01abeadef HHH-6911 - Write DiscriminatorValue to DiscriminatorColumn when combined 
with InheritanceType#JOINED

Conflicts:
	hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java
	hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java
 2013-12-16 12:33:51 -05:00
Brett Meyer 323cc9d0b0 HHH-3541 minor xml tag correction in docs 2013-12-12 14:14:48 -05:00
Brett Meyer cac31981f0 HHH-7630 allow joined subclass ordering to explicitly reference natural 2013-12-11 14:01:49 -05:00
Brett Meyer a317dfd526 HHH-8765 corrected hbm2ddl for turkish locale 
Conflicts:
	hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/TableMetadata.java
 2013-12-10 21:17:37 -05:00
Brett Meyer 4207017198 HHH-3604 whoops 2013-12-09 18:45:52 -05:00
Brett Meyer 97c7a18193 HHH-3604 add MySQL engine to table generators 
Conflicts:
	hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java
 2013-12-09 18:10:26 -05:00
Brett Meyer 7bb9fc1e82 Revert "HHH-8783 use JPA @JoinColumn(@ForeignKey(name=...)) for constraint name" 
This reverts commit cd83193875.
 2013-12-09 17:42:34 -05:00
Brett Meyer cd83193875 HHH-8783 use JPA @JoinColumn(@ForeignKey(name=...)) for constraint name 
Conflicts:
	hibernate-core/src/main/java/org/hibernate/cfg/AnnotationBinder.java
 2013-12-09 15:16:37 -05:00
Brett Meyer 0257bb497e HHH-8779 corrected bundle symbolic name 2013-12-09 11:01:39 -05:00
Brett Meyer 7ac0ad0537 HHH-4638 add Firebird to StandardDialectResolver 
Conflicts:
	hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/StandardDialectResolver.java
 2013-12-04 15:38:39 -05:00
Brett Meyer 80d5647343 4.2.8.Final post-release 2013-12-04 12:07:42 -05:00
Brett Meyer dc4ea7cb75 4.2.8.Final release 2013-12-04 11:14:29 -05:00
Lukasz Antoniak c76859709a HHH-8701 - Fix JPQL TYPE operator test 
Conflicts:
	hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/query/QueryTest.java
 2013-12-02 12:56:15 -05:00
Brett Meyer 2e14dc0ea9 HHH-5065 improved exception message on Configuration#getRootClassMapping 2013-11-27 21:20:50 -05:00
Brett Meyer a9afc4040d HHH-8749 Error flushing with a many-to-many Map defined with 
unique="true" and cascading orphan delete
 2013-11-27 18:06:27 -05:00
Brett Meyer e38cb21ef2 HHH-8748 replace Javassist's ProxyObject with Proxy 
Conflicts:
	hibernate-core/src/main/java/org/hibernate/bytecode/internal/javassist/ProxyFactoryFactoryImpl.java
	hibernate-core/src/main/java/org/hibernate/proxy/pojo/javassist/JavassistLazyInitializer.java
 2013-11-26 13:59:03 -05:00
Brett Meyer 50a73150da HHH-8734 upgraded gradle-jdocbook 2013-11-25 13:53:52 -05:00
Brett Meyer b0d95ce9ca HHH-8341 JtaTransaction logs excessive HHH000426 warning 
Conflicts:
	hibernate-entitymanager/src/main/java/org/hibernate/jpa/spi/AbstractEntityManagerImpl.java
 2013-11-25 13:41:47 -05:00
Brett Meyer 90bb7c8ddb HHH-8738 NPE in HibernateUtil if no default ehcache configuration 
Conflicts:
	hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/internal/util/HibernateEhcacheUtils.java
 2013-11-22 14:21:48 -05:00
Brett Meyer 492ea5d2a5 HHH-8354 added new dirty-checking options to newly cherry-picked plugins 2013-11-21 15:35:24 -05:00
Jeremy Whiting a0e242992b HHH-8337 Added Maven plugin to enhance Entities during build time. 
Conflicts:
	settings.gradle

Conflicts:
	libraries.gradle
 2013-11-21 15:21:20 -05:00
Jeremy Whiting a862f4f0cf HHH-8306 Changed dependencies to use root project libraries configuration. Renamed the gradle build file to conform to project standard for a module. Fixed findbugs reported issues. Removed unnecessary classes and instead use an anonymous class. 2013-11-21 15:21:14 -05:00
Jeremy Whiting c2ca2193c9 HHH-8306 Added Gradle plugin to provide build time support for enhancing entity objects. 2013-11-21 15:21:03 -05:00
Brett Meyer 0accd089bd HHH-8734 upgraded gradle-jdocbook 2013-11-21 14:55:22 -05:00
Brett Meyer ce7598f452 HHH-8734 Update to Gradle 1.9 2013-11-21 14:51:33 -05:00
Brett Meyer 2290f3e088 HHH-8689 regression test 2013-11-21 11:36:17 -05:00
Martin Simka 7706402213 [HHH-8707] Add support for oracle12c, postgresql92, postgresplus92, db2-10, mssql2012 to DatabaseAllocator 2013-11-19 18:12:51 -05:00
Steve Ebersole 5ac6e5b0f6 HHH-8709 - SynchronizationCallbackCoordinator is calling 
Thread.currentThread way too often

Conflicts:
	hibernate-core/src/main/java/org/hibernate/engine/transaction/synchronization/internal/SynchronizationCallbackCoordinatorNonTrackingImpl.java
	hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java
 2013-11-19 17:57:22 -05:00
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