diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlLexer.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlLexer.java index 4b954b3c6d..3b4cda71c8 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlLexer.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlLexer.java @@ -335,8 +335,8 @@ public class MySqlLexer extends Lexer { } switch (ch) { - case '\0': - putChar(ch = '\0'); + case '0': + putChar('\0'); break; case '\'': putChar('\''); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java index 98076c2a27..0cce4a8d54 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java @@ -630,8 +630,26 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV print('\''); String text = x.getText(); - text = text.replaceAll("'", "''"); - text = text.replace("\\", "\\\\"); + + StringBuilder buf = new StringBuilder(text.length()); + for (int i = 0; i < text.length(); ++i) { + char ch = text.charAt(i); + if (ch == '\'') { + buf.append('\''); + buf.append('\''); + } else if (ch == '\\') { + buf.append('\\'); + buf.append('\\'); + } else if (ch == '\0') { + buf.append('\\'); + buf.append('0'); + } else { + buf.append(ch); + } + } + if (buf.length() != text.length()) { + text = buf.toString(); + } print0(text); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlInsertTest_12.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlInsertTest_12.java new file mode 100644 index 0000000000..571f1ddbd1 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlInsertTest_12.java @@ -0,0 +1,55 @@ +/* + * Copyright 1999-2101 Alibaba Group Holding Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.alibaba.druid.bvt.sql.mysql; + +import java.util.List; + +import org.junit.Assert; + +import com.alibaba.druid.sql.MysqlTest; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlInsertStatement; +import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; +import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; + +public class MySqlInsertTest_12 extends MysqlTest { + + public void test_insert_rollback_on_fail() throws Exception { + String sql = "insert into t1 values('A\\0\\0\\0B')"; + + MySqlStatementParser parser = new MySqlStatementParser(sql); + parser.setParseCompleteValues(false); + parser.setParseValuesSize(3); + List statementList = parser.parseStatementList(); + SQLStatement stmt = statementList.get(0); + + MySqlInsertStatement insertStmt = (MySqlInsertStatement) stmt; + + Assert.assertEquals(1, insertStmt.getValuesList().size()); + Assert.assertEquals(1, insertStmt.getValues().getValues().size()); + Assert.assertEquals(0, insertStmt.getColumns().size()); + Assert.assertEquals(1, statementList.size()); + + MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); + stmt.accept(visitor); + + String formatSql = "INSERT INTO t1" + + "\nVALUES ('A\\0\\0\\0B')"; + Assert.assertEquals(formatSql, SQLUtils.toMySqlString(insertStmt)); + } + +}