Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions core/src/main/java/com/alibaba/druid/sql/parser/Lexer.java
Original file line number Diff line number Diff line change
Expand Up @@ -1677,10 +1677,6 @@ private void scanOperator() {
scanChar();
scanChar();
token = Token.LTLT;
} else if (c1 == '@') {
scanChar();
scanChar();
token = Token.LT_MONKEYS_AT;
} else if (c1 == '-' && charAt(pos + 2) == '>') {
scanChar();
scanChar();
Expand Down
57 changes: 57 additions & 0 deletions core/src/test/java/com/alibaba/druid/mysql/MysqlVarantRefTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,23 @@
import com.alibaba.druid.DbType;
import com.alibaba.druid.sql.SQLUtils;
import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr;
import com.alibaba.druid.sql.ast.expr.SQLBinaryOperator;
import com.alibaba.druid.sql.ast.expr.SQLVariantRefExpr;
import com.alibaba.druid.sql.ast.statement.SQLSetStatement;
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSetTransactionStatement;
import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitorAdapter;
import com.alibaba.druid.sql.parser.SQLStatementParser;
import com.alibaba.druid.util.JdbcConstants;
import org.junit.Assert;
import org.junit.Test;

import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.BinaryOperator;

/**
* Created by szf on 2017/11/16.
Expand Down Expand Up @@ -150,4 +157,54 @@ public void test6() {
Assert.assertTrue(resultExpr5.isSession());
}

@Test
public void test7() {
// in this case, < @sid is recognized as < operator and user-defined variables@sid
String sql = "set @sid=1;select * from aaa where id < @sid; ";
SQLStatementParser parser = new MySqlStatementParser(sql);
List<SQLStatement> stmtList = parser.parseStatementList();

SQLSetStatement result0 = (SQLSetStatement) stmtList.get(0);
SQLVariantRefExpr resultExpr0 = (SQLVariantRefExpr) result0.getItems().get(0).getTarget();
Assert.assertEquals("@sid", resultExpr0.getName());

AtomicReference<SQLVariantRefExpr> resultExpr1Ref = new AtomicReference<>();
AtomicInteger variableCnt = new AtomicInteger(0);
AtomicInteger arrayContainerByOperatorCnt = new AtomicInteger(0);

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

可补充更多边界场景,如带空格、注释、复杂表达式等,提升健壮性。
建议补充负面测试,如非法 SQL、混合操作符等。

MySqlASTVisitor visitor = new MySqlASTVisitorAdapter() {
@Override
public boolean visit(SQLVariantRefExpr x) {
resultExpr1Ref.set(x);
variableCnt.addAndGet(1);
return super.visit(x);
}

@Override
public boolean visit(SQLBinaryOpExpr x) {
if(SQLBinaryOperator.Array_ContainedBy.equals(x.getOperator())) {
arrayContainerByOperatorCnt.addAndGet(1);
}
return super.visit(x);
}
};
stmtList.get(1).accept(visitor);


Assert.assertEquals(1, variableCnt.get());
Assert.assertEquals(0, arrayContainerByOperatorCnt.get());
Assert.assertEquals("@sid", resultExpr1Ref.get().getName());

// in this case, <@ is recognized as <@, instead of < user-defined variables@sid
String sql2 = "select * from aaa where id <@ sid; ";
SQLStatementParser parser2 = new MySqlStatementParser(sql2);

List<SQLStatement> stmtList2 = parser2.parseStatementList();
variableCnt.set(0);
arrayContainerByOperatorCnt.set(0);
resultExpr1Ref.set(null);
stmtList2.get(0).accept(visitor);
Assert.assertEquals(0, variableCnt.get());
Assert.assertEquals(1, arrayContainerByOperatorCnt.get());
Assert.assertNull(resultExpr1Ref.get());
}
}