Minors.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/557ff861 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/557ff861 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/557ff861 Branch: refs/heads/ignite-3716 Commit: 557ff8617c1a840ab582c1d98f4497e1766bb7d3 Parents: 1587323 Author: vozerov-gridgain <[email protected]> Authored: Tue Aug 23 16:45:13 2016 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Tue Aug 23 16:45:13 2016 +0300 ---------------------------------------------------------------------- .../internal/processors/odbc/escape/OdbcEscapeUtils.java | 6 ++---- .../org/apache/ignite/testsuites/IgniteBasicTestSuite.java | 2 ++ 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/557ff861/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/escape/OdbcEscapeUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/escape/OdbcEscapeUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/escape/OdbcEscapeUtils.java index b26b334..4d8ca69 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/escape/OdbcEscapeUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/escape/OdbcEscapeUtils.java @@ -75,11 +75,9 @@ public class OdbcEscapeUtils { nested.add(nestedRes); - curPos += nestedRes.originalLength(); + curPos += nestedRes.originalLength() - 1; - plainPos = curPos; - - continue; + plainPos = curPos + 1; } } else if (curChar == '}') { http://git-wip-us.apache.org/repos/asf/ignite/blob/557ff861/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java index 52b6bfd..24cb8a7 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java @@ -43,6 +43,7 @@ import org.apache.ignite.internal.processors.closure.GridClosureProcessorSelfTes import org.apache.ignite.internal.processors.continuous.GridEventConsumeSelfTest; import org.apache.ignite.internal.processors.continuous.GridMessageListenSelfTest; import org.apache.ignite.internal.processors.odbc.OdbcProcessorValidationSelfTest; +import org.apache.ignite.internal.processors.odbc.OdbcScalarFunctionEscapeSequenceTest; import org.apache.ignite.internal.processors.service.ClosureServiceClientsNodesTest; import org.apache.ignite.internal.product.GridProductVersionSelfTest; import org.apache.ignite.internal.util.nio.IgniteExceptionInNioWorkerSelfTest; @@ -128,6 +129,7 @@ public class IgniteBasicTestSuite extends TestSuite { suite.addTestSuite(IgniteExceptionInNioWorkerSelfTest.class); suite.addTestSuite(IgniteLocalNodeMapBeforeStartTest.class); suite.addTestSuite(OdbcProcessorValidationSelfTest.class); + suite.addTestSuite(OdbcScalarFunctionEscapeSequenceTest.class); GridTestUtils.addTestIfNeeded(suite, DynamicProxySerializationMultiJvmSelfTest.class, ignoredTests);
