Hibernate/hibernate-orm
1
0
Fork 0
mirror of https://github.com/hibernate/hibernate-orm synced 2025-02-17 00:24:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,057 Commits 28 Branches 370 Tags
Commit Graph

349 Commits

Author SHA1 Message Date
Strong Liu
65f204fb72 HHH-8126 migrate HEM to metamodel branch 2013-04-02 14:16:49 +08:00
Strong Liu
72c5f8f5e9 merge master 2013-03-25 13:52:05 +08:00
Lukasz Antoniak
03a56f58b9 HHH-8087 - Cleanup 2013-03-22 16:02:47 +01:00
Lukasz Antoniak
fa12131267 HHH-8087 - Fix and test 2013-03-22 15:23:54 +01:00
Strong Liu
7881b4d6b6 resolve merge confilts 2013-03-18 20:12:26 +08:00
Lukasz Antoniak
bd7840dd0f HHH-8072 - Fixing Sybase tests 2013-03-15 22:17:35 +01:00
Steve Ebersole
889405b3f5 HHH-7667 - Investigate expanding bytecode enhancement support 
(cherry picked from commit 93f4fe0668c7a998d1a3b6bc9ec6e3cd7c9fca30)
 2013-03-14 12:33:21 -05:00
Lukasz Antoniak
11287c2e02 HHH-8061 - Fixing EnumSet test on Oracle 2013-03-13 20:43:14 +01:00
Brett Meyer
8673e08e7f HHH-8061 envers tests failing on master-matrix CI 2013-03-11 17:08:54 -04:00
Lukasz Antoniak
98c12081ec HHH-8036 - Fix and test 2013-03-04 22:17:47 +01:00
Lukasz Antoniak
51a7df596e HHH-6613 - Support for audited @ElementCollection 2013-02-28 13:22:14 +01:00
Brett Meyer
7bf544716a HHH-8019 Multiple tests creating identifiers too long for Oracle 2013-02-19 14:22:07 -05:00
Brett Meyer
4d68ddf7b0 HHH-7991 Correct all instances of 
Thread.currentThread().getContextClassLoader()
 2013-02-14 10:44:36 -05:00
Brett Meyer
56867417e2 HHH-7527 Enterprise OSGi JPA support 2013-02-14 10:44:35 -05:00
Brett Meyer
b5de4cda15 HHH-7999 Oracle test failures due to lack of support for identity 
columns
 2013-02-13 22:30:38 -05:00
Lukasz Antoniak
d702dfbc8c HHH-7948 - Fix and test 2013-01-30 15:49:10 +01:00
Lukasz Antoniak
c05238bad3 HHH-7948 - Fix and test 2013-01-29 19:03:06 +01:00
Lukasz Antoniak
2f71f071ec HHH-7934 - Test case 2013-01-24 08:27:48 +01:00
Lukasz Antoniak
69230d1ebd HHH-7934 - Fix and test 2013-01-24 07:52:49 +01:00
Lukasz Antoniak
8e38db5833 HHH-7918 - Completely recalculate entity state on merge 2013-01-14 22:34:33 +01:00
Lukasz Antoniak
2a9f3ad9ed HHH-7918 - Fix and test 2013-01-14 22:34:32 +01:00
Brett Meyer
9ce5c32dd7 HHH-7902 Replace JDBC proxies with a set of contracts/helpers 
HHH-7902 Merged JdbcResourceRegistry into JdbcCoordinator.  Parts of
LogicalConnection moved into JdbcCoordinator as well.

HHH-7902 Replaced Statement#close and ResultSet#close calls with
JdbcCoordinator#release

HHH-7902 Enforced the use of StatementPreparer, instead of Connection

HHH-7902 ResultSetExtractor.  Replaced all instances of execute,
executeQuery, executeUpdate, etc.

HHH-7902 Refactored AbstractReturningDelegate to give access to
jdbcCoordinator

HHH-7902 Corrected test failures

HHH-7902 Removed resource registry use from JdbcIsolation workers

HHH-7902 Corrected a few bugs in JdbcCoordinator and ResultSetExtractor.

HHH-7902 ResultSetExtractor -> ResultSetReturn.  Reworked proxy tests to
test the new APIs.

Conflicts:
	hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java
	hibernate-core/src/test/java/org/hibernate/sharedSession/SessionWithSharedConnectionTest.java
	hibernate-core/src/test/java/org/hibernate/test/dialect/functional/SQLServerDialectTest.java
	hibernate-core/src/test/java/org/hibernate/test/jdbc/proxies/BatchingTest.java
	hibernate-core/src/test/java/org/hibernate/test/transaction/jdbc/TestExpectedUsage.java
	hibernate-core/src/test/java/org/hibernate/test/transaction/jta/BasicDrivingTest.java
	hibernate-core/src/test/java/org/hibernate/test/transaction/jta/ManagedDrivingTest.java
 2013-01-14 14:25:06 -05:00
Lukasz Antoniak
0713cea180 HHH-7870 - Fix and test 2013-01-10 14:38:11 +01:00
Lukasz Antoniak
bcf73bd32c HHH-7437 - Fix and test 2013-01-03 13:10:16 +01:00
Strong Liu
6c6df69535 refactor, remove redundant type cast 2012-12-25 19:25:47 +08:00
Brett Meyer
c33fdae563 Merge remote-tracking branch 'origin/master' into metamodel 
Conflicts:
	hibernate-core/src/main/java/org/hibernate/LockOptions.java
	hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredCacheEntry.java
	hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredCollectionCacheEntry.java
	hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredMapCacheEntry.java
	hibernate-core/src/main/java/org/hibernate/cache/spi/entry/UnstructuredCacheEntry.java
	hibernate-core/src/main/java/org/hibernate/cfg/SettingsFactory.java
	hibernate-core/src/main/java/org/hibernate/id/TableGenerator.java
	hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java
	hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java
	hibernate-core/src/main/java/org/hibernate/metamodel/relational/Database.java
	hibernate-core/src/main/java/org/hibernate/metamodel/relational/Table.java
	hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/HibernateTypeResolver.java
	hibernate-core/src/main/java/org/hibernate/metamodel/spi/relational/Index.java
	hibernate-core/src/main/java/org/hibernate/metamodel/spi/relational/UniqueKey.java
	hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
	hibernate-core/src/main/java/org/hibernate/type/ArrayType.java
	hibernate-core/src/main/java/org/hibernate/type/Type.java
	hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/UniqueConstraintTest.java
	hibernate-core/src/test/java/org/hibernate/test/component/basic2/ComponentJoinsTest.java
	hibernate-core/src/test/java/org/hibernate/test/criterion/CriterionTest.java
	hibernate-core/src/test/resources/org/hibernate/test/propertyref/inheritence/union/Person.hbm.xml
	hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/timestamp/TimestampsRegionImplTestCase.java
 2012-12-20 00:09:45 -05:00
Lukasz Antoniak
da32690828 HHH-7827 - Documentation 2012-12-05 10:27:37 +01:00
Lukasz Antoniak
516577ea80 HHH-7827 - Correlating aggregated and outer queries 2012-12-05 10:27:35 +01:00
Lukasz Antoniak
468c58358e HHH-7800 - Tests cleanup 2012-11-22 12:02:35 +01:00
Csaba Varga
dadc43af23 HHH-7800: Fixed "maximize" doesn't work inside a disjunction issue 2012-11-22 12:02:31 +01:00
Csaba Varga
cd3363151b HHH-7800: added unit test to demonstrate broken behavior ("maximize" 
does not work inside an AuditDisjunction)
 2012-11-22 12:02:28 +01:00
Csaba Varga
ff25434d1f HHH-7800: Fixed "between" doesn't work inside a disjunction issue 2012-11-22 12:02:24 +01:00
Csaba Varga
54760bb61e HHH-7800: added unit test to demonstrate broken behavior ("between" 
does not work inside an AuditDisjunction)
 2012-11-22 12:02:21 +01:00
Lukasz Antoniak
c01dd40a65 HHH-5910 - Fix and test 2012-11-19 19:03:59 +01:00
Brett Meyer
18e44d1739 Merge branch master into metamodel 2012-11-15 15:01:13 -05:00
Lukasz Antoniak
5b004e4cbd HHH-7780 - Proper enumeration named/ordinal discovery 2012-11-14 16:15:43 +01:00
Lukasz Antoniak
97b1f0749e HHH-3854 - Fix and test 2012-11-11 17:58:23 +01:00
Lukasz Antoniak
0e3fe2b3d5 HHH-6349 - Test cleanup 2012-10-30 16:57:38 +01:00
Erik-Berndt Scheper
7b093fbc31 HHH-6349 Testcase: AuditJoinTable rows missing when detached entities with collections are merged into the persistence context 2012-10-30 16:57:36 +01:00
Erik-Berndt Scheper
47ae4e3ced HHH-6349 Testcase: AuditJoinTable rows missing when detached entities with collections are merged into the persistence context 2012-10-30 16:57:35 +01:00
Lukasz Antoniak
363048f44a HHH-7669 - Oracle sequences ordered 2012-10-30 08:48:28 +01:00
Lukasz Antoniak
cbe619f9ba HHH-7727 - Mark Envers demo as test source 2012-10-28 22:13:14 +01:00
brmeyer
b7855e944b HHH-7682 Audit records are not rolled back when transaction is rolled 
back
 2012-10-25 10:13:37 -04:00
Lukasz Antoniak
ac511bf72e HHH-7690 - @EmbeddedId with @ManyToOne inside 2012-10-25 12:56:27 +02:00
brmeyer
1a00abc3a6 HHH-7669: JtaTransaction test fails on Oracle RAC 
https://hibernate.onjira.com/browse/HHH-7669
 2012-10-23 17:44:36 -04:00
Steve Ebersole
595f068977 HHH-7620 - allow ValidatorFactory to be passed into EntityManagerFactoryBuilder 2012-09-20 04:25:48 -05:00
brmeyer
69442c6ea7 HHH-7569 Correct test-only failures in hibernate-core-master-matrix CI 
job
 2012-09-18 07:13:20 -04:00
Steve Ebersole
ec16599411 HHH-7556 - Clean up packages 2012-09-10 15:46:11 -05:00
Steve Ebersole
af115fe5a8 Merge branch 'master' into metamodel 
Conflicts:
	hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/internal/ClassLoaderServiceImpl.java
	hibernate-core/src/main/java/org/hibernate/cache/internal/NoCachingRegionFactory.java
	hibernate-core/src/main/java/org/hibernate/cache/internal/RegionFactoryInitiator.java
	hibernate-core/src/main/java/org/hibernate/cfg/SettingsFactory.java
	hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationIntegrator.java
	hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/UserSuppliedConnectionProviderImpl.java
	hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcServicesImpl.java
	hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcServices.java
	hibernate-core/src/main/java/org/hibernate/internal/AbstractSessionImpl.java
	hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java
	hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java
	hibernate-core/src/main/java/org/hibernate/internal/StoredProcedureCallImpl.java
	hibernate-core/src/main/java/org/hibernate/jaxb/internal/JaxbConfigurationProcessor.java
	hibernate-core/src/main/java/org/hibernate/jaxb/internal/JaxbMappingProcessor.java
	hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataBuilderImpl.java
	hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/AnnotationMetadataSourceProcessorImpl.java
	hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/Helper.java
	hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/HibernateMappingProcessor.java
	hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/IdentifierGeneratorResolver.java
	hibernate-core/src/main/java/org/hibernate/service/ConfigLoader.java
	hibernate-core/src/main/java/org/hibernate/service/ServiceRegistryBuilder.java
	hibernate-core/src/main/java/org/hibernate/service/StandardServiceInitiators.java
	hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsInitiator.java
	hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExport.java
	hibernate-core/src/main/java/org/hibernate/type/EnumType.java
	hibernate-core/src/test/java/org/hibernate/metamodel/binding/AbstractBasicBindingTests.java
	hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/MetadataImplTest.java
	hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/entity/IdentifierGeneratorTest.java
	hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/entity/MapsIdTest.java
	hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/global/FetchProfileBinderTest.java
	hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/global/QueryBinderTest.java
	hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/util/BaseAnnotationIndexTestCase.java
	hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/util/JandexHelperTest.java
	hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/xml/OrmXmlParserTests.java
	hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/XmlHelper.java
	hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/SimpleValueBindingTests.java
	hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/UnidirectionalManyToManyBindingTests.java
	hibernate-core/src/test/java/org/hibernate/test/annotations/id/sequences/HibernateSequenceTest.java
	hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/ManyToManyTest.java
	hibernate-core/src/test/java/org/hibernate/test/common/BasicTestingJdbcServiceImpl.java
	hibernate-core/src/test/java/org/hibernate/test/common/JdbcConnectionAccessImpl.java
	hibernate-core/src/test/java/org/hibernate/test/connections/AggressiveReleaseTest.java
	hibernate-core/src/test/java/org/hibernate/test/connections/ConnectionManagementTestCase.java
	hibernate-core/src/test/java/org/hibernate/test/connections/ThreadLocalCurrentSessionTest.java
	hibernate-core/src/test/java/org/hibernate/test/events/CallbackTest.java
	hibernate-core/src/test/java/org/hibernate/test/flush/TestAutoFlushBeforeQueryExecution.java
	hibernate-core/src/test/java/org/hibernate/test/flush/TestCollectionInitializingDuringFlush.java
	hibernate-core/src/test/java/org/hibernate/test/interceptor/InterceptorTest.java
	hibernate-core/src/test/java/org/hibernate/test/keymanytoone/bidir/component/EagerKeyManyToOneTest.java
	hibernate-core/src/test/java/org/hibernate/test/propertyref/DoesNotWorkTest.java
	hibernate-core/src/test/java/org/hibernate/test/propertyref/DoesNotWorkWithHbmTest.java
	hibernate-core/src/test/java/org/hibernate/test/service/ClassLoaderServiceImplTest.java
	hibernate-core/src/test/resources/org/hibernate/jmx/Entity.hbm.xml
	hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/AbstractEhcacheRegionFactory.java
	hibernate-entitymanager/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java
	hibernate-entitymanager/src/main/java/org/hibernate/jpa/boot/internal/PersistenceXmlParser.java
	hibernate-entitymanager/src/main/java/org/hibernate/jpa/event/internal/jpa/CallbackProcessorImpl.java
	hibernate-entitymanager/src/main/java/org/hibernate/jpa/event/spi/JpaIntegrator.java
	hibernate-envers/src/main/java/org/hibernate/envers/event/EnversIntegrator.java
	hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/tm/HibernateTransactionManagerLookup.java
	hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/InfinispanRegionFactoryTestCase.java
	hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/NodeEnvironment.java
	hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/JBossStandaloneJtaExampleTest.java
	hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseAnnotationBindingTestCase.java
	hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java
 2012-09-10 14:20:38 -05:00
Steve Ebersole
4ad49a02c9 HHH-7556 - Clean up packages 2012-08-28 14:12:15 -05:00