Commit Graph

1725 Commits

Author SHA1 Message Date
mukhanov 600369413d HHH-3482 Fixed StatelessSession inserting bug + test 2014-02-10 17:10:46 -05:00
Brett Meyer f19d43d92c HHH-8845 formatting 2014-02-10 16:40:52 -05:00
Paul Lysak 460015469c HHH-8845 - More informative error message 2014-02-10 16:40:50 -05:00
akotlyarov 74e926c9d5 HHH-7205: Added catching exception for executing session.get when session cache contains proxy for non-existing object 2014-02-10 16:33:45 -05:00
Brett Meyer 9069b4776d HHH-7205 test assertion 2014-02-10 16:33:43 -05:00
akotlyarov a1ea2deb7d HHH-7205: Added test to show bug exists when execute session.get after session.load for not-existing entity 2014-02-10 16:33:41 -05:00
Thomas Jones-Low af428a1273 HHH-8900 annotations OneToOne test fail with some sequence supporting
dialects

Conflicts:
	hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/OneToOneTest.java
2014-02-10 12:12:09 -05:00
Brett Meyer ae7d59529e HHH-8942 log level checks should not be static
Conflicts:
	hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/TransactionCoordinatorImpl.java
2014-02-07 11:14:51 -05:00
Sanne Grinovero 361929d269 HHH-8942 Micro polishing in hot method of TransactionCoordinatorImpl
Conflicts:
	hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/TransactionCoordinatorImpl.java

Conflicts:
	hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/TransactionCoordinatorImpl.java
2014-02-07 11:13:44 -05:00
Brett Meyer e712a44ec3 HHH-8922 ClassLoaderServiceImpl#getResources should use LinkedHashSet to
preserve ordering

Conflicts:
	hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/internal/ClassLoaderServiceImpl.java
2014-02-07 10:07:31 -05:00
Brett Meyer aad23dc804 HHH-8942 reorganized TransactionCoordinatorImpl#attemptToRegisterJtaSync
to further reduce log level checks
2014-02-07 09:57:21 -05:00
Brett Meyer f7c7842cc4 HHH-8942 reduced logging hits in TransactionCoordinatorImpl
Conflicts:
	hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/TransactionCoordinatorImpl.java
2014-02-06 14:07:08 -05:00
Brett Meyer bd54dbbfc2 HHH-8747 evictQueryRegions should evict the default region 2014-02-04 12:32:27 -05:00
Brett Meyer 1dcdc445b4 HHH-8822 ValueHolder fields need to be transient if owned by a
Serializable class

Conflicts:
	hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataImpl.java

Conflicts:
	hibernate-core/src/main/java/org/hibernate/engine/spi/TypedValue.java
2014-01-30 11:54:31 -05:00
Brett Meyer 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
Brett Meyer 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
davidmuzik 10bf926de8 HHH-2988 Update UnionSubclassEntityPersister column quoting 2014-01-20 20:03:06 -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 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 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
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 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 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 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 2290f3e088 HHH-8689 regression test 2013-11-21 11:36:17 -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