c404d84149
HHH-8864 count distinct tuples for postgres and h2
...
Conflicts:
hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQL81Dialect.java
hibernate-core/src/main/java/org/hibernate/dialect/function/StandardAnsiSqlAggregationFunctions.java
2014-01-22 15:51:55 -05:00
3d7494d8de
HHH-2988 test case
...
Conflicts:
hibernate-core/src/test/java/org/hibernate/test/quote/QuoteTest.java
2014-01-20 20:04:58 -05:00
10bf926de8
HHH-2988 Update UnionSubclassEntityPersister column quoting
2014-01-20 20:03:06 -05:00
c574fe0b17
HHH-8863 correct StatisticalLoggingSessionEventListener partial flush
...
timing
2014-01-14 14:36:54 -05:00
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
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
24c951a3d1
HHH-8638 global quoting breaks UC on FK
2014-01-10 13:11:15 -05:00
d437f0d9b4
HHH-8831 changed exception type, formatting
2014-01-09 13:18:46 -05:00
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
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
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
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
7b19ea2c88
HHH-2298 WARN if using build-in conn pool
2013-12-17 14:29:08 -05:00
04c08cb9fd
HHH-8790 add "escape" keyword to Template
2013-12-17 10:09:36 -05:00
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
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
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
cac31981f0
HHH-7630 allow joined subclass ordering to explicitly reference natural
2013-12-11 14:01:49 -05:00
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
4207017198
HHH-3604 whoops
2013-12-09 18:45:52 -05:00
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
7bb9fc1e82
Revert "HHH-8783 use JPA @JoinColumn(@ForeignKey(name=...)) for constraint name"
...
This reverts commit cd83193875
2013-12-09 17:42:34 -05:00
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
0257bb497e
HHH-8779 corrected bundle symbolic name
2013-12-09 11:01:39 -05:00
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
2e14dc0ea9
HHH-5065 improved exception message on Configuration#getRootClassMapping
2013-11-27 21:20:50 -05:00
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
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
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
2290f3e088
HHH-8689 regression test
2013-11-21 11:36:17 -05:00
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
40a58173ad
HHH-8721 CoreMessageLogger conflicts
2013-11-19 17:28:35 -05:00
328564e038
HHH-8686 FumTest hangs on mysql55
2013-11-18 18:34:42 -05:00
f96eabc08e
HHH-8703 Remove need to support EntityKey de-serialization without having access to a SessionFactory
...
(cherry picked from commit 9a3b1417c6
2013-11-18 09:41:50 -06:00
cfefabcd39
HHH-8703 - Remove NonFlushedChanges api
...
(cherry picked from commit d6fa2b2864
2013-11-18 09:40:23 -06:00
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
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
8ad5ddeebf
HHH-8680 Relax synchronized block in TableGenerator#generate
2013-11-16 13:49:48 -06:00
47114c35b2
HHH-8698 ColumnNameCache wraps and unwraps int to Integer multiple times
2013-11-16 13:49:29 -06:00
71d5a746e3
HHH-8679 Relax synchronized block in Loader#wrapResultSetIfEnabled
...
(cherry picked from commit 8a0cf23f1f8a09dcec0c500f1504c33975f15ba4)
2013-11-16 13:47:50 -06:00
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
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
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
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
4605941df1
HHH-8654 - Ability to get notified of interesting Session events
...
(cherry picked from commit 449c558365
2013-11-15 15:03:26 -06:00
50870c742f
HHH-8654 - Ability to get notified of interesting Session events
...
(cherry picked from commit 1e74abf511
2013-11-15 14:55:19 -06:00
2d911d215b
HHH-8654 - Ability to get noitified of interesting Session events
...
(cherry picked from commit f073b979d4
2013-11-15 14:09:15 -06:00
fb6d83b828
HHH-8671 WithClauseTest.testWithClause fails on all QA databases
2013-11-06 10:56:10 +08:00
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
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
davidmuzik
Christian Beikov
Lukasz Antoniak
Steve Ebersole
Sanne Grinovero
Strong Liu
Brett Meyer