metamodel git commit: METAMODEL-218: Fixed
Repository: metamodel
Updated Branches:
refs/heads/master 2d291f49d -> 75abac663
METAMODEL-218: Fixed
Fixes #76
Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/75abac66
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/75abac66
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/75abac66
Branch: refs/heads/master
Commit: 75abac66380069edb1351327d994f1ea8895c4a6
Parents: 2d291f4
Author: Kasper Sørensen
Authored: Wed Dec 9 16:13:40 2015 +0100
Committer: Kasper Sørensen
Committed: Wed Dec 9 16:13:40 2015 +0100
--
CHANGES.md | 1 +
.../org/apache/metamodel/jdbc/dialects/DefaultQueryRewriter.java | 4 ++--
.../test/java/org/apache/metamodel/jdbc/JdbcTestTemplates.java | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/metamodel/blob/75abac66/CHANGES.md
--
diff --git a/CHANGES.md b/CHANGES.md
index 384c8b7..13629d0 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -8,6 +8,7 @@
* [METAMODEL-195] - Added new function MAP_VALUE which allows extracting a
nested value from within a key/value map field.
* [METAMODEL-15] - Query parser support for table names with space.
Delimitters can be double quote or square brackets.
* [METAMODEL-215] - Improved the capability of NumberComparator to support
Integer, Long, Double, BigInteger and other built-in Number classes.
+ * [METAMODEL-218] - Fixed conversion of STRING and NUMBER types to
database-specific types in JDBC module.
* [METAMODEL-205] - Added validation of Excel sheet name before attempting to
create table (sheet).
### Apache MetaModel 4.4.1
http://git-wip-us.apache.org/repos/asf/metamodel/blob/75abac66/jdbc/src/main/java/org/apache/metamodel/jdbc/dialects/DefaultQueryRewriter.java
--
diff --git
a/jdbc/src/main/java/org/apache/metamodel/jdbc/dialects/DefaultQueryRewriter.java
b/jdbc/src/main/java/org/apache/metamodel/jdbc/dialects/DefaultQueryRewriter.java
index cbdb3c5..fcefb9f 100644
---
a/jdbc/src/main/java/org/apache/metamodel/jdbc/dialects/DefaultQueryRewriter.java
+++
b/jdbc/src/main/java/org/apache/metamodel/jdbc/dialects/DefaultQueryRewriter.java
@@ -88,11 +88,11 @@ public class DefaultQueryRewriter extends
AbstractQueryRewriter {
public String rewriteColumnType(ColumnType columnType, Integer columnSize)
{
if (columnType == ColumnType.STRING) {
// convert STRING to VARCHAR as the default SQL type for strings
-rewriteColumnType(ColumnType.VARCHAR, columnSize);
+return rewriteColumnType(ColumnType.VARCHAR, columnSize);
}
if (columnType == ColumnType.NUMBER) {
// convert NUMBER to FLOAT as the default SQL type for numbers
-rewriteColumnType(ColumnType.FLOAT, columnSize);
+return rewriteColumnType(ColumnType.FLOAT, columnSize);
}
return super.rewriteColumnType(columnType, columnSize);
}
http://git-wip-us.apache.org/repos/asf/metamodel/blob/75abac66/jdbc/src/test/java/org/apache/metamodel/jdbc/JdbcTestTemplates.java
--
diff --git
a/jdbc/src/test/java/org/apache/metamodel/jdbc/JdbcTestTemplates.java
b/jdbc/src/test/java/org/apache/metamodel/jdbc/JdbcTestTemplates.java
index 2d5840f..f7d0cf2 100644
--- a/jdbc/src/test/java/org/apache/metamodel/jdbc/JdbcTestTemplates.java
+++ b/jdbc/src/test/java/org/apache/metamodel/jdbc/JdbcTestTemplates.java
@@ -549,7 +549,7 @@ public class JdbcTestTemplates {
dataContext.executeUpdate(new CreateTable(defaultSchema,
testTableName).withColumn("mykey")
.ofType(ColumnType.INTEGER).nullable(false).asPrimaryKey().withColumn("name")
-.ofType(ColumnType.VARCHAR).ofSize(20));
+.ofType(ColumnType.STRING).ofSize(20));
try {
final Table table = defaultSchema.getTableByName(testTableName);
assertNotNull(table);
metamodel git commit: Added line about METAMODEL-205 in CHANGES.md
Repository: metamodel Updated Branches: refs/heads/master 272461944 -> 2d291f49d Added line about METAMODEL-205 in CHANGES.md Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/2d291f49 Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/2d291f49 Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/2d291f49 Branch: refs/heads/master Commit: 2d291f49d41f7caf939f2703ccbb2017733ecc1c Parents: 2724619 Author: Kasper Sørensen Authored: Wed Dec 9 11:51:10 2015 +0100 Committer: Kasper Sørensen Committed: Wed Dec 9 11:51:10 2015 +0100 -- CHANGES.md | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/metamodel/blob/2d291f49/CHANGES.md -- diff --git a/CHANGES.md b/CHANGES.md index 2baa60f..384c8b7 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -8,6 +8,7 @@ * [METAMODEL-195] - Added new function MAP_VALUE which allows extracting a nested value from within a key/value map field. * [METAMODEL-15] - Query parser support for table names with space. Delimitters can be double quote or square brackets. * [METAMODEL-215] - Improved the capability of NumberComparator to support Integer, Long, Double, BigInteger and other built-in Number classes. + * [METAMODEL-205] - Added validation of Excel sheet name before attempting to create table (sheet). ### Apache MetaModel 4.4.1
metamodel git commit: METAMODEL-195: Fixed
Repository: metamodel
Updated Branches:
refs/heads/master 67ef25f38 -> 272461944
METAMODEL-195: Fixed
Fixes #70
Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/27246194
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/27246194
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/27246194
Branch: refs/heads/master
Commit: 272461944aba90ea4b6fd5538dbd6c93a9c28bb7
Parents: 67ef25f
Author: Kasper Sørensen
Authored: Wed Dec 9 11:44:41 2015 +0100
Committer: Kasper Sørensen
Committed: Wed Dec 9 11:44:41 2015 +0100
--
CHANGES.md | 1 +
.../cassandra/CassandraDataContextTest.java | 3 +-
.../metamodel/data/ScalarFunctionRow.java | 2 +-
.../metamodel/query/AbstractQueryClause.java| 5 +
.../org/apache/metamodel/query/FromClause.java | 8 +-
.../apache/metamodel/query/FunctionType.java| 1 +
.../metamodel/query/FunctionTypeFactory.java| 2 +
.../metamodel/query/MapValueFunction.java | 57
.../java/org/apache/metamodel/query/Query.java | 24 +++-
.../org/apache/metamodel/query/QueryClause.java | 2 +
.../apache/metamodel/query/ScalarFunction.java | 4 +-
.../org/apache/metamodel/query/SelectItem.java | 137 ---
.../metamodel/query/ToBooleanFunction.java | 2 +-
.../apache/metamodel/query/ToDateFunction.java | 2 +-
.../metamodel/query/ToNumberFunction.java | 2 +-
.../metamodel/query/ToStringFunction.java | 2 +-
.../builder/FunctionSelectBuilderImpl.java | 56
.../query/builder/GroupedQueryBuilderImpl.java | 8 +-
.../query/builder/SatisfiedFromBuilder.java | 10 +-
.../builder/SatisfiedFromBuilderCallback.java | 46 +--
.../query/parser/SelectItemParser.java | 38 +++--
.../QueryPostprocessDataContextTest.java| 2 +-
.../ConvertedDataSetInterceptorTest.java| 111 +++
.../metamodel/query/MapValueFunctionTest.java | 57
.../metamodel/query/parser/QueryParserTest.java | 42 --
.../ElasticSearchDataContextTest.java | 14 +-
.../rest/JestElasticSearchDataContextTest.java | 3 +-
.../org/apache/metamodel/jdbc/DerbyTest.java| 2 +-
.../metamodel/json/JsonDataContextTest.java | 44 +-
29 files changed, 520 insertions(+), 167 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/metamodel/blob/27246194/CHANGES.md
--
diff --git a/CHANGES.md b/CHANGES.md
index d21df5a..2baa60f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -5,6 +5,7 @@
* [METAMODEL-207] - Ensured the serializability of the SingleLineCsvRow class.
* [METAMODEL-211] - Fixed a bug related to lookup by primary key (_id) on
MongoDB.
* [METAMODEL-216] - Added new aggregate functions: FIRST, LAST and RANDOM.
+ * [METAMODEL-195] - Added new function MAP_VALUE which allows extracting a
nested value from within a key/value map field.
* [METAMODEL-15] - Query parser support for table names with space.
Delimitters can be double quote or square brackets.
* [METAMODEL-215] - Improved the capability of NumberComparator to support
Integer, Long, Double, BigInteger and other built-in Number classes.
http://git-wip-us.apache.org/repos/asf/metamodel/blob/27246194/cassandra/src/test/java/org/apache/metamodel/cassandra/CassandraDataContextTest.java
--
diff --git
a/cassandra/src/test/java/org/apache/metamodel/cassandra/CassandraDataContextTest.java
b/cassandra/src/test/java/org/apache/metamodel/cassandra/CassandraDataContextTest.java
index a52d171..4921639 100644
---
a/cassandra/src/test/java/org/apache/metamodel/cassandra/CassandraDataContextTest.java
+++
b/cassandra/src/test/java/org/apache/metamodel/cassandra/CassandraDataContextTest.java
@@ -33,6 +33,7 @@ import org.apache.metamodel.data.DataSet;
import org.apache.metamodel.data.DataSetTableModel;
import org.apache.metamodel.data.FilteredDataSet;
import org.apache.metamodel.query.Query;
+import org.apache.metamodel.query.parser.QueryParserException;
import org.apache.metamodel.schema.ColumnType;
import org.apache.metamodel.schema.Table;
import org.cassandraunit.utils.EmbeddedCassandraServerHelper;
@@ -178,7 +179,7 @@ public class CassandraDataContextTest {
boolean thrown = false;
try {
dc.query().from(testTableName).select("nonExistingField").execute();
-} catch (IllegalArgumentException IAex) {
+} catch (QueryParserException ex) {
thrown = true;
}
assertTrue(thrown);
http://git-wip-us.apache.org/repos/asf/metamodel/blob/27246194/core/src/main/java/org/apache/metamodel/data/ScalarFunctionRow.ja
