You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/02/21 13:29:48 UTC
[2/2] camel git commit: CAMEL-10870 - Allow to use negative
vendor-specific JDBC types in camel-sql stored procedure
CAMEL-10870 - Allow to use negative vendor-specific JDBC types in camel-sql stored procedure
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fa8aeb34
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fa8aeb34
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fa8aeb34
Branch: refs/heads/camel-2.18.x
Commit: fa8aeb34bd84c23d25c477cb10513e37906cdc48
Parents: 996bad3
Author: Antoine DESSAIGNE <an...@gmail.com>
Authored: Tue Feb 21 12:58:26 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Feb 21 14:29:39 2017 +0100
----------------------------------------------------------------------
.../template/generated/SSPTParserTokenManager.java | 4 ++--
.../component/sql/stored/template/grammar/sspt.jj | 2 +-
.../camel/component/sql/stored/ParserTest.java | 16 ++++++++++++++--
3 files changed, 17 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/fa8aeb34/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java
----------------------------------------------------------------------
diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java
index 8b3c31b..d93d9ff 100644
--- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java
+++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java
@@ -152,7 +152,7 @@ private int jjMoveNfa_0(int startState, int curPos)
kind = 9;
jjCheckNAdd(2);
}
- if ((0x3ff000000000000L & l) != 0L)
+ if ((0x3ff200000000000L & l) != 0L)
{
if (kind > 3)
kind = 3;
@@ -188,7 +188,7 @@ private int jjMoveNfa_0(int startState, int curPos)
jjCheckNAddTwoStates(16, 1);
break;
case 0:
- if ((0x3ff000000000000L & l) == 0L)
+ if ((0x3ff200000000000L & l) == 0L)
break;
if (kind > 3)
kind = 3;
http://git-wip-us.apache.org/repos/asf/camel/blob/fa8aeb34/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/grammar/sspt.jj
----------------------------------------------------------------------
diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/grammar/sspt.jj b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/grammar/sspt.jj
index bd3546f..85a2f27 100644
--- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/grammar/sspt.jj
+++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/grammar/sspt.jj
@@ -130,7 +130,7 @@ Token InputParameterSrc():
}
TOKEN: {
- <NUMBER: (["0"-"9"])+>
+ <NUMBER: (["-","0"-"9"])+>
}
TOKEN: {
http://git-wip-us.apache.org/repos/asf/camel/blob/fa8aeb34/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ParserTest.java
----------------------------------------------------------------------
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ParserTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ParserTest.java
index 5ed96c4..888a4d2 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ParserTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ParserTest.java
@@ -93,17 +93,29 @@ public class ParserTest extends CamelTestSupport {
}
@Test
- public void vendorSpeficSqlType() {
+ public void vendorSpecificPositiveSqlType() {
Template template = parser.parseTemplate("ADDNUMBERS2(1342 ${header.foo})");
assertEquals(1342, ((InputParameter) template.getParameterList().get(0)).getSqlType());
}
@Test
- public void vendorSpeficSqlTypeOut() {
+ public void vendorSpecificNegativeSqlType() {
+ Template template = parser.parseTemplate("ADDNUMBERS2(-1342 ${header.foo})");
+ assertEquals(-1342, ((InputParameter) template.getParameterList().get(0)).getSqlType());
+ }
+
+ @Test
+ public void vendorSpecificPositiveSqlTypeOut() {
Template template = parser.parseTemplate("ADDNUMBERS2(OUT 1342 h1)");
assertEquals(1342, ((OutParameter) template.getParameterList().get(0)).getSqlType());
}
+ @Test
+ public void vendorSpecificNegativeSqlTypeOut() {
+ Template template = parser.parseTemplate("ADDNUMBERS2(OUT -1342 h1)");
+ assertEquals(-1342, ((OutParameter) template.getParameterList().get(0)).getSqlType());
+ }
+
@Test
public void nableIssueSyntax() {