Hibernate/hibernate-orm
1
0
Fork 0
mirror of https://github.com/hibernate/hibernate-orm synced 2025-02-16 08:05:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,218 Commits 28 Branches 370 Tags
Commit Graph

272 Commits

Author SHA1 Message Date
Steve Ebersole
288155bcb2 HHH-6159 - Create EntityManagerFactoryBuilder : integrate EntityManagerFactoryBuilder with metamodel codebase 2012-07-24 02:30:40 -05:00
Steve Ebersole
61c04a0b30 HHH-6159 - Create EntityManagerFactoryBuilder : integrate EntityManagerFactoryBuilder with metamodel codebase 2012-07-24 00:03:29 -05:00
Steve Ebersole
42a3061f3e Merge branch 'master' into metamodel 
Conflicts:
	hibernate-core/src/main/java/org/hibernate/engine/spi/NamedQueryDefinition.java
	hibernate-core/src/main/java/org/hibernate/internal/SQLQueryImpl.java
	hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java
	hibernate-core/src/main/java/org/hibernate/loader/custom/sql/SQLQueryReturnProcessor.java
	hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/AnnotationBindingContextImpl.java
	hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/global/QueryProcessor.java
	hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/hbm/CompositePluralAttributeElementSourceImpl.java
	hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/hbm/MappingDocument.java
	hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/hbm/TimestampAttributeSourceImpl.java
	hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/hbm/VersionAttributeSourceImpl.java
	hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/entity/EntityBindingContext.java
	hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/ComponentAttributeSourceImpl.java
	hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/HibernateMappingProcessor.java
	hibernate-core/src/main/java/org/hibernate/metamodel/spi/domain/Composite.java
	hibernate-core/src/main/java/org/hibernate/metamodel/spi/source/BindingContext.java
	hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java
	hibernate-core/src/main/resources/org/hibernate/hibernate-mapping-4.0.xsd
	hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/SimpleValueBindingTests.java
	hibernate-entitymanager/src/main/java/org/hibernate/ejb/AvailableSettings.java
	hibernate-entitymanager/src/main/java/org/hibernate/jpa/internal/event/CallbackResolver.java
 2012-07-19 15:50:50 -05:00
Steve Ebersole
693185a8ac Re-applying commit for HHH-6304 missed during rebase of JPA 2.1 branch with master due to JPA package refactoring 2012-07-18 18:19:47 -05:00
Steve Ebersole
30d8fdaa8b HHH-7451 - Integrate Draft 7 of the JPA 2.1 spec : more ejb->jpa rename 2012-07-18 18:05:06 -05:00
Steve Ebersole
06d44951c6 HHH-7451 - Integrate Draft 7 of the JPA 2.1 spec : more ejb->jpa rename 2012-07-18 17:48:59 -05:00
Steve Ebersole
6a65c3e7e6 HHH-7451 - Integrate Draft 7 of the JPA 2.1 spec : SynchronizationType 2012-07-18 17:48:59 -05:00
Steve Ebersole
f8d06216e5 HHH-7451 - Integrate Draft 7 of the JPA 2.1 spec : criterias 2012-07-18 17:48:59 -05:00
Steve Ebersole
cb13cea1ac HHH-7387 - Integrate Draft 6 of the JPA 2.1 spec + HEM boot cleanup (HHH-6159) 2012-07-18 17:48:59 -05:00
Steve Ebersole
9ce3afd8da HHH-7387 - Integrate Draft 6 of the JPA 2.1 spec : AttributeConverter + HEM boot cleanup (HHH-6159) 2012-07-18 17:03:09 -05:00
Steve Ebersole
153eb4a913 HHH-7387 - Integrate Draft 6 of the JPA 2.1 spec : stored procedure queries 2012-07-18 17:00:19 -05:00
Steve Ebersole
4174c14675 HHH-7387 - Integrate Draft 6 of the JPA 2.1 spec : UPDATE/DELETE criterias 2012-07-18 16:52:33 -05:00
Steve Ebersole
2adab60d15 HHH-7387 - Integrate Draft 6 of the JPA 2.1 spec : TREAT 2012-07-18 16:52:32 -05:00
Steve Ebersole
8b87ae8830 HHH-7387 - Integrate Draft 6 of the JPA 2.1 spec : FUNCTION keyword 2012-07-18 16:52:32 -05:00
Steve Ebersole
0a37440431 HHH-7387 - Integrate Draft 6 of the JPA 2.1 spec : ON keyword 2012-07-18 16:52:32 -05:00
Steve Ebersole
1dd3e3a0bc HHH-7387 - Integrate Draft 6 of the JPA 2.1 spec 2012-07-18 16:52:32 -05:00
Steve Ebersole
3edb72db48 HHH-7387 - Integrate Draft 6 of the JPA 2.1 spec : addNamedQuery support 2012-07-18 16:52:32 -05:00
Steve Ebersole
00059fee2f HHH-7387 - Integrate Draft 6 of the JPA 2.1 spec 2012-07-18 16:48:45 -05:00
Scott Marlow
b76e7c4987 HHH-7454 added DEBUG log message 'PersistenceUnitUtil#isLoaded is not always accurate; consider using EntityManager#contains instead' 2012-07-18 11:02:27 -04:00
Rob Worsnop
dbff4c1839 HHH-2394 Got filters working on sub-classes. 2012-07-12 22:58:09 +08:00
Strong Liu
97ac8311d4 HHH-7426 Setting cacheable='true' in orm.xml does not enable caching of entity in 2lc 2012-07-12 15:00:44 +08:00
Strong Liu
973451d5e8 HHH-6304 HHH-6695 Error 'Cannot create TypedQuery for query with more than one return' with named queries 2012-07-12 11:53:27 +08:00
Steve Ebersole
7bdd8214e1 Merge branch 'master' into metamodel 2012-06-08 08:09:02 -05:00
Steve Ebersole
7cda27b6aa cleanup missed references to matrix sourceSet 2012-06-08 08:08:13 -05:00
Steve Ebersole
159b81f680 Merge branch 'master' into metamodel 2012-06-08 08:01:46 -05:00
Steve Ebersole
bd7b54a4ea cleanup missed references to matrix sourceSet 2012-06-08 07:59:54 -05:00
Steve Ebersole
986b66eb18 Initial merge from master to metamodel 2012-06-07 16:12:32 -05:00
Steve Ebersole
e6234bd2bd consolidate src/test and src/matrix 2012-06-07 14:11:03 -05:00
Steve Ebersole
d971317e1b HHH-6896 - Metamodel.managedType(...) implemented incorrectly 2012-06-05 15:02:24 -05:00
Steve Ebersole
9b1521c29a HHH-6896 - Metamodel.managedType(...) implemented incorrectly 2012-06-05 13:52:28 -05:00
Strong Liu
bf69f8a382 HHH-7298 regression, org.hibernate.ejb.test.lock.LockTest 2012-05-31 17:08:46 +08:00
Strong Liu
1de554b68a HHH-7298 regression, org.hibernate.ejb.test.lock.LockTest 2012-05-31 10:42:10 +08:00
Strong Liu
fe7a5d74c5 HHH-7350 read-only entities can not be deleted from 2LC 2012-05-31 00:54:08 +08:00
Strong Liu
dddc959311 HHH-6846 lock timeout is in milliseconds 2012-05-30 23:32:17 +08:00
Strong Liu
0c1569c4f4 HHH-6846 lock timeout is in milliseconds 2012-05-30 23:25:33 +08:00
Strong Liu
ed266c593a HHH-6256 persistence.xml-specified javax.persistence.lock.timeout is ignored 
HHH-6846 Support for Query.setHint(javax.persistence.lock.timeout)
 2012-05-29 18:15:59 +08:00
Strong Liu
4266cd3585 HHH-7356 javax.persistence.lock.timeout hint is ignored by @NamedQuery 2012-05-29 17:44:09 +08:00
Strong Liu
32d36f6ea9 HHH-7356 add failure expected test 2012-05-29 16:58:28 +08:00
Gail Badner
0a30003729 HHH-7265 : Test case to repro ConcurrentModificationException 2012-05-18 13:39:53 -07:00
Gail Badner
ac5ef8108a HHH-7265 : Test case to repro ConcurrentModificationException 2012-05-18 13:39:53 -07:00
Strong Liu
975877e5c7 fail test if timeout 2012-05-15 12:49:39 +08:00
Steve Ebersole
070ee532f5 HHH-7298 - regression, org.hibernate.ejb.test.lock.LockTest 2012-05-03 11:02:41 -05:00
Bryan Varner
8b40d71c84 Renamed the test case to be more consistent. 2012-05-02 17:17:42 -05:00
Bryan Varner
5c0d449082 Cleaned up the dialect error conversion a little bit for PostgresSQL. I was doing more than I needed to. 
Updated the LockTest to enable another nowait test for postgresql.
 2012-05-02 17:17:42 -05:00
Bryan Varner
cb1c485774 Yes, much cleaner... 2012-05-02 17:17:42 -05:00
Bryan Varner
c1849d56f6 Changing the test case to no longer fail when PersistenceException is thrown. This feels sooo wrong. 
I know dialects aren't mapping lock exceptions properly, and this test case exposes that if you fail the test when PersistenceException is thrown. So what do I do now?

There are other tests in this very test class that don't fail the build when the wrong exception is thrown, even though they clearly should.
 2012-05-02 17:17:42 -05:00
Bryan Varner
327002ab02 Adding a test case for HHH-7252. In this branch, the test case currently fails for PostgreSQL matrix tests, unless HHH-7251 is also applied. 2012-05-02 17:17:42 -05:00
Bryan Varner
089a36a260 HHH-7252 
The code was a bit non-obvious (assignment in a method call argument) where it was being done, and the local variable (lockOptions) assignment was missing in the find() method implementation.
I changed all instances of lockOptions assignment to assign before the method call where it's required as an argument, ensuring proper scope for exception mapping.
 2012-05-02 17:17:42 -05:00
Steve Ebersole
23aa8875d8 HHH-7265 - ConcurrentModificationException in SynchronizationRegistryImpl.notifySynchronizationsAfterTransactionCompletion due to SynchronizationRegistryImpl.clearSynchronizations clearing SynchronizationRegistryImpl.synchronizations 2012-05-02 14:14:48 -05:00
Gail Badner
3a5b231187 HHH-7265 : ConcurrentModificationException in SynchronizationRegistryImpl.notifySynchronizationsAfterTransactionCompletion 2012-05-02 14:14:48 -05:00