Commit Graph

2369 Commits

Author SHA1 Message Date
Arcadiy Ivanov c80a8c442a Fix for HHH-9419 into master
See https://github.com/hibernate/hibernate-orm/pull/815
2014-09-27 02:19:01 -04:00
Gunnar Morling 61eadfcabd HHH-8237 Applying type configured via @ColumnMapping#type() for constructor results 2014-09-22 16:14:21 +01:00
Gunnar Morling fc8a06eb8c HHH-8237 Applying type configured via @ColumnMapping#type() for scalar results 2014-09-22 16:14:21 +01:00
andreas 40efe9fc1c HHH-9369 Fix @Formula of enum type results in ClassCastException 2014-09-18 12:10:37 +01:00
Sanne Grinovero ca778258c8 HHH-9344 Convert QueryLoader to use nanoTime instead of currentTimeMillis 2014-09-17 14:59:35 +01:00
Sanne Grinovero 255612f8a0 HHH-9344 Convert Loader to use nanoTime instead of currentTimeMillis 2014-09-17 14:59:34 +01:00
Sanne Grinovero b3aba94d0f HHH-9344 Convert QueryTranslatorImpl to use nanoTime instead of currentTimeMillis 2014-09-17 14:59:34 +01:00
Sanne Grinovero 9f62b231ae HHH-9344 Convert DefaultResolveNaturalIdEventListener to use nanoTime instead of currentTimeMillis 2014-09-17 14:59:33 +01:00
Sanne Grinovero c69f0e602c HHH-9344 Remove dead code from BatchTest 2014-09-17 14:59:33 +01:00
Sanne Grinovero ec0c205578 HHH-9344 Guard against unneeded invocation to System.currentTimeMillis() in HQLQueryPlan 2014-09-17 14:59:32 +01:00
Gail Badner 67c86aaaf8 HHH-9390 : Default join column name (FK) for @ManyToMany uses owning entity primary table name (test cases) 2014-09-12 11:09:38 -07:00
Gail Badner f8af94e559 HHH-9390 : Default join column name (FK) for @ManyToMany uses owning entity primary table name (test cases)
(cherry picked from commit d4d5fcc9e2)
2014-09-11 19:01:06 -07:00
Gail Badner e4b0915a8e HHH-9387 HHH-9389 : Default collection table and join column names generated for @ElementCollection (test cases)
HHH-9387 HHH-9389 : Default collection join column names generated for @ElementCollection (test cases)

(cherry picked from commit f2ae61abf6)

Conflicts:
	hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/CollectionElementTest.java
	hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/Matrix.java
2014-09-11 18:23:03 -07:00
Gail Badner 00c2788d2b HHH-9327 : NamingStrategy regression (reverts previous commit for HHH-9281)
(cherry picked from commit 30c6e060db)
(cherry picked from commit c63bc19d8a)

Conflicts:
	hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/CollectionElementTest.java
2014-09-10 16:14:04 -07:00
Christian Beikov d2f13ed477 Added regression test for HHH-9327
(cherry picked from commit 3da903f064)
(cherry picked from commit 1df6c45f8a)
(cherry picked from commit 4505843f02)
2014-09-10 14:01:49 -07:00
Gail Badner 403b3c4391 HHH-8839 : Eager Map with entity key causes IllegalStateException: Collection element (many-to-many) table alias cannot be empty 2014-08-18 14:50:58 -07:00
Gail Badner 4fd933d526 HHH-8839 : Eager Map with entity key causes IllegalStateException: Collection element (many-to-many) table alias cannot be empty
(cherry picked from commit 35edd56907)
2014-08-18 14:02:34 -07:00
Gail Badner 57ac3f0b2e HHH-9090 : HQL parser is trying to reuse parent implied join for subquery
(cherry picked from commit 153c4e32ef)
2014-08-12 17:22:33 -07:00
Gail Badner 75706dafda HHH-9305 : HQL FromElement is not reused in some cases resulting in an additional join
(cherry picked from commit a0663f0d6c)
2014-07-29 19:33:50 -07:00
Brent Plump 7e0e248fc1 HHH-9290 : Do not truncate HT_ temporary table name prefix on Oracle 2014-07-28 09:13:55 -04:00
Sanne Grinovero 05cd4ff5d3 HHH-9288 Restore removed method ServiceRegistryBuilder#buildServiceRegistry used by Tools 2014-07-14 16:08:24 +01:00
Gail Badner 873f28f5e6 HHH-9282 : Revert HHH-9222 on master 2014-07-09 22:45:00 -07:00
Gail Badner 10df4cc79d HHH-8310 : Lob proxy class loading problem
(cherry picked from commit 365bfe99d8)
2014-07-09 19:33:28 -07:00
Gail Badner d0be11f503 HHH-5811 : Flush causes update query on field of type Byte[]
(cherry picked from commit 4007655045)
2014-07-09 17:16:04 -07:00
Gail Badner bc37d5f6b2 HHH-9281 : Table name generated for @ElementCollection uses owning entity class name instead of mapped entity name
(cherry picked from commit ccffe0dea9)

Conflicts:
	hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/CollectionElementTest.java
2014-07-09 15:42:04 -07:00
Gail Badner ea388c8c82 HHH-9231 : Avoid updating collection 2LC if contains entity added in tx
(cherry picked from commit 4851ab01df)
2014-07-07 19:50:32 -07:00
Galder Zamarreño cf913c16d4 HHH-9231 Avoid updating collection 2LC if contains entity added in tx
(cherry picked from commit 3b098a94d3463086a230d6dbc1254e9ecbf76cda)

Conflicts:
	hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/BasicTransactionalTestCase.java

(cherry picked from commit 36e35207f6)

Conflicts:
	hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/BasicTransactionalTestCase.java
2014-07-07 19:50:22 -07:00
Gail Badner 9d67bf3218 HHH-9106 : Merging multiple representations of the same entity (logging)
(cherry picked from commit 31bcb0ea0a)

Conflicts:
	hibernate-core/src/test/resources/log4j.properties
2014-07-03 12:55:29 -07:00
Gail Badner c7c57fc7ee HHH-9106 : Merging multiple representations of the same entity (tests using StrategySelector)
(cherry picked from commit 368cdc1966)
2014-07-03 12:53:07 -07:00
Gail Badner 1472681dc2 HHH-9106 : Merging multiple representations of the same entity (using StrategySelector)
(cherry picked from commit 6203b5da30)
2014-07-03 12:53:06 -07:00
Steve Ebersole b0a2ae9d66 HHH-9221 - Binder#bindIdentifierGenerator leads to NPE due to bad Map calls 2014-07-02 09:02:55 -05:00
Emmanuel Bernard 8c42cc6899 HHH-9269 Store persister to ReferenceCacheEntryImpl to avoid costly lookup at read time 2014-07-02 11:44:00 +02:00
Sanne Grinovero 98771c247f HHH-9268 The NoopOptimizer used for default id generation doesn't need synchronization 2014-07-02 01:19:49 +02:00
Steve Ebersole 75aac4f3ab HHH-9090 - HQL: parser is trying to reuse parent implied join for subquery
(cherry picked from commit 133f0825a3)
2014-06-23 11:06:50 -05:00
Gail Badner c16b820c7e HHH-9106 : (corrected test case to work on MySQL)
(cherry picked from commit 3a8041953d)
2014-06-19 00:39:16 -07:00
Gail Badner b845465e36 HHH-9234 : Test failure (testNaturalIdChangedWhileAttached) on SAP/SYBASE ASE
(cherry picked from commit 257efd1025)
2014-06-18 17:26:41 -07:00
Gail Badner b6da553c07 HHH-9106 : Merging multiple representations of the same entity (improved logging)
(cherry picked from commit fed3191eb7)
2014-06-17 12:47:52 -07:00
Gail Badner e361def028 HHH-9245 : <list> mapped in hbm.xml ends up as a bag (test case) 2014-06-13 17:48:17 -07:00
Gail Badner caaee7bdab HHH-9106 : Merging multiple representations of the same entity
(cherry picked from commit 2daaf9a196)

Conflicts:
	hibernate-core/src/test/resources/log4j.properties
2014-06-13 16:59:48 -07:00
Gail Badner 5d7266bc04 HHH-9239 HHH-9240 : FailureExpected test cases when merging entity copies with dirty collections
(cherry picked from commit c7c5b015c1)
2014-06-13 16:57:47 -07:00
Gail Badner e010e455c9 HHH-9106 : Merging multiple representations of the same entity merged
(cherry picked from commit 70532259fa)

Conflicts:
	hibernate-core/src/test/java/org/hibernate/test/ops/MergeTest.java
	hibernate-core/src/test/resources/log4j.properties
2014-06-13 16:57:20 -07:00
Brett Meyer 84871ef1de HHH-9215 HHH-9214 HHH-9213 correcting Sybase test failures
Conflicts:
	hibernate-core/src/test/java/org/hibernate/test/generated/DefaultGeneratedValueTest.java
2014-05-30 14:50:46 -04:00
Brett Meyer 58aa7a9693 HHH-8893 cleanup 2014-05-30 14:20:24 -04:00
Brett Meyer bcda51da94 HHH-8893 HBM transform/mock 2014-05-30 00:37:06 -04:00
Brett Meyer f50da6679f HHH-9202 NPE in OneToOneLinkTest on oracle12c
Conflicts:
	hibernate-core/src/test/java/org/hibernate/test/onetoone/link/OneToOneLinkTest.java
2014-05-27 21:54:09 -04:00
Steve Ebersole 85a6015cf9 HHH-9222 - Bulk delete and element collections
(cherry picked from commit d36b3a3e97)
2014-05-27 15:44:20 -05:00
Gail Badner 367bdbc385 HHH-9204 HHH-9205 : Restore AbstractCollectionPersister.doProcessQueuedOps() removed by HHH-9078; deprecate method added by HHH-9078
(cherry picked from commit 420296fd26)
2014-05-27 13:13:11 -07:00
Gail Badner cbf1ce034a HHH-9171 : Orphan removal does not happen for new entity element
(cherry picked from commit f549b88831)
2014-05-27 12:40:14 -07:00
Brett Meyer 9d46f517dd HHH-8818 TcclSafeAggregatedClassLoader 2014-05-27 10:37:47 -04:00
Brett Meyer 48d2c79889 HHH-9145 simplified JDBC check 2014-05-23 17:49:47 -04:00