Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

fixed issue#949

Browse Source
This commit is contained in:
zhujunxxxxx
2015-09-21 21:24:22 +08:00
parent dc45cd0a92
commit 1150f45f39
7 changed files with 158 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/stmt/SQLServerExecStatement.java
+40 -7
View File
@@ -1,8 +1,3 @@
package com.alibaba.druid.sql.dialect.sqlserver.ast.stmt;
import java.util.ArrayList;
import java.util.List;
/*
* Copyright 1999-2101 Alibaba Group Holding Ltd.
*
@@ -18,6 +13,11 @@ import java.util.List;
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.alibaba.druid.sql.dialect.sqlserver.ast.stmt;
import java.util.ArrayList;
import java.util.List;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.ast.SQLName;
import com.alibaba.druid.sql.dialect.sqlserver.ast.SQLServerObjectImpl;
@@ -28,7 +28,7 @@ public class SQLServerExecStatement extends SQLServerObjectImpl implements SQLSe
private SQLName returnStatus;
private SQLName moduleName;
private List<SQLExpr> parameters = new ArrayList<SQLExpr>();
private List<SQLServerParameter> parameters = new ArrayList<SQLServerParameter>();
private String dbType;
public SQLName getModuleName() {
@@ -39,7 +39,7 @@ public class SQLServerExecStatement extends SQLServerObjectImpl implements SQLSe
this.moduleName = moduleName;
}
public List<SQLExpr> getParameters() {
public List<SQLServerParameter> getParameters() {
return parameters;
}
@@ -67,4 +67,37 @@ public class SQLServerExecStatement extends SQLServerObjectImpl implements SQLSe
public void setDbType(String dbType) {
this.dbType = dbType;
}
/**
*
* @Description: SQLServer execute Parameter statement
* @author zz email:455910092@qq.com
* @date 2015-9-20
* @version V1.0
*/
public static class SQLServerParameter extends SQLServerObjectImpl
{
private SQLExpr expr;
private boolean type;//sql server 支持参数只有input 和 output 两种
public SQLExpr getExpr() {
return expr;
}
public void setExpr(SQLExpr expr) {
this.expr = expr;
}
public boolean getType() {
return type;
}
public void setType(boolean type) {
this.type = type;
}
@Override
public void accept0(SQLServerASTVisitor visitor) {
if (visitor.visit(this)) {
acceptChild(visitor, expr);
}
visitor.endVisit(this);
}
}
}
src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SQLServerStatementParser.java
+45 -3
View File
@@ -15,9 +15,12 @@
*/
package com.alibaba.druid.sql.dialect.sqlserver.parser;
import java.util.Collection;
import java.util.List;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.ast.SQLName;
import com.alibaba.druid.sql.ast.SQLObject;
import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
import com.alibaba.druid.sql.ast.expr.SQLQueryExpr;
@@ -43,6 +46,7 @@ import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerSetStatement;
import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerSetTransactionIsolationLevelStatement;
import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerUpdateStatement;
import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerWaitForStatement;
import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerExecStatement.SQLServerParameter;
import com.alibaba.druid.sql.parser.Lexer;
import com.alibaba.druid.sql.parser.ParserException;
import com.alibaba.druid.sql.parser.SQLSelectParser;
@@ -76,7 +80,7 @@ public class SQLServerStatementParser extends SQLStatementParser {
SQLServerExecStatement execStmt = new SQLServerExecStatement();
if (lexer.token() == Token.LPAREN) {
lexer.nextToken();
this.exprParser.exprList(execStmt.getParameters(), execStmt);
this.parseExecParameter(execStmt.getParameters(), execStmt);
accept(Token.RPAREN);
} else {
SQLName sqlNameName = this.exprParser.name();
@@ -88,8 +92,8 @@ public class SQLServerStatementParser extends SQLStatementParser {
} else {
execStmt.setModuleName(sqlNameName);
}
this.exprParser.exprList(execStmt.getParameters(), execStmt);
this.parseExecParameter(execStmt.getParameters(), execStmt);
}
statementList.add(execStmt);
return true;
@@ -122,6 +126,44 @@ public class SQLServerStatementParser extends SQLStatementParser {
return false;
}
/**
* SQLServer parse Parameter statement support out type
* @author zz email:455910092@qq.com
* @date 2015-9-20
*/
public void parseExecParameter(Collection<SQLServerParameter> exprCol, SQLObject parent)
{
if (lexer.token() == Token.RPAREN || lexer.token() == Token.RBRACKET) {
return;
}
if (lexer.token() == Token.EOF) {
return;
}
SQLServerParameter param=new SQLServerParameter();
SQLExpr expr=this.exprParser.expr();
expr.setParent(parent);
param.setExpr(expr);
if(lexer.token()==Token.OUT)
{
param.setType(true);
accept(Token.OUT);
}
exprCol.add(param);
while (lexer.token() == Token.COMMA) {
lexer.nextToken();
param=new SQLServerParameter();
expr=this.exprParser.expr();
expr.setParent(parent);
param.setExpr(expr);
if(lexer.token()==Token.OUT)
{
param.setType(true);
accept(Token.OUT);
}
exprCol.add(param);
}
}
public SQLStatement parseDeclare() {
this.accept(Token.DECLARE);
src/main/java/com/alibaba/druid/sql/dialect/sqlserver/visitor/SQLServerASTVisitor.java
+5
View File
@@ -26,6 +26,7 @@ import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerBlockStatement;
import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerCommitStatement;
import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerDeclareStatement;
import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerExecStatement;
import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerExecStatement.SQLServerParameter;
import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerIfStatement;
import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerIfStatement.Else;
import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerInsertStatement;
@@ -117,5 +118,9 @@ public interface SQLServerASTVisitor extends SQLASTVisitor {
boolean visit(SQLServerWaitForStatement x);
void endVisit(SQLServerWaitForStatement x);
boolean visit(SQLServerParameter x);
void endVisit(SQLServerParameter x);
}
src/main/java/com/alibaba/druid/sql/dialect/sqlserver/visitor/SQLServerASTVisitorAdapter.java
+13
View File
@@ -26,6 +26,7 @@ import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerBlockStatement;
import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerCommitStatement;
import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerDeclareStatement;
import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerExecStatement;
import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerExecStatement.SQLServerParameter;
import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerIfStatement;
import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerIfStatement.Else;
import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerInsertStatement;
@@ -238,4 +239,16 @@ public class SQLServerASTVisitorAdapter extends SQLASTVisitorAdapter implements
}
@Override
public boolean visit(SQLServerParameter x) {
// TODO Auto-generated method stub
return false;
}
@Override
public void endVisit(SQLServerParameter x) {
// TODO Auto-generated method stub
}
}
src/main/java/com/alibaba/druid/sql/dialect/sqlserver/visitor/SQLServerOutputVisitor.java
+18
View File
@@ -35,6 +35,7 @@ import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerBlockStatement;
import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerCommitStatement;
import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerDeclareStatement;
import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerExecStatement;
import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerExecStatement.SQLServerParameter;
import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerIfStatement;
import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerIfStatement.Else;
import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerInsertStatement;
@@ -690,4 +691,21 @@ public class SQLServerOutputVisitor extends SQLASTOutputVisitor implements SQLSe
public void endVisit(SQLServerWaitForStatement x) {
}
@Override
public boolean visit(SQLServerParameter x) {
// TODO Auto-generated method stub
x.getExpr().accept(this);
if(x.getType())
{
print(" OUT");
}
return false;
}
@Override
public void endVisit(SQLServerParameter x) {
// TODO Auto-generated method stub
}
}
src/main/java/com/alibaba/druid/sql/dialect/sqlserver/visitor/SQLServerSchemaStatVisitor.java
+13
View File
@@ -33,6 +33,7 @@ import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerBlockStatement;
import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerCommitStatement;
import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerDeclareStatement;
import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerExecStatement;
import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerExecStatement.SQLServerParameter;
import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerIfStatement;
import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerIfStatement.Else;
import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerInsertStatement;
@@ -274,4 +275,16 @@ public class SQLServerSchemaStatVisitor extends SchemaStatVisitor implements SQL
}
@Override
public boolean visit(SQLServerParameter x) {
// TODO Auto-generated method stub
return false;
}
@Override
public void endVisit(SQLServerParameter x) {
// TODO Auto-generated method stub
}
}