This is an automated email from the ASF dual-hosted git repository.
arjansh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/metamodel.git
commit 985d82cb4cbaae82e1a76f82231ce83adf0d2df2
Merge: 5fcc525 4e1c8aa
Author: William Edmisten <wcedmis...@gmail.com>
AuthorDate: Fri Jan 8 16:00:10 2021 -0500
Merge branch 'master' into jdbc_integration_test_fix
.../org/apache/metamodel/AbstractDataContext.java | 10 ++++----
.../apache/metamodel/AbstractUpdateCallback.java | 4 ++--
.../java/org/apache/metamodel/DataContext.java | 6 ++---
.../org/apache/metamodel/MetaModelException.java | 2 +-
.../java/org/apache/metamodel/MetaModelHelper.java | 4 ++--
.../metamodel/QueryPostprocessDataContext.java | 2 +-
.../metamodel/convert/ColumnTypeDetector.java | 2 +-
.../metamodel/create/ColumnCreationBuilder.java | 2 +-
.../apache/metamodel/data/RowPublisherDataSet.java | 4 ++--
.../apache/metamodel/data/WhereClauseBuilder.java | 2 +-
.../intercept/InterceptableUpdateCallback.java | 6 ++---
.../apache/metamodel/intercept/Interceptor.java | 2 +-
.../org/apache/metamodel/query/FilterClause.java | 2 +-
.../org/apache/metamodel/query/OperatorType.java | 4 ++--
.../apache/metamodel/query/OperatorTypeImpl.java | 2 +-
.../apache/metamodel/query/parser/QueryParser.java | 6 ++---
.../query/parser/QueryPartCollectionProcessor.java | 2 +-
.../metamodel/query/parser/QueryPartParser.java | 4 ++--
.../metamodel/query/parser/QueryPartProcessor.java | 4 ++--
.../org/apache/metamodel/schema/ColumnType.java | 2 +-
.../apache/metamodel/schema/ImmutableColumn.java | 2 +-
.../metamodel/schema/MutableRelationship.java | 2 +-
.../java/org/apache/metamodel/schema/Table.java | 4 ++--
.../org/apache/metamodel/util/FormatHelper.java | 2 +-
.../java/org/apache/metamodel/util/Resource.java | 2 +-
.../org/apache/metamodel/util/UnicodeWriter.java | 2 +-
.../org/apache/metamodel/query/SelectItemTest.java | 2 +-
.../org/apache/metamodel/schema/Java5Types.java | 2 +-
.../org/apache/metamodel/schema/Java6Types.java | 4 ++--
.../couchdb/CouchDbTableCreationBuilder.java | 2 +-
.../java/org/apache/metamodel/csv/CsvDataSet.java | 3 +--
.../metamodel/dynamodb/DynamoDbDataContext.java | 4 ++--
.../AbstractElasticSearchDataSet.java | 2 +-
.../nativeclient/ElasticSearchDataContextTest.java | 2 +-
.../apache/metamodel/excel/ExcelInsertBuilder.java | 3 +--
.../metamodel/excel/ExcelDataContextTest.java | 2 +-
.../metamodel/excel/ExcelUpdateCallbackTest.java | 3 +--
.../org/apache/metamodel/DataContextFactory.java | 28 +++++++++++-----------
.../apache/metamodel/hbase/CreateTableTest.java | 2 +-
.../org/apache/metamodel/hbase/DropTableTest.java | 2 +-
.../org/apache/metamodel/hbase/InsertRowTest.java | 4 ++--
.../org/apache/metamodel/jdbc/JdbcDataContext.java | 8 +++----
.../java/org/apache/metamodel/jdbc/JdbcUtils.java | 2 +-
.../metamodel/jdbc/RolledBackUpdateException.java | 2 +-
.../metamodel/jdbc/dialects/IQueryRewriter.java | 4 ++--
.../org/apache/metamodel/jdbc/JdbcColumnTest.java | 2 +-
.../org/apache/metamodel/jdbc/JdbcSchemaTest.java | 2 +-
.../apache/metamodel/jdbc/JdbcTestTemplates.java | 2 +-
.../java/org/apache/metamodel/jdbc/SqliteTest.java | 2 +-
.../integrationtests/SQLServerJtdsDriverTest.java | 2 +-
.../salesforce/SalesforceUpdateCallback.java | 2 +-
.../spring/DataContextFactoryBeanDelegate.java | 2 +-
.../apache/metamodel/xml/XmlDomDataContext.java | 4 ++--
.../apache/metamodel/xml/XmlSaxDataContext.java | 4 ++--
54 files changed, 93 insertions(+), 96 deletions(-)
