Fixed and tested some scenarios where the malformed SQL is inputed

lightblue-platform · Feb 4, 2015 · f9cc5bc · f9cc5bc
1 parent 78c93a2
commit f9cc5bc
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/.../src/main/java/com/redhat/lightblue/metadata/rdbms/converter/NamedParameterStatement.java b/.../src/main/java/com/redhat/lightblue/metadata/rdbms/converter/NamedParameterStatement.java
@@ -93,7 +93,7 @@ private int findColon(int start, StringBuffer query) {
             }
 
             // get parameter
-            if (c == ':' && (query.charAt(i + 1) != '=')) {
+            if (c == ':' && query.length() > i+1 && (query.charAt(i + 1) != '=') && (query.charAt(i + 1) != ' ')) {
                 return i;
             }
         }

diff --git a/...com/redhat/lightblue/metadata/rdbms/converter/NamedParameterStatementRegressionTests.java b/...com/redhat/lightblue/metadata/rdbms/converter/NamedParameterStatementRegressionTests.java
@@ -86,6 +86,21 @@ public void testSQLGeneration() throws Exception {
             assertFalse(nps.processedQuery.contains(":parameter"));
         }
 
+        //malformed SQL
+        {
+            connection = new MyConnection();
+            connection.myPreparedStatement = new MyPreparedStatement();
+            nps = new SQLConverter(connection,"select:");
+            assertEquals("select:", nps.processedQuery);
+            assertFalse(nps.processedQuery.contains(":parameter"));
+        }
+        {
+            connection = new MyConnection();
+            connection.myPreparedStatement = new MyPreparedStatement();
+            nps = new SQLConverter(connection,"select : "); // '=' and ' ' are ignored, so it will not convert to '?'
+            assertEquals("select : ", nps.processedQuery);
+            assertFalse(nps.processedQuery.contains(":parameter"));
+        }
 
     }