Commit Graph

1879 Commits

Author SHA1 Message Date
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
Brett Meyer 06e9e6913f HHH-9057 corrected test 2014-03-17 15:29:40 -04:00
Brett Meyer 773f6ddfde HHH-9057 Correct ObjectNameNormalizer for mssql-style quoting 2014-03-17 15:15:52 -04:00
Brett Meyer 548aa7c0de HHH-9056
OneToOneTest.testPkOneToOneSelectStatementDoesNotGenerateExtraJoin fails
on oracle and postresql
2014-03-17 15:15:49 -04:00
Brett Meyer f0af00b5a9 HHH-9054 QuoteTest violates unique key constraint on some DBs
Conflicts:
	hibernate-core/src/test/java/org/hibernate/test/quote/User.java
2014-03-17 15:15:43 -04:00
Brett Meyer 7c45e7eb15 HHH-9052 ASTParserLoadingTest.testBooleanPredicate fails on most
databases
2014-03-17 15:13:05 -04:00
Libor Ondrusek 9eaca501d9 HHH-9040 Added halt on error support for scripts importing
Conflicts:
	hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExport.java
2014-03-12 17:04:37 -04:00
Brett Meyer 3cdb74b161 HHH-8374 test case 2014-03-12 16:22:44 -04:00
sndyuk cd14a5a473 HHH-8374: Treat an entity wrapped by hibernate proxy equals a raw entity 2014-03-12 16:22:42 -04:00
Jorgen Rydenius d8e4c51235 HHH-9037 Simplified debugging by improving the ClassCastException message from JavassistLazyInitializer. 2014-03-12 13:20:54 -04:00
Brett Meyer b755206924 HHH-9034 ASTParserLoadingTest fails with postgresplus92 2014-03-12 12:53:29 -04:00
Steve Ebersole 57b5dccb78 HHH-8739 - Tracking of JTA Synch registration thread 2014-03-10 13:52:31 -04:00
Steve Ebersole 9d1563a817 HHH-8739 - Tracking of JTA Synch registration thread 2014-03-10 13:52:22 -04:00
Brett Meyer 768d02df4a HHH-9028 corrected Session#get for caching w/ polymorphism, improved
tests
2014-03-07 12:17:14 -05:00
Guillaume Smet 04c57c8a73 HHH-9028 Test case: when second level cache is enabled, the session returns the objects even if the class doesn't match 2014-03-07 12:17:12 -05:00
Brett Meyer 673fcaa932 HHH-8440 added mssql2012 to StandardDatabaseInfoDialectResolver
Conflicts:
	hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/StandardDatabaseInfoDialectResolver.java
2014-03-05 12:44:50 -05:00
Brett Meyer c64297bc06 HHH-8440 Support sequences with a new SQLServer2012Dialect 2014-03-05 12:42:57 -05:00
Brett Meyer d0eaa87fac HHH-7072 correcting test failure 2014-03-04 17:19:12 -05:00
Brett Meyer 677ac13458 HHH-7072 force recreation of element collections of components with all
nullable properties
Conflicts:
	hibernate-core/src/main/java/org/hibernate/type/ComponentType.java
	hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/embeddables/withcustomenumdef/Location.java
2014-03-04 16:29:25 -05:00
Brett Meyer d22c60cc68 HHH-9017 correct HSQL pooled sequences
Conflicts:
	hibernate-core/src/main/java/org/hibernate/dialect/HSQLDialect.java
2014-03-04 09:56:53 -05:00
Brett Meyer 1fe54cf7e6 HHH-9010: Revert "HHH-8961 Reduce allocation cost of org.hibernate.cache.spi.CacheKey"
This reverts commit a7910b19a4.
2014-02-28 14:01:21 -05:00
Sanne Grinovero 6ba6ce14a9 HHH-9003 Avoid allocating arrays in most methods of ComponentType 2014-02-26 19:01:18 -05:00
Sanne Grinovero b12f2ecf44 HHH-8950 Avoid repeated array allocation for sqlTypes 2014-02-26 19:00:14 -05:00
Brett Meyer 419633432a HHH-8878 corrected id conflict in CoreMessageLogger 2014-02-26 18:55:19 -05:00
Sanne Grinovero 28738c1e20 HHH-8878 Remove some dead code 2014-02-26 18:32:53 -05:00
Sanne Grinovero b644b515ef HHH-8878 Avoid hot allocation in PooledLoOptimizer 2014-02-26 18:32:34 -05:00
Sanne Grinovero 03fa305667 HHH-8878 Fix logged message about PooledLoOptimizer being created 2014-02-26 18:32:26 -05:00
Sanne Grinovero 7b3f1408f3 HHH-9001 Unnecessary Stack object being allocated in org.hibernate.engine.internal.Cascade 2014-02-26 17:37:29 -05:00
Brett Meyer 8f52c614c3 Revert "HHH-8945 introduced "hibernate.session.initial_capacity" to reduce"
This reverts commit 09ea1b33f9.
2014-02-26 17:21:12 -05:00
Brett Meyer 14f757c87a Revert "HHH-8945 increased default map size"
This reverts commit 8e5e8d1b14.
2014-02-26 17:20:57 -05:00
Sanne Grinovero d910feee22 HHH-8990 Improve backwards compatibility of 4.2 branch by reintroducing the deleted NonFlushedChanges interface 2014-02-26 17:14:10 -05:00
Sanne Grinovero 1be3e2407c CheckStyle: Improve formatting of org.hibernate.event.spi.LoadEvent 2014-02-24 17:06:43 +00:00
Sanne Grinovero 5fa642ff72 HHH-8984 Reintroduce the previous EntityEntry constructor as a deprecated delegate (for stable branches only) 2014-02-24 16:33:07 +00:00
Sanne Grinovero db2a38f5e2 HHH-8984 Removing the tenantid from EntityEntry (not being used) 2014-02-24 16:25:14 +00:00
Sanne Grinovero 68113fb35b HHH-8984 EntityEntry slimming: remove EntityMode attribute 2014-02-24 16:12:49 +00:00
Sanne Grinovero 481f0e3c36 HHH-8991 Cache lookup of identifier Type and associated EntityPersister for each EntityType 2014-02-24 15:22:34 +00:00
Furkan Kamaci 0d253d8396 HHH-8989
Logic mismatch between AbstractQueryImpl and LimitHelper for setMaxResults(0) is fixed.
2014-02-20 14:50:30 -05:00
Brett Meyer 4fd94c1fd3 HHH-8983 log/clear Statement warnings on JdbcCoordinator#release
Conflicts:
	hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SqlExceptionHelper.java
2014-02-18 22:10:20 -05:00
Sanne Grinovero ec5987278d HHH-8977 Guess reasonable size for ArrayList and IdentitySet for Query
perform

Conflicts:
	hibernate-core/src/main/java/org/hibernate/engine/query/spi/HQLQueryPlan.java
2014-02-18 15:03:10 -05:00
Brett Meyer 8e5e8d1b14 HHH-8945 increased default map size
Conflicts:
	hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java
2014-02-18 14:54:42 -05:00
Sanne Grinovero 2df606036a HHH-8954 Avoid LockOptions allocation in LoadEvent unless strictly required 2014-02-18 14:50:02 -05:00
Sanne Grinovero a7910b19a4 HHH-8961 Reduce allocation cost of org.hibernate.cache.spi.CacheKey
instances

Remove tenantId field from CacheKey: use a different type when tenants
are needed. Also remove the Type as we should be able to rely on the
entityOrRoleName String.

Conflicts:
	hibernate-core/src/main/java/org/hibernate/cache/spi/CacheKey.java
2014-02-18 14:42:45 -05:00
Sanne Grinovero 0c5c980790 HHH-8939 Reduce contention on initialization of ColumnNameCache instances by loaders 2014-02-18 14:29:04 -05:00
Brett Meyer 09ea1b33f9 HHH-8945 introduced "hibernate.session.initial_capacity" to reduce
StatefulPersistenceContext's Map#resize calls

Conflicts:
	hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java
2014-02-12 13:31:09 -05:00
Andrej Golovnin 8ec3c4a89f HHH-8950 Avoid useless creation of an array in #getColumnSpan(Mapping). 2014-02-12 13:22:19 -05:00
Brett Meyer 7d828b1d25 HHH-8814 simplified the test a bit 2014-02-12 13:01:30 -05:00
Benoit GUERIN 949df8bd00 HHH-8814 : test case 2014-02-12 13:01:28 -05:00
Benoit GUERIN 2d8e5b4c25 HHH-8814 : Sequence generators on HSQLDB starts on 1 by default 2014-02-12 13:01:26 -05:00
Brett Meyer e812a6ca3c HHH-8946 corrected bug in register(ResultSet, Statement), improved
javadoc
2014-02-11 15:18:45 -05:00
Sanne Grinovero 265963c33b HHH-8946 Optimize JdbcCoordinatorImpl for CPU performance
- unnecessary HashMap lookups
- size HashMap allocations appropriately
- a leak of tracked statements
- complex logging logic

Conflicts:
	hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcCoordinatorImpl.java
2014-02-11 15:18:41 -05:00
Sanne Grinovero d402c06170 HHH-8947 Optimize performance of ServiceRegistry for intense lookup,
small contents and almost no writes

Conflicts:
	hibernate-core/src/main/java/org/hibernate/service/internal/AbstractServiceRegistryImpl.java
2014-02-11 14:34:21 -05:00
Brett Meyer 5f3a02f5d7 HHH-3482 corrected imports 2014-02-10 17:24:09 -05:00
Brett Meyer d60fc99dd4 HHH-3482 formatting 2014-02-10 17:10:47 -05:00
mukhanov 600369413d HHH-3482 Fixed StatelessSession inserting bug + test 2014-02-10 17:10:46 -05:00
Brett Meyer f19d43d92c HHH-8845 formatting 2014-02-10 16:40:52 -05:00
Paul Lysak 460015469c HHH-8845 - More informative error message 2014-02-10 16:40:50 -05:00
akotlyarov 74e926c9d5 HHH-7205: Added catching exception for executing session.get when session cache contains proxy for non-existing object 2014-02-10 16:33:45 -05:00
Brett Meyer 9069b4776d HHH-7205 test assertion 2014-02-10 16:33:43 -05:00
akotlyarov a1ea2deb7d HHH-7205: Added test to show bug exists when execute session.get after session.load for not-existing entity 2014-02-10 16:33:41 -05:00
Thomas Jones-Low af428a1273 HHH-8900 annotations OneToOne test fail with some sequence supporting
dialects

Conflicts:
	hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/OneToOneTest.java
2014-02-10 12:12:09 -05:00
Brett Meyer ae7d59529e HHH-8942 log level checks should not be static
Conflicts:
	hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/TransactionCoordinatorImpl.java
2014-02-07 11:14:51 -05:00
Sanne Grinovero 361929d269 HHH-8942 Micro polishing in hot method of TransactionCoordinatorImpl
Conflicts:
	hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/TransactionCoordinatorImpl.java

Conflicts:
	hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/TransactionCoordinatorImpl.java
2014-02-07 11:13:44 -05:00
Brett Meyer e712a44ec3 HHH-8922 ClassLoaderServiceImpl#getResources should use LinkedHashSet to
preserve ordering

Conflicts:
	hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/internal/ClassLoaderServiceImpl.java
2014-02-07 10:07:31 -05:00
Brett Meyer aad23dc804 HHH-8942 reorganized TransactionCoordinatorImpl#attemptToRegisterJtaSync
to further reduce log level checks
2014-02-07 09:57:21 -05:00
Brett Meyer f7c7842cc4 HHH-8942 reduced logging hits in TransactionCoordinatorImpl
Conflicts:
	hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/TransactionCoordinatorImpl.java
2014-02-06 14:07:08 -05:00
Brett Meyer bd54dbbfc2 HHH-8747 evictQueryRegions should evict the default region 2014-02-04 12:32:27 -05:00
Brett Meyer 1dcdc445b4 HHH-8822 ValueHolder fields need to be transient if owned by a
Serializable class

Conflicts:
	hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataImpl.java

Conflicts:
	hibernate-core/src/main/java/org/hibernate/engine/spi/TypedValue.java
2014-01-30 11:54:31 -05:00
Brett Meyer c404d84149 HHH-8864 count distinct tuples for postgres and h2
Conflicts:
	hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQL81Dialect.java
	hibernate-core/src/main/java/org/hibernate/dialect/function/StandardAnsiSqlAggregationFunctions.java
2014-01-22 15:51:55 -05:00
Brett Meyer 3d7494d8de HHH-2988 test case
Conflicts:
	hibernate-core/src/test/java/org/hibernate/test/quote/QuoteTest.java
2014-01-20 20:04:58 -05:00
davidmuzik 10bf926de8 HHH-2988 Update UnionSubclassEntityPersister column quoting 2014-01-20 20:03:06 -05:00
Brett Meyer c574fe0b17 HHH-8863 correct StatisticalLoggingSessionEventListener partial flush
timing
2014-01-14 14:36:54 -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
Brett Meyer 4a57b45958 HHH-2188 Query metadata gives NPE for polymorphic queries
Conflicts:
	hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java
2014-01-10 14:14:17 -05:00
Brett Meyer 24c951a3d1 HHH-8638 global quoting breaks UC on FK 2014-01-10 13:11:15 -05:00
Brett Meyer d437f0d9b4 HHH-8831 changed exception type, formatting 2014-01-09 13:18:46 -05:00
Christian Beikov 3159f04681 HHH-8831 improved exception message
When having @JoinColumn in a @CollectionTable that do not point to valid columns, the message can be really confusing. These new lines will actually enrich the exception which is thrown that the problem appeared on a specific property of a specific class.

Please include this, since it is not always clear what the actual problem is with a mapping when an exception occurs.
2014-01-09 13:18:44 -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 3c673e573c HHH-3051 corrected CustomLoader returnTypes (different approach)
Conflicts:
	hibernate-core/src/main/java/org/hibernate/loader/Loader.java
	hibernate-core/src/main/java/org/hibernate/loader/custom/CustomLoader.java
2014-01-06 14:12:45 -05:00
Brett Meyer 7200540651 HHH-3051 corrected Loader returnTypes
Conflicts:
	hibernate-core/src/main/java/org/hibernate/loader/Loader.java
2014-01-02 15:14:59 -05:00
Brett Meyer 7b19ea2c88 HHH-2298 WARN if using build-in conn pool 2013-12-17 14:29:08 -05:00
Brett Meyer 04c08cb9fd HHH-8790 add "escape" keyword to Template 2013-12-17 10:09:36 -05:00
Steve Ebersole e99f889bfd HHH-6911 - Write DiscriminatorValue to DiscriminatorColumn when combined
with InheritanceType#JOINED

Conflicts:
	hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java
2013-12-16 12:36:38 -05:00
Steve Ebersole d847a171eb HHH-6911 - Write DiscriminatorValue to DiscriminatorColumn when combined
with InheritanceType#JOINED

Conflicts:
	hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java
2013-12-16 12:34:55 -05:00
Steve Ebersole b01abeadef HHH-6911 - Write DiscriminatorValue to DiscriminatorColumn when combined
with InheritanceType#JOINED

Conflicts:
	hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java
	hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java
2013-12-16 12:33:51 -05:00
Brett Meyer cac31981f0 HHH-7630 allow joined subclass ordering to explicitly reference natural 2013-12-11 14:01:49 -05:00
Brett Meyer a317dfd526 HHH-8765 corrected hbm2ddl for turkish locale
Conflicts:
	hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/TableMetadata.java
2013-12-10 21:17:37 -05:00
Brett Meyer 4207017198 HHH-3604 whoops 2013-12-09 18:45:52 -05:00
Brett Meyer 97c7a18193 HHH-3604 add MySQL engine to table generators
Conflicts:
	hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java
2013-12-09 18:10:26 -05:00
Brett Meyer 7bb9fc1e82 Revert "HHH-8783 use JPA @JoinColumn(@ForeignKey(name=...)) for constraint name"
This reverts commit cd83193875.
2013-12-09 17:42:34 -05:00
Brett Meyer cd83193875 HHH-8783 use JPA @JoinColumn(@ForeignKey(name=...)) for constraint name
Conflicts:
	hibernate-core/src/main/java/org/hibernate/cfg/AnnotationBinder.java
2013-12-09 15:16:37 -05:00
Brett Meyer 0257bb497e HHH-8779 corrected bundle symbolic name 2013-12-09 11:01:39 -05:00
Brett Meyer 7ac0ad0537 HHH-4638 add Firebird to StandardDialectResolver
Conflicts:
	hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/StandardDialectResolver.java
2013-12-04 15:38:39 -05:00
Brett Meyer 2e14dc0ea9 HHH-5065 improved exception message on Configuration#getRootClassMapping 2013-11-27 21:20:50 -05:00
Brett Meyer a9afc4040d HHH-8749 Error flushing with a many-to-many Map defined with
unique="true" and cascading orphan delete
2013-11-27 18:06:27 -05:00
Brett Meyer e38cb21ef2 HHH-8748 replace Javassist's ProxyObject with Proxy
Conflicts:
	hibernate-core/src/main/java/org/hibernate/bytecode/internal/javassist/ProxyFactoryFactoryImpl.java
	hibernate-core/src/main/java/org/hibernate/proxy/pojo/javassist/JavassistLazyInitializer.java
2013-11-26 13:59:03 -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 2290f3e088 HHH-8689 regression test 2013-11-21 11:36:17 -05:00
Steve Ebersole 5ac6e5b0f6 HHH-8709 - SynchronizationCallbackCoordinator is calling
Thread.currentThread way too often

Conflicts:
	hibernate-core/src/main/java/org/hibernate/engine/transaction/synchronization/internal/SynchronizationCallbackCoordinatorNonTrackingImpl.java
	hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java
2013-11-19 17:57:22 -05:00
Brett Meyer 40a58173ad HHH-8721 CoreMessageLogger conflicts 2013-11-19 17:28:35 -05:00
Brett Meyer 328564e038 HHH-8686 FumTest hangs on mysql55 2013-11-18 18:34:42 -05:00
Sanne Grinovero f96eabc08e HHH-8703 Remove need to support EntityKey de-serialization without having access to a SessionFactory
(cherry picked from commit 9a3b1417c6)

Conflicts:

	hibernate-core/src/main/java/org/hibernate/persister/entity/EntityPersister.java
2013-11-18 09:41:50 -06:00
Steve Ebersole cfefabcd39 HHH-8703 - Remove NonFlushedChanges api
(cherry picked from commit d6fa2b2864)

Conflicts:

	hibernate-core/src/main/java/org/hibernate/engine/spi/NonFlushedChanges.java
	hibernate-core/src/main/java/org/hibernate/internal/NonFlushedChangesImpl.java
	hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/CreateTest.java
	hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/MergeTest.java
	hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/SaveOrUpdateTest.java
2013-11-18 09:40:23 -06:00
Steve Ebersole 531e5d428a HHH-8704 - ManyToOneType#scheduleBatchLoadIfNeeded creates EntityKey instances even if absolutely not necessary
(cherry picked from commit 7f82763843)
2013-11-16 14:09:52 -06:00
Sanne Grinovero bf26311474 HHH-8682 org.hibernate.engine.spi.EntityKey consumes a lot of memory
(cherry picked from commit 2235c43eaae36cc02f51276b69bd258d4ee17174)

Conflicts:

	hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java
	hibernate-core/src/main/java/org/hibernate/engine/spi/EntityKey.java
	hibernate-core/src/main/java/org/hibernate/persister/entity/EntityPersister.java
2013-11-16 13:54:08 -06:00
Steve Ebersole 8ad5ddeebf HHH-8680 Relax synchronized block in TableGenerator#generate 2013-11-16 13:49:48 -06:00
Steve Ebersole 47114c35b2 HHH-8698 ColumnNameCache wraps and unwraps int to Integer multiple times 2013-11-16 13:49:29 -06:00
Sanne Grinovero 71d5a746e3 HHH-8679 Relax synchronized block in Loader#wrapResultSetIfEnabled
(cherry picked from commit 8a0cf23f1f8a09dcec0c500f1504c33975f15ba4)
2013-11-16 13:47:50 -06:00
Sanne Grinovero 687b7718d9 HHH-8698 ColumnNameCache wraps and unwraps int to Integer multiple times
(cherry picked from commit a0c0ea5361007c21563f5c5ca69489943eb62037)

Conflicts:

	hibernate-core/src/main/java/org/hibernate/engine/jdbc/ColumnNameCache.java
	hibernate-core/src/main/java/org/hibernate/engine/jdbc/ResultSetWrapperProxy.java
2013-11-16 13:47:32 -06:00
Sanne Grinovero 1fd8f420e4 HHH-8680 Relax synchronized block in TableGenerator#generate
(cherry picked from commit adbd987fff7bb3a00a5b407741fd8a4270763f19)

Conflicts:

	hibernate-core/src/main/java/org/hibernate/id/enhanced/NoopOptimizer.java
2013-11-16 13:43:14 -06:00
Sanne Grinovero 184c257f1d HHH-8681 NonNullableTransientDependencies should initialize identityMap lazily
(cherry picked from commit 46ed0bd7108c233e4e39e5ed884719be13a37704)

Conflicts:

	hibernate-core/src/main/java/org/hibernate/engine/internal/NonNullableTransientDependencies.java
2013-11-16 13:38:04 -06:00
Sanne Grinovero c668d29257 Whitespace and style fixes (only)
(cherry picked from commit 0ba7c607780f5b48fc8958cabd1105e235c3dd61)

Conflicts:

	hibernate-core/src/main/java/org/hibernate/loader/Loader.java
	hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
2013-11-16 13:35:49 -06:00
Steve Ebersole 4605941df1 HHH-8654 - Ability to get notified of interesting Session events
(cherry picked from commit 449c558365)

Conflicts:

	hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java
2013-11-15 15:03:26 -06:00
Steve Ebersole 50870c742f HHH-8654 - Ability to get notified of interesting Session events
(cherry picked from commit 1e74abf511)

Conflicts:

	hibernate-core/src/main/java/org/hibernate/cfg/SettingsFactory.java
	hibernate-core/src/main/java/org/hibernate/engine/spi/SessionDelegatorBaseImpl.java
	hibernate-core/src/main/java/org/hibernate/engine/spi/SessionImplementor.java
	hibernate-core/src/main/java/org/hibernate/internal/AbstractSessionImpl.java
	hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java
	hibernate-core/src/test/resources/log4j.properties
2013-11-15 14:55:19 -06:00
Steve Ebersole 2d911d215b HHH-8654 - Ability to get noitified of interesting Session events
(cherry picked from commit f073b979d4)

Conflicts:

	hibernate-core/src/main/java/org/hibernate/action/internal/EntityInsertAction.java
	hibernate-core/src/main/java/org/hibernate/action/internal/EntityUpdateAction.java
	hibernate-core/src/main/java/org/hibernate/cache/internal/StandardQueryCache.java
	hibernate-core/src/main/java/org/hibernate/cache/spi/UpdateTimestampsCache.java
	hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java
	hibernate-core/src/main/java/org/hibernate/cfg/Settings.java
	hibernate-core/src/main/java/org/hibernate/cfg/SettingsFactory.java
	hibernate-core/src/main/java/org/hibernate/engine/internal/TwoPhaseLoad.java
	hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/AbstractBatchImpl.java
	hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/ResultSetReturnImpl.java
	hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/StatementPreparerImpl.java
	hibernate-core/src/main/java/org/hibernate/engine/loading/internal/CollectionLoadContext.java
	hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java
	hibernate-core/src/main/java/org/hibernate/engine/spi/SessionDelegatorBaseImpl.java
	hibernate-core/src/main/java/org/hibernate/engine/spi/SessionImplementor.java
	hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java
	hibernate-core/src/main/java/org/hibernate/id/enhanced/TableStructure.java
	hibernate-core/src/main/java/org/hibernate/internal/AbstractSessionImpl.java
	hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java
	hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java
	hibernate-core/src/test/resources/hibernate.properties
	hibernate-core/src/test/resources/log4j.properties
2013-11-15 14:09:15 -06:00
Strong Liu fb6d83b828 HHH-8671 WithClauseTest.testWithClause fails on all QA databases 2013-11-06 10:56:10 +08:00
Brett Meyer 93c558046d HHH-6004 improved HashMap performance in StructuredCacheEntry
Conflicts:
	hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredCacheEntry.java
2013-10-31 08:42:24 -04:00
Brett Meyer 350171c8ba HHH-7927 Enabling globally_quoted_identifiers breaks schema validation
if TableGenerator is used
Conflicts:
	hibernate-core/src/test/java/org/hibernate/test/quote/QuoteGlobalTest.java
2013-10-31 07:04:52 -04:00
Brett Meyer c38533c4ae HHH-6167 correct Ejb3Column.checkPropertyConsistency error message 2013-10-31 05:22:16 -04: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 e203259041 HHH-8617 correcting test failure 2013-10-23 13:17:13 -04:00
Brett Meyer 60075ce1d5 HHH-8617 Revert "HHH-8517 strip time from Date descriptors"
This reverts commit 24a36b9cbb.
2013-10-23 12:54:52 -04:00
Brett Meyer e356b77df0 HHH-8579 corrected test case 2013-10-22 22:29:55 -04:00
Brett Meyer a97d8318d7 HHH-8579 force english locale for query alias generation 2013-10-22 17:05:18 -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
Brett Meyer 851bdbbcc3 HHH-8573 refactored test case 2013-10-16 17:22:35 -04:00
Vasily Kochnev c926fdba03 HHH-8573: Persister is taken according to the actual type of the replaced object 2013-10-16 17:22:31 -04:00
Vasily Kochnev 1cc69b382c HHH-8573: Test case illustrating creation of a superclass instance when
subclass instance needed
2013-10-16 17:22:30 -04:00
Brett Meyer 1b441f7720 HHH-8612 correct FumTest's use of Date in a composite PK 2013-10-16 14:35:57 -04:00
Brett Meyer a1dfe69917 HHH-8605 supportsTuplesInSubqueries false in sqlserver/sybase 2013-10-14 10:29:18 -04:00
Brett Meyer 527bca144f HHH-6484 remove orphaned one-to-one when association replaced while
managed

Conflicts:
	hibernate-core/src/main/java/org/hibernate/action/internal/EntityDeleteAction.java
	hibernate-core/src/main/java/org/hibernate/engine/internal/Cascade.java
	hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java
	hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/bidirectional/DeleteOneToOneOrphansTest.java
	hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/composite/DeleteOneToOneOrphansTest.java
	hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/reversed/bidirectional/DeleteOneToOneOrphansTest.java
	hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/reversed/unidirectional/DeleteOneToOneOrphansTest.java
2013-10-11 15:30:01 -04:00
Brett Meyer c7dbdf9fd5 HHH-7130 cleanup 2013-10-09 11:38:58 -04:00
Zbyněk Roubalík aec877adb7 HHH-7130 Query cache eviction logging 2013-10-09 11:38:56 -04:00
Brett Meyer e588d2cd6d HHH-8328 Typo in Query.list Javadoc
Conflicts:
	hibernate-core/src/main/java/org/hibernate/Query.java
2013-10-08 14:19:37 -04:00
Brett Meyer 1ec00e6199 HHH-7513 check for natural id resolution in NaturalIdCacheKey
Conflicts:
	hibernate-core/src/main/java/org/hibernate/cache/spi/NaturalIdCacheKey.java
2013-10-07 17:52:32 -04:00
Brett Meyer a6b5b7f9b9 HHH-7513 test cleanup 2013-10-07 17:51:33 -04:00
Guenther Demetz a7f70a41fd HHH-7513 testcase 2013-10-07 17:51:30 -04:00
Brett Meyer a8393f6490 HHH-6255 correctly handling quoting fk names
Conflicts:
	hibernate-core/src/main/java/org/hibernate/mapping/ForeignKey.java
2013-10-07 15:16:45 -04:00
Brett Meyer bc99f16b8e HHH-8580 clearing a map collection caused NPE 2013-10-04 11:50:20 -04:00
Brett Meyer b25b2cbc43 HHH-4118 warn if hibernate.hbm2ddl.auto has unrecognized value 2013-10-02 15:46:32 -04:00
Brett Meyer 13ea5a5d32 HHH-5744 check ResultSet#hasNext in GUIDGenerator 2013-10-02 13:46:03 -04:00
Brett Meyer 5d9162dc3d HHH-5818 exception message typo 2013-10-02 12:58:03 -04:00
Brett Meyer e3419f6d72 HHH-8578 correct DeleteExecutor's use of where-clause 2013-09-30 16:45:39 -04:00
Brett Meyer d42f66dfd1 HHH-8537 @UniqueConstraint naming non-existent column leads to NPE
Conflicts:
	hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/UniqueConstraintTest.java
2013-09-27 16:28:55 -04:00
Brett Meyer 1a3be54c85 HHH-7984 Handle Oracle statements on release 2013-09-25 22:31:55 -04:00
Brett Meyer ac55afbd65 HHH-8551 Cannot use with-clause on the RHS of a join
Conflicts:
	hibernate-core/src/main/java/org/hibernate/engine/internal/JoinSequence.java
	hibernate-core/src/main/java/org/hibernate/hql/internal/ast/HqlSqlWalker.java
2013-09-25 16:26:47 -04:00
Brett Meyer 8b406db4a9 HHH-8503 whoops 2013-09-24 22:31:36 -04:00
Brett Meyer 61e3940057 HHH-8503 invoke determineDialect instead of constructDialect when
hibernate.dialect is blank
2013-09-24 22:05:48 -04:00
Brett Meyer d8b58cef67 HHH-8476 Bulk delete doesn't cascade delete on join table 2013-09-24 17:43:52 -04:00
Brett Meyer 24a36b9cbb HHH-8517 strip time from Date descriptors
Conflicts:
	hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarTimeTypeDescriptor.java
2013-09-19 15:22:14 -04:00