[CONJ-1083] using "/*client prepare*/" prefix in place of "/*text*/"

mariadb-corporation · Jun 8, 2023 · ad61d55 · ad61d55
1 parent 00e1375
commit ad61d55
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/main/java/org/mariadb/jdbc/Connection.java b/src/main/java/org/mariadb/jdbc/Connection.java
@@ -141,7 +141,7 @@ public PreparedStatement prepareInternal(
       boolean useBinary)
       throws SQLException {
     checkNotClosed();
-    if (useBinary && !sql.startsWith("/*text*/")) {
+    if (useBinary && !sql.startsWith("/*client prepare*/")) {
       try {
         return new ServerPreparedStatement(
             NativeSql.parse(sql, client.getContext()),

diff --git a/src/test/java/org/mariadb/jdbc/integration/PreparedStatementTest.java b/src/test/java/org/mariadb/jdbc/integration/PreparedStatementTest.java
@@ -1271,15 +1271,14 @@ public void prepareStmtToString(java.sql.Connection conn, String prefix) throws
   public void textPrefix() throws SQLException {
     try (Connection con = createCon("&useServerPrepStmts&allowMultiQueries")) {
 
-      try (PreparedStatement prep = con.prepareStatement("/*text*/SET @name := ?; SELECT @name ")) {
+      try (PreparedStatement prep = con.prepareStatement("/*client prepare*/SET @name := ?; SELECT @name ")) {
         prep.setString(1, "test");
         prep.executeQuery();
         assertTrue(prep.getMoreResults(Statement.CLOSE_CURRENT_RESULT));
         ResultSet rs = prep.getResultSet();
         assertTrue(rs.next());
         assertEquals("test", rs.getString(1));
       }
-
     }
   }
 }