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

317 Commits

Author SHA1 Message Date
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 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
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
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 1af0615f17 HHH-9092 QueryBuilderTest.testMultiselectWithPredicates failing on most 
databases
 2014-03-31 10:26:52 -04:00
Brett Meyer 3cd69af333 HHH-8739 corrected test 2014-03-10 14:41:04 -04:00
Steve Ebersole 57b5dccb78 HHH-8739 - Tracking of JTA Synch registration thread 2014-03-10 13:52:31 -04:00
Brett Meyer 2059edd296 HHH-8404 test case 
Conflicts:
	hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/QueryBuilderTest.java
	hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/metamodel/Address.java
 2014-01-20 17:53:06 -05:00
Benjamin Tegarden 3d2d9bfd4f HHH-8404: Correctly render 'ListIndexExpression' 
Conflicts:
	hibernate-entitymanager/src/main/java/org/hibernate/jpa/criteria/expression/ListIndexExpression.java
 2014-01-20 17:37:40 -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
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 0257bb497e HHH-8779 corrected bundle symbolic name 2013-12-09 11:01:39 -05:00
Lukasz Antoniak c76859709a HHH-8701 - Fix JPQL TYPE operator test 
Conflicts:
	hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/query/QueryTest.java
 2013-12-02 12:56:15 -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 ce7598f452 HHH-8734 Update to Gradle 1.9 2013-11-21 14:51:33 -05:00
Steve Ebersole 4b543dc552 HHH-8647 - hibernate.cache.use_reference_entries + queries 
Conflicts:
	hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/ejb3configuration/PersisterClassProviderTest.java
 2013-10-29 06:13:25 -04:00
Brett Meyer cd55718f71 HHH-8643 corrected TemporalType parameter validation 2013-10-28 07:06:11 -04:00
Brett Meyer 4fad9a4a8f HHH-8643 test case 2013-10-28 06:38:32 -04:00
Ståle W. Pedersen 32a5633b35 HHH-8354 - New dirty-checking options based on bytecode enhancement 
Conflicts:
	hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/Enhancer.java
	hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/EnhancerConstants.java
	hibernate-core/src/test/java/org/hibernate/test/cfg/persister/GoofyPersisterClassProvider.java
	hibernate-core/src/test/java/org/hibernate/test/legacy/CustomPersister.java
	hibernate-gradle-plugin/src/main/groovy/org/hibernate/tooling/gradle/EnhancerTask.groovy
	hibernate-maven-plugin/src/main/java/org/hibernate/bytecode/enhance/plugins/HibernateEnhancementMojo.java
 2013-10-17 18:21:29 -04:00
Juergen Zimmermann 3d932aeb33 HHH-8032 OptimisticLockException with message of the wrapped 
StaleObjectStateException

Conflicts:
	hibernate-entitymanager/src/main/java/org/hibernate/jpa/spi/AbstractEntityManagerImpl.java
 2013-10-15 14:41:34 -04:00
Brett Meyer f7b80fb28c HHH-6859 correct AbstractEntityManagerImpl#determineCacheStoreMode 
Conflicts:
	hibernate-entitymanager/src/main/java/org/hibernate/jpa/spi/AbstractEntityManagerImpl.java
 2013-10-14 13:36:21 -04:00
Tomaz Cerar b09466f1db HHH-8363 ClassLoaderServiceImpl should be defined as Stoppable 
- also fix problem with JpaIntegrator holding references to beanmanager

Conflicts:
	hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/internal/ClassLoaderServiceImpl.java
	hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/spi/ClassLoaderService.java
	hibernate-entitymanager/src/main/java/org/hibernate/jpa/event/spi/JpaIntegrator.java
 2013-09-17 18:33:01 -04:00
Strong Liu c3e43f4fa7 HHH-7216 'java.lang.IllegalStateException: No supertype found' thrown on query with COUNT aggregate function 2013-08-14 01:04:36 +08:00
Jan Šimek 5924a1b8c0 ignoring collections and maps of any during populating JPA metamodel, 
see HHH-6589
 2013-08-05 23:20:18 -04:00
Ouzned a0d0641c80 added test case to reproduce HHH-8373 2013-08-01 11:24:21 -04:00
Ouzned e8035ccbb3 Fix proposal for HHH-8373 2013-08-01 11:24:10 -04:00
Brett Meyer c2be11394c HHH-8283 missed a few commits 2013-06-07 13:07:31 -04:00
ouzned adc6059a21 HHH-8283 JdbcSQLException with CompositeCustomType and java.util.Date 
Conflicts:
	hibernate-entitymanager/src/main/java/org/hibernate/jpa/internal/QueryImpl.java
	hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/basic/BasicCriteriaUsageTest.java
 2013-06-07 11:32:41 -04:00
Brett Meyer 335ddeaefc HHH-8254 throw HibernateException when transaction is rolledback by a 
reaper thread
Conflicts:
	hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/transaction/TransactionJoiningTest.java
 2013-05-17 13:37:00 -04:00
Brett Meyer 8e3fd81046 HHH-7995 Added support for TypeContributors in OSGi. Integrated with 
envers
 2013-04-30 12:50:02 -04:00
Zbyněk Roubalík b5d2f455f0 Test fix: em2 should be closed before we do latch.countDown() 2013-04-11 19:51:57 -04:00
Brett Meyer ac4f422aa2 HHH-7617 Gradle eclipse task missing src paths and test source generation 2013-04-09 15:28:20 -04:00
Brett Meyer 8d4b4857b7 HHH-7993 Support jar scanning in OSGi 2013-04-04 15:01:37 -04:00
Steve Ebersole 919a0e4244 HHH-7714 - Add support for EntityMode.MAP to JPA Criteria API 
(cherry picked from commit 04a9701f8b)
 2013-04-01 08:39:16 -05:00
Steve Ebersole f22a8f627b HHH-8122 - Scrub known-sensitive settings from EMF.getProperties() 
(cherry picked from commit bc85168015)

Conflicts:

	hibernate-entitymanager/src/main/java/org/hibernate/ejb/EntityManagerFactoryImpl.java
 2013-03-29 12:55:39 -05:00
Brad Koehn 2758b8b494 HHH-7714 Add support for EntityMode.MAP to JPA Criteria API 2013-03-29 09:14:47 -05:00
Brett Meyer 1df99fc066 HHH-8096 Re-work the OSGi class loading concepts 2013-03-27 15:06:37 -04:00
Steve Ebersole 1a3c25aa8b HHH-8067 - Hibernate's ManagedType#getDeclaredAttribute fails to find plural attributes 
(cherry picked from commit e5df5541c7)
 2013-03-13 12:13:26 -05:00
Brett Meyer 03d48893cf HHH-7910 Transaction timeout can cause non-threadsafe session access by 
reaper thread

Conflicts:
	hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/transaction/TransactionJoiningTest.java
 2013-03-08 13:10:07 -05:00
Brett Meyer ae978df496 HHH-8053 HibernateBundleActivator should not register itself as a 
PersistenceProvider
 2013-03-05 16:23:30 -05:00
Brett Meyer 5f38be4659 HHH-8010 Support app-managed EntityManagerFactory and SessionFactory creation by OSGi bundles 2013-02-28 09:22:37 -05:00
Brett Meyer 9c41bcb910 HHH-8001 Temporarily disabled failing tests 2013-02-22 14:38:24 -05:00
Lukasz Antoniak 3a0c725cf3 HHH-6876 - Test case 2013-02-19 17:12:45 -05:00
Brett Meyer 7611a5055c HHH-7994 Improve OsgiClassLoader performance 2013-02-18 15:37:22 -05:00
Brett Meyer 94cbc61f04 HHH-7527 Enterprise OSGi JPA support 2013-02-14 11:04:35 -05:00
Lukasz Antoniak 6455107c6e HHH-7561 - Fix and test ( from Lukasz ) 2013-01-28 14:53:05 -05:00
Scott Marlow 603682937c HHH-7861 EntityManager.find() should return null instead of EntityNotFoundException (message improvement) 2013-01-24 11:10:08 -05:00