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

4840 Commits

Author SHA1 Message Date
Gail Badner e5a31caa09 HHH-9388 HHH-7079 : Default collection table and foreign key names are incorrect in some cases; deprecate NamingStrategy 2014-10-08 03:13:38 -07:00
Gail Badner 36576046b8 HHH-9388 HHH-7079 : Default collection table and foreign key names are incorrect in some cases; deprecate NamingStrategy 2014-10-06 11:51:22 -07:00
Gail Badner 1883fcbb7b HHH-9369 Fix @Formula of enum type results in ClassCastException (minor fix for 4.2) 2014-09-19 13:50:06 -07:00
andreas 5d065bc263 HHH-9369 Fix @Formula of enum type results in ClassCastException 
(cherry picked from commit fff49977ab)
 2014-09-19 13:19:11 -07:00
Gail Badner 45c786c54f HHH-9387 HHH-9389 HHH-9390 : Minor correct to tests to work on 4.2 2014-09-11 13:12:25 -07:00
Gail Badner ea1d63ef43 HHH-9390 : Default join column name (FK) for @ManyToMany uses owning entity primary table name (test cases) 2014-09-11 12:58:51 -07:00
Gail Badner 9193d8ce97 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
 2014-09-11 12:57:50 -07:00
Gail Badner 30c6e060db HHH-9327 : NamingStrategy regression (reverts HHH-9280) 2014-09-10 12:57:55 -07:00
Christian Beikov 1df6c45f8a Added regression test for HHH-9327 
(cherry picked from commit 3da903f064)
 2014-08-27 15:15:19 -07:00
Gail Badner 24fd25306f HHH-9090 : HQL parser is trying to reuse parent implied join for subquery 
(cherry picked from commit 153c4e32ef)
 2014-08-12 17:41:46 -07:00
Steve Ebersole ea238b4c4f HHH-9312 - Database connection leak with JTA transaction tracking and background thread not releasing database connection 2014-08-04 14:55:52 -05:00
Steve Ebersole 9e1afbaf49 HHH-9312 - Database connection leak with JTA transaction tracking and background thread not releasing database connection 2014-08-04 13:34:09 -05:00
Gail Badner 88a93f8c03 HHH-9305 : HQL FromElement is not reused in some cases resulting in an additional join 
(cherry picked from commit a0663f0d6c)
 2014-07-29 19:57:37 -07:00
Gail Badner 8b5f959200 4.2.15.Final post-release 2014-07-17 00:01:45 -07:00
Gail Badner 2a4faa2227 4.2.15.Final release prep 2014-07-16 23:24:10 -07:00
Gail Badner 0e43f71ca0 HHH-9261 : Backport HHH-9106 to 4.2 (Multiple representations of the same entity cannot be merged using cascade=merge) 2014-07-14 15:28:32 -07:00
Gail Badner 5597111f32 HHH-9261 : Backport HHH-9106 to 4.2 (Multiple representations of the same entity cannot be merged using cascade=merge) 
(cherry picked from commit 31bcb0ea0a)
 2014-07-11 17:37:48 -07:00
Gail Badner 7109790ee3 HHH-9261 : Backport HHH-9106 to 4.2 (Multiple representations of the same entity cannot be merged using cascade=merge) 
(cherry picked from commit 368cdc1966)

Conflicts:
	hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/emops/MergeMultipleEntityCopiesDisallowedByDefaultTest.java
 2014-07-11 17:37:13 -07:00
Gail Badner eef0ca4eab HHH-9261 : Backport HHH-9106 to 4.2 (Multiple representations of the same entity cannot be merged using cascade=merge) 
(cherry picked from commit 6203b5da30)

Conflicts:
	hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/StrategySelectorBuilder.java
	hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyAllowedObserver.java
	hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/emops/MergeMultipleEntityRepresentationsAllowedTest.java
 2014-07-11 17:34:51 -07:00
Gail Badner e23fefd570 HHH-9261 : Backport HHH-9106 to 4.2 (Multiple representations of the same entity cannot be merged using cascade=merge) 2014-07-11 17:26:05 -07:00
Gail Badner c871002da7 HHH-8310 : Lob proxy class loading problem 
(cherry picked from commit 365bfe99d8)
 2014-07-09 19:34:11 -07:00
Gail Badner 9f8f07c229 HHH-9280 : Table name generated for @ElementCollection uses owning entity class name instead of mapped entity name 
(cherry picked from commit ccffe0dea9)
 2014-07-09 15:09:59 -07:00
Gail Badner 4732c04f10 HHH-9231 : Uncommitted data can remain in transactional collection cache after rollback if collection is initialized after flush 
(cherry picked from commit f9a49efd17)
 2014-07-08 22:58:36 -07:00
Gail Badner ec17bcbc29 HHH-9231 : Avoid updating collection 2LC if contains entity added in tx 
(cherry picked from commit 4851ab01df)
 2014-07-08 22:58:36 -07:00
Galder Zamarreño 0b0516870d 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)
 2014-07-08 22:58:36 -07:00
Gail Badner 7ae53f6eb9 HHH-9231 HHH-5690 : Test cases for transactional cache strategy 
(cherry picked from commit af5791f6dd)

Conflicts:
	hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/BasicTransactionalTestCase.java
 2014-07-08 22:58:10 -07:00
Emmanuel Bernard 728592007d HHH-9269 Store persister to ReferenceCacheEntryImpl to avoid costly lookup at read time 2014-07-02 12:40:20 +02:00
Sanne Grinovero 92bd9e6310 HHH-9268 The NoopOptimizer used for default id generation doesn't need synchronization 2014-07-01 21:49:37 +02:00
Gail Badner a7822712cc Update version to 4.2.15-SNAPSHOT 2014-06-25 21:46:19 -07:00
Gail Badner 6f71e0e6f0 4.2.14.Final release 2014-06-25 17:24:13 -07:00
Gail Badner e40ade009f HHH-9106: revert HHH-9106 on 4.2 branch 2014-06-25 16:40:29 -07:00
Gail Badner cb70c16fdd HHH-9255 : Revert HHH-9222 on 4.2 branch 2014-06-23 16:58:48 -07:00
Steve Ebersole 133f0825a3 HHH-9090 - HQL: parser is trying to reuse parent implied join for subquery 2014-06-23 11:05:42 -05:00
Steve Ebersole c1061d7e23 HHH-7689 - Error executing batch should abort rest of batch for "cleanliness" sake 
(cherry picked from commit 4a898c5524)
 2014-06-20 13:08:26 -07:00
Steve Ebersole 177d15015f HHH-7689 - addToBatch in BatchingBatch blows out of error handling and doesn't abort the batch 
(cherry picked from commit 0e164d1c9d)
 2014-06-20 13:08:26 -07:00
Steve Ebersole fae03639f5 HHH-7689 - addToBatch in BatchingBatch blows out of error handling and doesn't abort the batch 
(cherry picked from commit 075bc86209)
 2014-06-20 13:08:26 -07:00
Gail Badner 501b0f523c HHH-9106 : (corrected test case to work on MySQL) 
(cherry picked from commit 3a8041953d)
 2014-06-19 00:32:35 -07:00
Gail Badner 257efd1025 HHH-9234 : Test failure (testNaturalIdChangedWhileAttached) on SAP/SYBASE ASE 2014-06-18 17:03:42 -07:00
Gail Badner 343cd777b6 HHH-9248 : Skip CastFunctionTest.testFloatCasting and testLongCasting for MySQL 2014-06-18 16:16:59 -07:00
Gail Badner fed3191eb7 HHH-9106 : Merging multiple representations of the same entity (improved logging) 2014-06-17 12:35:13 -07:00
Gail Badner 7d4ca57c8b HHH-9106 : Merging multiple representations of the same entity 2014-06-13 19:18:45 -07:00
Gail Badner 7791a7048a HHH-9106 : Merging multiple representations of the same entity (entitymanager test cases) 
(cherry picked from commit 055b0cacae)
 2014-06-13 18:15:43 -07:00
Gail Badner cedc1e7667 HHH-9106 : Merging multiple representations of the same entity 
(cherry picked from commit 2daaf9a196)
 2014-06-13 18:15:43 -07:00
Gail Badner 5a7310c39a HHH-9239 HHH-9240 : FailureExpected test cases when merging entity copies with dirty collections 
(cherry picked from commit c7c5b015c1)
 2014-06-13 18:15:43 -07:00
Gail Badner 6fdc9bac13 HHH-9106 : Merging multiple representations of the same entity merged 
(cherry picked from commit 70532259fa)

Conflicts:
	hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java
	hibernate-core/src/main/java/org/hibernate/event/internal/DefaultMergeEventListener.java
	hibernate-core/src/main/java/org/hibernate/event/internal/EventCache.java
	hibernate-core/src/test/java/org/hibernate/event/internal/EventCacheTest.java
	hibernate-core/src/test/java/org/hibernate/test/ops/AbstractOperationTestCase.java
	hibernate-core/src/test/java/org/hibernate/test/ops/Category.java
	hibernate-core/src/test/java/org/hibernate/test/ops/Hoarder.hbm.xml
	hibernate-core/src/test/java/org/hibernate/test/ops/Hoarder.java
	hibernate-core/src/test/java/org/hibernate/test/ops/Item.java
	hibernate-core/src/test/resources/log4j.properties
 2014-06-13 18:15:32 -07:00
Gail Badner 5da9da4585 Update version to 4.2.14.SNAPSHOT 2014-05-28 16:46:12 -07:00
Gail Badner f471769d55 4.2.13 prep 2014-05-28 13:56:56 -07:00
Brett Meyer bb73ba9d6f HHH-8904 minor edits 2014-05-27 22:06:54 -04:00
Jeremy Whiting ba913eace2 HHH-8904 documentation for build time bytecode enhancements 2014-05-27 22:06:52 -04:00
Brett Meyer 494771d493 HHH-9202 NPE in OneToOneLinkTest on oracle12c 2014-05-27 21:52:15 -04:00