You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2017/08/29 08:35:31 UTC
[1/2] camel git commit: CAMEL-11716: added a test for error in
handling return parameters in db functions
Repository: camel
Updated Branches:
refs/heads/camel-2.19.x d9a573862 -> cd76cc0d3
CAMEL-11716: added a test for error in handling return parameters in db functions
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cd76cc0d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cd76cc0d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cd76cc0d
Branch: refs/heads/camel-2.19.x
Commit: cd76cc0d355d963909f6050f18105900f55f319a
Parents: 6a96755
Author: Andrea Tarocchi <at...@redhat.com>
Authored: Mon Aug 28 17:43:32 2017 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Aug 29 10:35:09 2017 +0200
----------------------------------------------------------------------
.../sql/stored/TemplateStoredProcedure.java | 1 -
.../sql/stored/SqlFunctionDataSourceTest.java | 83 ++++++++++++++++++++
2 files changed, 83 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/cd76cc0d/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/TemplateStoredProcedure.java
----------------------------------------------------------------------
diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/TemplateStoredProcedure.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/TemplateStoredProcedure.java
index 7ced2a3..dc80cfd 100644
--- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/TemplateStoredProcedure.java
+++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/TemplateStoredProcedure.java
@@ -78,4 +78,3 @@ public class TemplateStoredProcedure extends StoredProcedure {
return template;
}
}
-
http://git-wip-us.apache.org/repos/asf/camel/blob/cd76cc0d/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/SqlFunctionDataSourceTest.java
----------------------------------------------------------------------
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/SqlFunctionDataSourceTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/SqlFunctionDataSourceTest.java
new file mode 100644
index 0000000..6808647
--- /dev/null
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/SqlFunctionDataSourceTest.java
@@ -0,0 +1,83 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.sql.stored;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.impl.JndiRegistry;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
+
+
+public class SqlFunctionDataSourceTest extends CamelTestSupport {
+
+ private EmbeddedDatabase db;
+
+ @Before
+ public void setUp() throws Exception {
+ db = new EmbeddedDatabaseBuilder()
+ .setType(EmbeddedDatabaseType.DERBY).addScript("sql/storedProcedureTest.sql").build();
+ super.setUp();
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ super.tearDown();
+ db.shutdown();
+ }
+
+ @Test
+ public void shouldExecuteStoredProcedure() throws InterruptedException {
+ MockEndpoint mock = getMockEndpoint("mock:query");
+ mock.expectedMessageCount(1);
+
+ Map<String, Object> headers = new HashMap<>();
+ headers.put("num1", 1);
+ headers.put("num2", 2);
+ template.requestBodyAndHeaders("direct:query", null, headers);
+
+ assertMockEndpointsSatisfied();
+
+ Exchange exchange = mock.getExchanges().get(0);
+
+ assertEquals(Integer.valueOf(-1), exchange.getIn().getBody(Map.class).get("resultofsub"));
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ // required for the sql component
+ getContext().getComponent("sql-stored", SqlStoredComponent.class).setDataSource(db);
+
+ from("direct:query")
+ .to("sql-stored:SUBNUMBERS_FUNCTION(OUT INTEGER resultofsub, INTEGER ${header.num1},INTEGER ${header.num2})?function=true")
+ .to("mock:query");
+ }
+ };
+ }
+}
[2/2] camel git commit: CAMEL-11716: Fix sql-stored to return result
from function call
Posted by ac...@apache.org.
CAMEL-11716: Fix sql-stored to return result from function call
Conflicts:
components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/TemplateStoredProcedure.java
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6a96755a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6a96755a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6a96755a
Branch: refs/heads/camel-2.19.x
Commit: 6a96755a2dda59deceb8f6a044bf22234266bbe9
Parents: d9a5738
Author: Tomas Turek <tt...@redhat.com>
Authored: Wed Aug 23 13:28:32 2017 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Aug 29 10:35:09 2017 +0200
----------------------------------------------------------------------
.../sql/stored/TemplateStoredProcedure.java | 1 -
.../stored/CallableStatementWrapperTest.java | 22 +++++++++++++
.../sql/stored/TestStoredFunction.java | 34 ++++++++++++++++++++
.../test/resources/sql/storedProcedureTest.sql | 7 ++++
4 files changed, 63 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/6a96755a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/TemplateStoredProcedure.java
----------------------------------------------------------------------
diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/TemplateStoredProcedure.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/TemplateStoredProcedure.java
index c1bec3c..7ced2a3 100644
--- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/TemplateStoredProcedure.java
+++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/TemplateStoredProcedure.java
@@ -56,7 +56,6 @@ public class TemplateStoredProcedure extends StoredProcedure {
} else if (parameter instanceof OutParameter) {
OutParameter outParameter = (OutParameter) parameter;
declareParameter(new SqlOutParameter(outParameter.getOutValueMapKey(), outParameter.getSqlType()));
- setFunction(false);
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/6a96755a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/CallableStatementWrapperTest.java
----------------------------------------------------------------------
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/CallableStatementWrapperTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/CallableStatementWrapperTest.java
index 0bec974..1650c5b 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/CallableStatementWrapperTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/CallableStatementWrapperTest.java
@@ -71,6 +71,28 @@ public class CallableStatementWrapperTest extends CamelTestSupport {
}
@Test
+ public void shouldExecuteStoredFunction() throws Exception {
+ CallableStatementWrapperFactory factory = new CallableStatementWrapperFactory(jdbcTemplate, templateParser, true);
+
+ CallableStatementWrapper wrapper = new CallableStatementWrapper("SUBNUMBERS_FUNCTION"
+ + "(OUT INTEGER resultofsub, INTEGER ${header.v1},INTEGER ${header.v2})", factory);
+
+ final Exchange exchange = createExchangeWithBody(null);
+ exchange.getIn().setHeader("v1", 1);
+ exchange.getIn().setHeader("v2", 2);
+
+ wrapper.call(new WrapperExecuteCallback() {
+ @Override
+ public void execute(StatementWrapper statementWrapper) throws SQLException, DataAccessException {
+ statementWrapper.populateStatement(null, exchange);
+
+ Map resultOfQuery = (Map) statementWrapper.executeStatement();
+ Assert.assertEquals(-1, resultOfQuery.get("resultofsub"));
+ }
+ });
+ }
+
+ @Test
public void shouldExecuteNilacidProcedure() throws Exception {
CallableStatementWrapper wrapper = new CallableStatementWrapper("NILADIC()", factory);
http://git-wip-us.apache.org/repos/asf/camel/blob/6a96755a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/TestStoredFunction.java
----------------------------------------------------------------------
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/TestStoredFunction.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/TestStoredFunction.java
new file mode 100644
index 0000000..a66e2ce
--- /dev/null
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/TestStoredFunction.java
@@ -0,0 +1,34 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.sql.stored;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public final class TestStoredFunction {
+
+ private static final Logger LOG = LoggerFactory.getLogger(TestStoredFunction.class);
+
+
+ private TestStoredFunction() {
+ }
+
+ public static int subnumbers(int val1, int val2) {
+ LOG.info("calling subnumbers:{} - {}", val1, val2);
+ return val1 - val2;
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/6a96755a/components/camel-sql/src/test/resources/sql/storedProcedureTest.sql
----------------------------------------------------------------------
diff --git a/components/camel-sql/src/test/resources/sql/storedProcedureTest.sql b/components/camel-sql/src/test/resources/sql/storedProcedureTest.sql
index 108c2e1..a1a0750 100644
--- a/components/camel-sql/src/test/resources/sql/storedProcedureTest.sql
+++ b/components/camel-sql/src/test/resources/sql/storedProcedureTest.sql
@@ -32,3 +32,10 @@ CREATE PROCEDURE BATCHFN(VALUE1 CHAR(10))
LANGUAGE JAVA
EXTERNAL NAME
'org.apache.camel.component.sql.stored.TestStoredProcedure.batchfn';
+
+CREATE FUNCTION SUBNUMBERS_FUNCTION(VALUE1 INTEGER, VALUE2 INTEGER)
+ RETURNS INTEGER
+ PARAMETER STYLE JAVA
+ LANGUAGE JAVA
+ EXTERNAL NAME
+'org.apache.camel.component.sql.stored.TestStoredFunction.subnumbers';