Merge lp:~massimo-siani/mariadb-java-client/CONJ-126 into lp:mariadb-java-client

[Massimo Siani]

Fix for CONJ-126:

PreparedStatement.setObject() returns IllegalParameterException: No '?' on that position

Added parsing for backticks in prepared statements.

=== modified file 'src/main/java/org/mariadb/jdbc/internal/common/Utils.java'
--- src/main/java/org/mariadb/jdbc/internal/common/Utils.java	2014-11-26 09:47:35 +0000
+++ src/main/java/org/mariadb/jdbc/internal/common/Utils.java	2014-12-10 09:31:23 +0000
@@ -68,7 +68,8 @@
         SlashStarComment, /* inside slash-star comment */
         Escape, /* found backslash */
         Parameter, /* parameter placeholder found */
-        EOLComment /* # comment, or // comment, or -- comment */
+        EOLComment, /* # comment, or // comment, or -- comment */
+        Backtick /* found backtick */
     };
 
 
@@ -149,6 +150,13 @@
                       if (state == LexState.Normal)
                           isParam = true;
                       break;
+                  case '`':
+                	  if (state == LexState.Backtick) {
+                		  state = LexState.Normal;
+                	  } else if (state == LexState.Normal) {
+                		  state = LexState.Backtick;
+                	  }
+                	  break;
               }
               lastChar = c;
               if (isParam)  {

=== modified file 'src/test/java/org/mariadb/jdbc/PreparedStatementTest.java'
--- src/test/java/org/mariadb/jdbc/PreparedStatementTest.java	2014-12-02 09:09:53 +0000
+++ src/test/java/org/mariadb/jdbc/PreparedStatementTest.java	2014-12-10 09:31:23 +0000
@@ -77,5 +77,34 @@
 		assertEquals(0, rs.getBigDecimal(1).toBigInteger().compareTo(bigT));
 		st.execute("DROP TABLE IF EXISTS `testBigintTable`");
 	}
+    
+    @Test
+    public void testPreparedStatementsWithQuotes() throws SQLException {
+        connection.createStatement().execute("DROP TABLE IF EXISTS backTicksPreparedStatements");
+        connection.createStatement().execute(
+                        "CREATE TABLE IF NOT EXISTS `backTicksPreparedStatements` ("
+                        + "`id` int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,"
+                        + "`SLIndex#orBV#` text,"
+                        + "`isM&M'sTasty?` bit(1) DEFAULT NULL,"
+                        + "`Seems:LikeParam?` bit(1) DEFAULT NULL,"
+                        + "`Webinar10-TM/ProjComp` text"
+                        + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
+
+        String query = "INSERT INTO backTicksPreparedStatements (`SLIndex#orBV#`,`Seems:LikeParam?`,`Webinar10-TM/ProjComp`,`isM&M'sTasty?`)"
+        		+ " VALUES (?,?,?,?)";
+        PreparedStatement ps = connection.prepareStatement(query);
+        ps.setString(1, "slIndex");
+        ps.setBoolean(2, false);
+        ps.setString(3, "webinar10");
+        ps.setBoolean(4, true);
+        ps.execute();
+        ResultSet rs = connection.createStatement().executeQuery("SELECT `SLIndex#orBV#`,`Seems:LikeParam?`,`Webinar10-TM/ProjComp`,`isM&M'sTasty?` FROM backTicksPreparedStatements");
+        assertTrue(rs.next());
+        assertEquals("slIndex", rs.getString(1));
+        assertEquals(false, rs.getBoolean(2));
+        assertEquals("webinar10", rs.getString(3));
+        assertEquals(true, rs.getBoolean(4));
+        connection.createStatement().execute("DROP TABLE IF EXISTS backTicksPreparedStatements");
+    }
 
 }