You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metamodel.apache.org by ka...@apache.org on 2015/10/04 20:15:32 UTC
metamodel git commit: METAMODEL-157: Fixed Fixes #52
Repository: metamodel
Updated Branches:
refs/heads/master 237f45477 -> cda516b16
METAMODEL-157: Fixed
Fixes #52
Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/cda516b1
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/cda516b1
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/cda516b1
Branch: refs/heads/master
Commit: cda516b16a30258d7ec07da0f336851f40bdda7f
Parents: 237f454
Author: Kasper Sørensen <i....@gmail.com>
Authored: Sun Oct 4 20:15:27 2015 +0200
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Sun Oct 4 20:15:27 2015 +0200
----------------------------------------------------------------------
CHANGES.md | 1 +
.../org/apache/metamodel/cassandra/CassandraSimpleClient.java | 4 +++-
.../main/java/org/apache/metamodel/jdbc/JdbcDeleteBuilder.java | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metamodel/blob/cda516b1/CHANGES.md
----------------------------------------------------------------------
diff --git a/CHANGES.md b/CHANGES.md
index e7828cc..5370afb 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,7 @@
* [METAMODEL-184] - ElasticSearch querying with "IS NULL" and "IS NOT NULL" now uses MissingFilter and ExistsFilter.
* [METAMODEL-190] - Improved decimal number support in Excel module.
* [METAMODEL-191] - Resolved a number of dependency conflicts/overlaps when combining multiple MetaModel modules.
+ * [METAMODEL-157] - Fixed an issue in DELETE FROM statements with WHERE clauses requiring client-side data type conversion on JDBC databases.
### Apache MetaModel 4.3.6
http://git-wip-us.apache.org/repos/asf/metamodel/blob/cda516b1/cassandra/src/test/java/org/apache/metamodel/cassandra/CassandraSimpleClient.java
----------------------------------------------------------------------
diff --git a/cassandra/src/test/java/org/apache/metamodel/cassandra/CassandraSimpleClient.java b/cassandra/src/test/java/org/apache/metamodel/cassandra/CassandraSimpleClient.java
index e12914b..c3b35ca 100644
--- a/cassandra/src/test/java/org/apache/metamodel/cassandra/CassandraSimpleClient.java
+++ b/cassandra/src/test/java/org/apache/metamodel/cassandra/CassandraSimpleClient.java
@@ -46,6 +46,8 @@ public class CassandraSimpleClient {
}
public void close() {
- cluster.close();
+ if (cluster != null) {
+ cluster.close();
+ }
}
}
http://git-wip-us.apache.org/repos/asf/metamodel/blob/cda516b1/jdbc/src/main/java/org/apache/metamodel/jdbc/JdbcDeleteBuilder.java
----------------------------------------------------------------------
diff --git a/jdbc/src/main/java/org/apache/metamodel/jdbc/JdbcDeleteBuilder.java b/jdbc/src/main/java/org/apache/metamodel/jdbc/JdbcDeleteBuilder.java
index 958215d..bf6aaf2 100644
--- a/jdbc/src/main/java/org/apache/metamodel/jdbc/JdbcDeleteBuilder.java
+++ b/jdbc/src/main/java/org/apache/metamodel/jdbc/JdbcDeleteBuilder.java
@@ -70,7 +70,7 @@ final class JdbcDeleteBuilder extends AbstractRowDeletionBuilder {
for (FilterItem whereItem : whereItems) {
if (JdbcUtils.isPreparedParameterCandidate(whereItem)) {
Object operand = whereItem.getOperand();
- st.setObject(valueCounter, operand);
+ JdbcUtils.setStatementValue(st, valueCounter, whereItem.getSelectItem().getColumn(), operand);
valueCounter++;
}
}