Commit Graph

4857 Commits

Author SHA1 Message Date
Benjamin Tegarden 3d2d9bfd4f HHH-8404: Correctly render 'ListIndexExpression'
Conflicts:
	hibernate-entitymanager/src/main/java/org/hibernate/jpa/criteria/expression/ListIndexExpression.java
2014-01-20 17:37:40 -05:00
Brett Meyer c574fe0b17 HHH-8863 correct StatisticalLoggingSessionEventListener partial flush
timing
2014-01-14 14:36:54 -05:00
Brett Meyer de91d9b2ca HHH-5289 remove unnecessary security checks in property accessors
Conflicts:
	hibernate-core/src/main/java/org/hibernate/internal/util/ReflectHelper.java
	hibernate-entitymanager/src/main/java/org/hibernate/jpa/event/internal/jpa/CallbackProcessorImpl.java
	hibernate-entitymanager/src/main/java/org/hibernate/jpa/event/internal/jpa/LegacyCallbackProcessor.java
	hibernate-entitymanager/src/main/java/org/hibernate/jpa/internal/metamodel/MetadataContext.java
2014-01-10 16:05:22 -05:00
Brett Meyer 4a57b45958 HHH-2188 Query metadata gives NPE for polymorphic queries
Conflicts:
	hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java
2014-01-10 14:14:17 -05:00
Brett Meyer 24c951a3d1 HHH-8638 global quoting breaks UC on FK 2014-01-10 13:11:15 -05:00
Brett Meyer d437f0d9b4 HHH-8831 changed exception type, formatting 2014-01-09 13:18:46 -05:00
Christian Beikov 3159f04681 HHH-8831 improved exception message
When having @JoinColumn in a @CollectionTable that do not point to valid columns, the message can be really confusing. These new lines will actually enrich the exception which is thrown that the problem appeared on a specific property of a specific class.

Please include this, since it is not always clear what the actual problem is with a mapping when an exception occurs.
2014-01-09 13:18:44 -05:00
Lukasz Antoniak 1f2e4f2d0a HHH-8699 - Multiselect with boolean predicate
Conflicts:
	hibernate-core/src/main/antlr/hql-sql.g
	hibernate-core/src/main/antlr/sql-gen.g
	hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/QueryBuilderTest.java
	hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/metamodel/Customer.java
2014-01-08 18:00:51 -05:00
Brett Meyer 4cccaa5d31 HHH-3453 updated list of Dialects in docs 2014-01-06 19:12:47 -05:00
Brett Meyer 3c673e573c HHH-3051 corrected CustomLoader returnTypes (different approach)
Conflicts:
	hibernate-core/src/main/java/org/hibernate/loader/Loader.java
	hibernate-core/src/main/java/org/hibernate/loader/custom/CustomLoader.java
2014-01-06 14:12:45 -05:00
Brett Meyer af1536e9dd HHH-8790 added @Filter deduceAliasInjectionPoints info and examples to
user guide
2014-01-02 17:44:28 -05:00
Brett Meyer 7200540651 HHH-3051 corrected Loader returnTypes
Conflicts:
	hibernate-core/src/main/java/org/hibernate/loader/Loader.java
2014-01-02 15:14:59 -05:00
Brett Meyer 7b19ea2c88 HHH-2298 WARN if using build-in conn pool 2013-12-17 14:29:08 -05:00
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