camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [2/2] camel git commit: CAMEL-10151: camel-sql - Query parameter count mismatch when using IN and other names in SQL
Date Sat, 16 Jul 2016 07:36:45 GMT
CAMEL-10151: camel-sql - Query parameter count mismatch when using IN and other names in SQL


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/745e9120
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/745e9120
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/745e9120

Branch: refs/heads/camel-2.17.x
Commit: 745e91204c1a74e90048351bb84b97de0446d8ee
Parents: e6ce94f
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Sat Jul 16 09:35:54 2016 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Sat Jul 16 09:36:32 2016 +0200

----------------------------------------------------------------------
 .../sql/DefaultSqlPrepareStatementStrategy.java |  16 +--
 .../component/sql/SqlProducerAndInTest.java     | 122 +++++++++++++++++++
 .../test/resources/sql/selectProjectsAndIn.sql  |   5 +
 3 files changed, 129 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/745e9120/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlPrepareStatementStrategy.java
----------------------------------------------------------------------
diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlPrepareStatementStrategy.java
b/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlPrepareStatementStrategy.java
index 49655c9..755ef21 100644
--- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlPrepareStatementStrategy.java
+++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlPrepareStatementStrategy.java
@@ -46,8 +46,7 @@ public class DefaultSqlPrepareStatementStrategy implements SqlPrepareStatementSt
     private static final Logger LOG = LoggerFactory.getLogger(DefaultSqlPrepareStatementStrategy.class);
     private static final Pattern REPLACE_IN_PATTERN = Pattern.compile("\\:\\?in\\:(\\w+|\\$\\{[^\\}]+\\})",
Pattern.MULTILINE);
     private static final Pattern REPLACE_PATTERN = Pattern.compile("\\:\\?\\w+|\\:\\?\\$\\{[^\\}]+\\}",
Pattern.MULTILINE);
-    private static final Pattern NAME_IN_PATTERN = Pattern.compile("\\:\\?(in\\:(\\w+|\\$\\{[^\\}]+\\}))",
Pattern.MULTILINE);
-    private static final Pattern NAME_PATTERN = Pattern.compile("\\:\\?(\\w+|\\$\\{[^\\}]+\\})",
Pattern.MULTILINE);
+    private static final Pattern NAME_PATTERN = Pattern.compile("\\:\\?((in\\:(\\w+|\\$\\{[^\\}]+\\}))|(\\w+|\\$\\{[^\\}]+\\}))",
Pattern.MULTILINE);
     private final char separator;
 
     public DefaultSqlPrepareStatementStrategy() {
@@ -165,25 +164,14 @@ public class DefaultSqlPrepareStatementStrategy implements SqlPrepareStatementSt
 
     private static final class NamedQueryParser {
 
-        private final Matcher inMatcher;
         private final Matcher matcher;
-        // which mode are we in
-        private boolean in;
-        private boolean name;
 
         private NamedQueryParser(String query) {
-            this.inMatcher = NAME_IN_PATTERN.matcher(query);
             this.matcher = NAME_PATTERN.matcher(query);
         }
 
         public String next() {
-            if (!name && inMatcher.find()) {
-                // turn on in mode, so we only match using in matcher next time
-                in = true;
-                return inMatcher.group(1);
-            } else if (!in && matcher.find()) {
-                // turn on name mode, so we only match using name matcher next time
-                name = true;
+            if (matcher.find()) {
                 return matcher.group(1);
             }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/745e9120/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAndInTest.java
----------------------------------------------------------------------
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAndInTest.java
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAndInTest.java
new file mode 100644
index 0000000..04576b1
--- /dev/null
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAndInTest.java
@@ -0,0 +1,122 @@
+/**
+ * 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;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+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 SqlProducerAndInTest extends CamelTestSupport {
+
+    EmbeddedDatabase db;
+
+    @Before
+    public void setUp() throws Exception {
+        db = new EmbeddedDatabaseBuilder()
+                .setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
+
+        super.setUp();
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        super.tearDown();
+
+        db.shutdown();
+    }
+
+    @Test
+    public void testQueryInArray() throws InterruptedException {
+        MockEndpoint mock = getMockEndpoint("mock:query");
+        mock.expectedMessageCount(1);
+
+        template.requestBodyAndHeader("direct:query", "ASF", "names", new String[]{"Camel",
"AMQ"});
+
+        assertMockEndpointsSatisfied();
+
+        List list = mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
+        assertEquals(2, list.size());
+        Map row = (Map) list.get(0);
+        assertEquals("Camel", row.get("PROJECT"));
+        row = (Map) list.get(1);
+        assertEquals("AMQ", row.get("PROJECT"));
+    }
+
+    @Test
+    public void testQueryInList() throws InterruptedException {
+        MockEndpoint mock = getMockEndpoint("mock:query");
+        mock.expectedMessageCount(1);
+
+        List<String> names = new ArrayList<String>();
+        names.add("Camel");
+        names.add("AMQ");
+
+        template.requestBodyAndHeader("direct:query", "ASF", "names", names);
+
+        assertMockEndpointsSatisfied();
+
+        List list = mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
+        assertEquals(2, list.size());
+        Map row = (Map) list.get(0);
+        assertEquals("Camel", row.get("PROJECT"));
+        row = (Map) list.get(1);
+        assertEquals("AMQ", row.get("PROJECT"));
+    }
+
+    @Test
+    public void testQueryInString() throws InterruptedException {
+        MockEndpoint mock = getMockEndpoint("mock:query");
+        mock.expectedMessageCount(1);
+
+        template.requestBodyAndHeader("direct:query", "ASF", "names", "Camel,AMQ");
+
+        assertMockEndpointsSatisfied();
+
+        List list = mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
+        assertEquals(2, list.size());
+        Map row = (Map) list.get(0);
+        assertEquals("Camel", row.get("PROJECT"));
+        row = (Map) list.get(1);
+        assertEquals("AMQ", row.get("PROJECT"));
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                // required for the sql component
+                getContext().getComponent("sql", SqlComponent.class).setDataSource(db);
+
+                from("direct:query")
+                    .to("sql:classpath:sql/selectProjectsAndIn.sql")
+                    .to("log:query")
+                    .to("mock:query");
+            }
+        };
+    }
+}

http://git-wip-us.apache.org/repos/asf/camel/blob/745e9120/components/camel-sql/src/test/resources/sql/selectProjectsAndIn.sql
----------------------------------------------------------------------
diff --git a/components/camel-sql/src/test/resources/sql/selectProjectsAndIn.sql b/components/camel-sql/src/test/resources/sql/selectProjectsAndIn.sql
new file mode 100644
index 0000000..5f78db9
--- /dev/null
+++ b/components/camel-sql/src/test/resources/sql/selectProjectsAndIn.sql
@@ -0,0 +1,5 @@
+-- this is a comment
+select *
+from projects
+where license = :#${body} and project in (:#in:names)
+order by id
\ No newline at end of file


Mime
View raw message