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

4796 Commits

Author SHA1 Message Date
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
Steve Ebersole 6612d4eb56 HHH-9222 - Bulk delete and element collections 
Conflicts:
	hibernate-core/src/main/java/org/hibernate/hql/internal/ast/exec/DeleteExecutor.java
 2014-05-27 21:30:00 -04:00
Gail Badner 47b53c4859 HHH-9193 : Default audit behavior of mapped-superclass (test cases) 
(cherry picked from commit 95070f50a9)
 2014-05-27 17:39:08 -07:00
Gail Badner dbfa5c67e8 HHH-9194 : Revert HHH-8908 fix 
This commit reverts commit d7173eeb3a, except for test cases.
 2014-05-27 17:36:06 -07:00
Gail Badner 75a84220d3 HHH-9204 HHH-9205 : Restore AbstractCollectionPersister.doProcessQueuedOps() removed by HHH-9078; deprecate method added by HHH-9078 
(cherry picked from commit 420296fd26)

Conflicts:
	hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java
 2014-05-27 13:47:42 -07:00
Gail Badner 436206356f HHH-9171 : Orphan removal does not happen for new entity element 2014-05-27 12:55:04 -07:00
Steve Ebersole d26d396361 HHH-9138 - CastFunctionTest failing on most databases 
(cherry picked from commit c012c4d8de)
 2014-05-22 11:09:35 -05:00
Lukasz Antoniak 6088633faa HHH-9200 - Natural id cache statistics are not cleared 2014-05-19 13:58:05 -04:00
Steve Ebersole bd3fca9d12 HHH-9154 - keywords as parameter names 
(cherry picked from commit 5aff092e2bd06bcfc18eb6eec9983b2f97237d64)

Conflicts:
	hibernate-core/src/main/antlr/hql.g
	hibernate-core/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java
 2014-05-15 09:44:50 -05:00
Gail Badner 044bf39e22 HHH-9169 : SQLServer2012Dialect creates sequences starting from Long.MIN_VALUE 2014-05-14 17:01:49 -07:00
Gail Badner 231fb1b195 HHH-9169 : SQLServer2012Dialect creates sequences starting from Long.MIN_VALUE 2014-05-13 23:24:31 -07:00
Gail Badner ed7144c025 HHH-9169 : SQLServer2012Dialect creates sequences starting from Long.MIN_VALUE 2014-05-13 22:56:35 -07:00
Gail Badner d5e13ca5e4 HHH-9154 : HQL Parsing: unexpected token ':' (test case) 2014-05-13 15:06:59 -07:00
Gail Badner b046b644b8 HHH-9154 : HQL Parsing: unexpected token ':' (test case) 2014-05-13 14:36:18 -07:00
Brett Meyer 80f2b1f564 HHH-9174 cache SqlExceptionHelper reference 2014-05-09 12:33:34 -04:00
Brett Meyer 56239da312 HHH-9170 StatelessSession is accidentally 2LC enabled in some cases 2014-05-09 11:55:41 -04:00
Brett Meyer 92bf2b7d57 HHH-9174 Increase performance 
of SqlExceptionHelper#handleAndClearWarnings
 2014-05-09 11:51:06 -04:00
Gail Badner 5d8a45ca0c HHH-9171 : Orphan removal broken for new element added by merge that is removed by later merge (test case) 2014-05-07 16:14:51 -07:00
Gail Badner 6d0a7b61f2 HHH-9150 : Envers test table is too long causing Oracle failure 2014-04-30 19:17:45 -07:00
Brett Meyer be7592526f Revert "HHH-3730 Compare both ids in isModified instead of an object and an id" 
This reverts commit 1a10937ae9.
 2014-04-21 09:45:20 -04:00
Julien Fourment 1b41e52397 HHH-9093 - Fixed typo in error message when no implicit selection could 
be found

Conflicts:
	hibernate-entitymanager/src/main/java/org/hibernate/jpa/criteria/CriteriaQueryImpl.java
	hibernate-entitymanager/src/main/java/org/hibernate/jpa/criteria/QueryStructure.java
 2014-04-21 08:57:01 -04:00
Guillaume Smet 1a10937ae9 HHH-3730 Compare both ids in isModified instead of an object and an id 2014-04-21 08:49:56 -04:00
msulima 3ad914d73f HHH-9136 - DatabaseMetadata: NPE hides exception in finally block 
- Protection against NPE in finally block
- Little formatting fixes
 2014-04-21 08:45:27 -04:00
Gail Badner d7173eeb3a HHH-8908 : Column of Embedded missing in Audit Table 2014-04-17 16:09:54 -07:00
Brett Meyer 0638c964ee 4.2.12.Final post release 2014-04-08 16:25:50 -04:00
Brett Meyer 0db253a609 4.2.12.Final release 2014-04-08 15:51:17 -04:00
Brett Meyer eaa01e66da HHH-9100 corrected grammar 2014-04-08 14:15:59 -04:00
Steve Ebersole cfc0327637 HHH-9100 - Improve CAST function support 
(cherry picked from commit 137c2daf81)

Conflicts:
	hibernate-core/src/main/java/org/hibernate/hql/internal/ast/SqlGenerator.java
 2014-04-08 13:03:40 -04:00
Steve Ebersole 6cef805a32 HHH-9100 - Improve CAST function support 
(cherry picked from commit 6ffbf8f3f3)

Conflicts:
	hibernate-core/src/main/antlr/hql.g
	hibernate-core/src/main/java/org/hibernate/dialect/function/CastFunction.java
	hibernate-core/src/main/java/org/hibernate/hql/internal/ast/HqlSqlWalker.java
	hibernate-core/src/main/java/org/hibernate/hql/internal/ast/SqlGenerator.java
 2014-04-08 13:02:03 -04:00
Steve Ebersole ca8bcf58c5 HHH-4700 - ClassCastException with parameter in 
CaseNode.getFirstThenNode() (cherry picked from commit
efa5dc2f6c)

Conflicts:
	hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/Case2Node.java
	hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/CaseNode.java
 2014-04-08 11:51:53 -04:00
Steve Ebersole 8f416e146d HHH-6747 - ClassCastException when rendering SimpleCaseExpression 
Conflicts:
	hibernate-entitymanager/src/main/java/org/hibernate/jpa/criteria/expression/SimpleCaseExpression.java
 2014-04-08 11:47:32 -04:00
Brett Meyer f1ddacda47 HHH-9107 throw WrongClassException if attempting to load incorrect 
subclass from 2lc
 2014-04-08 11:19:05 -04:00
Brett Meyer 5359d82b71 HHH-9104 removing test's o.h.metamodel.* (stale and fails on jdk8) 2014-04-07 14:17:21 -04:00
Brett Meyer f0e08a10e4 HHH-9104 corrected BasicHibernateAnnotationsTest.testFilterOnCollection 
test data cleanup
 2014-04-07 14:06:17 -04:00
Brett Meyer 1d10adf728 HHH-9103 Dialect resolver should use a newer Oracle dialect for 
Oracle12c
Conflicts:
	hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/StandardDialectResolver.java
 2014-04-07 11:11:46 -04:00
Brett Meyer 1af0615f17 HHH-9092 QueryBuilderTest.testMultiselectWithPredicates failing on most 
databases
 2014-03-31 10:26:52 -04:00
Steve Ebersole 601a293c0e HHH-8923 - Reconsider closing of ServiceRegistry instances 
Conflicts:
	hibernate-core/src/main/java/org/hibernate/boot/registry/BootstrapServiceRegistryBuilder.java
	hibernate-core/src/main/java/org/hibernate/boot/registry/StandardServiceRegistryBuilder.java
	hibernate-core/src/main/java/org/hibernate/boot/registry/internal/BootstrapServiceRegistryImpl.java
	hibernate-core/src/main/java/org/hibernate/boot/registry/internal/StandardServiceRegistryImpl.java
	hibernate-core/src/main/java/org/hibernate/service/internal/AbstractServiceRegistryImpl.java
	hibernate-core/src/test/java/org/hibernate/connection/ConnectionCreatorTest.java
 2014-03-26 12:46:53 -04:00
Brett Meyer f95dfddd8c HHH-8923 corrected test case 2014-03-26 10:36:23 -04:00
Brett Meyer 2464d2e214 HHH-8923 corrected test case 2014-03-26 09:32:54 -04:00
Steve Ebersole ee44d9be7f HHH-8923 - Reconsider closing of ServiceRegistry instances 
Conflicts:
	hibernate-core/src/main/java/org/hibernate/boot/registry/internal/BootstrapServiceRegistryImpl.java
	hibernate-core/src/main/java/org/hibernate/boot/registry/internal/StandardServiceRegistryImpl.java
	hibernate-core/src/main/java/org/hibernate/service/internal/AbstractServiceRegistryImpl.java
	hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java
 2014-03-26 09:32:40 -04:00
Brett Meyer 3127bb8b18 HHH-9078 correct OrderColumn indexes for inverse, extra lazy collections 
Conflicts:
	hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java
 2014-03-24 13:26:48 -04:00
Steve Ebersole ad69571543 HHH-7971 - Enabling ENABLE_LAZY_LOAD_NO_TRANS results in trying to 
remove elements in collections (cherry picked from commit
6f342358db)

Conflicts:
	hibernate-core/src/main/java/org/hibernate/collection/internal/AbstractPersistentCollection.java
	hibernate-core/src/main/java/org/hibernate/proxy/AbstractLazyInitializer.java
 2014-03-21 17:03:36 -04:00
Alexander-Dukhno 399614d900 HHH-7971 create regression test case for lazy loading with property ENABLE_LAZY_LOAD_NO_TRANS = true 
(cherry picked from commit 30205607ef)
 2014-03-21 17:02:33 -04:00
Steve Ebersole c6fee189d5 HHH-9071 - Proxy narrowing loses the initialized state of the original 
proxy (cherry picked from commit
c5bdec20b9)

Conflicts:
	hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java
 2014-03-21 11:35:29 -04:00
Guillaume Smet 6145c9a66a HHH-9071 When an already initialized proxy is narrowed, initialize the 
new proxy (cherry picked from commit
2cf52cc7f1)

Conflicts:
	hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java
 2014-03-21 11:33:49 -04:00