This is an automated email from the ASF dual-hosted git repository. ntimofeev pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit 33a64369c4cbb5bac4169f879361d8f9ce1316e6 Merge: 9934d68 281cc64 Author: Nikita Timofeev <stari...@users.noreply.github.com> AuthorDate: Fri Sep 11 11:40:37 2020 +0300 Merge pull request #428 from stariy95/4.2-FIX-CAY-2660-bigdecimal CAY-2660 BigDecimal comparision fix .../dbsync/reverse/configuration/ToolsModule.java | 3 + .../apache/cayenne/CayenneContextMergeHandler.java | 4 +- .../cayenne/access/DataContextMergeHandler.java | 3 +- .../org/apache/cayenne/access/DataRowUtils.java | 9 +- .../java/org/apache/cayenne/access/ObjectDiff.java | 6 +- .../types/BigDecimalValueType.java} | 47 ++++++---- .../cayenne/access/types/ValueObjectType.java | 14 +++ .../configuration/server/DataDomainProvider.java | 8 ++ .../cayenne/configuration/server/ServerModule.java | 5 ++ .../org/apache/cayenne/map/EntityResolver.java | 28 ++++-- .../cayenne/reflect/PersistentDescriptor.java | 6 +- .../apache/cayenne/reflect/PropertyDescriptor.java | 17 ++++ .../generic/DataObjectAttributeProperty.java | 15 +++- .../generic/DataObjectDescriptorFactory.java | 10 ++- .../DefaultValueComparisonStrategyFactory.java | 76 +++++++++++++++++ .../reflect/generic/ValueComparisonStrategy.java} | 29 ++----- .../generic/ValueComparisonStrategyFactory.java} | 26 ++---- .../main/java/org/apache/cayenne/util/Util.java | 3 +- .../DataContextEJBQLNumericalFunctionalIT.java | 12 +-- .../org/apache/cayenne/access/NumericTypesIT.java | 99 +++++++++++++++++----- .../select/DescriptorColumnExtractorTest.java | 8 +- .../server/DataDomainProviderTest.java | 3 + .../server/DefaultDbAdapterFactoryTest.java | 3 + .../generic/DataObjectAttributePropertyTest.java | 2 +- .../generic/DataObjectDescriptorFactoryIT.java | 10 ++- ...aObjectDescriptorFactory_InheritanceMapsIT.java | 7 +- .../numeric_types/auto/_BigDecimalEntity.java | 47 +++++++--- .../org/apache/cayenne/unit/di/CommitStats.java | 50 +++++++++++ .../cayenne/unit/di/server/ServerCaseModule.java | 5 ++ .../src/test/resources/cayenne-numeric-types.xml | 2 + .../src/test/resources/numeric-types.map.xml | 8 +- 31 files changed, 428 insertions(+), 137 deletions(-)