From 3410f77f68f5a584ddf80533bbbf38b1e30c125a Mon Sep 17 00:00:00 2001 From: renfufei Date: Fri, 26 Aug 2016 11:47:54 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E7=9A=84=E8=BE=93=E5=85=A5=E6=A1=86=E6=94=AF=E6=8C=81=E5=9B=9E?= =?UTF-8?q?=E8=BD=A6=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/support/http/resources/login.html | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/main/resources/support/http/resources/login.html b/src/main/resources/support/http/resources/login.html index 3031dc74e6..9e5f7351c8 100644 --- a/src/main/resources/support/http/resources/login.html +++ b/src/main/resources/support/http/resources/login.html @@ -55,7 +55,7 @@ The username or password you entered is incorrect.
- +
@@ -83,16 +83,29 @@ else { $("#alertInfo").show(); $("#loginForm")[0].reset(); + $("input[name=loginUsername]").focus(); } }, dataType: "text" }); - } + }, + unamecr : function(e) { + if(e.which == 13) { // 回车键事件 + $("input[name=loginPassword]").focus(); + } + }, + upasscr : function(e) { + if(e.which == 13) { // 回车键事件 + $("#loginBtn").click(); + } + } } }(); $(document).ready(function() { $("#loginBtn").click(druid.login.login); + $("input[name=loginUsername]").keypress(druid.login.unamecr); + $("input[name=loginPassword]").keypress(druid.login.upasscr); }); From 5730d949f69b69cca1f212ed5e043a68b70f658f Mon Sep 17 00:00:00 2001 From: renfufei Date: Fri, 26 Aug 2016 13:50:57 +0800 Subject: [PATCH 2/8] enter key event --- src/main/resources/support/http/resources/login.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/support/http/resources/login.html b/src/main/resources/support/http/resources/login.html index 9e5f7351c8..d4d0f614b6 100644 --- a/src/main/resources/support/http/resources/login.html +++ b/src/main/resources/support/http/resources/login.html @@ -90,12 +90,12 @@ }); }, unamecr : function(e) { - if(e.which == 13) { // 回车键事件 + if(e.which == 13) { // enter key event $("input[name=loginPassword]").focus(); } }, upasscr : function(e) { - if(e.which == 13) { // 回车键事件 + if(e.which == 13) { // enter key event $("#loginBtn").click(); } } From d30be087ba37ef8be6bad9620736764add84eadb Mon Sep 17 00:00:00 2001 From: renfufei Date: Sat, 27 Aug 2016 19:13:21 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9A=82=E5=81=9C?= =?UTF-8?q?=E5=88=B7=E6=96=B0=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../support/http/resources/js/lang.js | 1 + .../support/http/resources/weburi.html | 39 +++++++++++++++++-- 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/src/main/resources/support/http/resources/js/lang.js b/src/main/resources/support/http/resources/js/lang.js index 3359d5b161..af319b9e9f 100644 --- a/src/main/resources/support/http/resources/js/lang.js +++ b/src/main/resources/support/http/resources/js/lang.js @@ -241,6 +241,7 @@ druid.lang = function() { 'RequestTimeMillisTotal':['RequestTimeMillisTotal', '总共请求时间'], 'RequestInterval':['RequestInterval', '请求间隔'], /**weburi-detail*/ + 'SuspendRefresh':['Suspend Refresh', '暂停刷新'], 'RequestTimeMillis':['RequestTimeMillis', '请求时间'], 'JdbcExecutePeak':['JdbcExecutePeak', 'jdbc执行峰值'], 'JdbcFetchRowPeak':['JdbcFetchRowPeak', 'jdbc查询取回行数峰值'], diff --git a/src/main/resources/support/http/resources/weburi.html b/src/main/resources/support/http/resources/weburi.html index 8de74bce8f..dd3add7add 100644 --- a/src/main/resources/support/http/resources/weburi.html +++ b/src/main/resources/support/http/resources/weburi.html @@ -17,6 +17,7 @@

Web URI Stat View JSON API + Suspend Refresh

@@ -64,10 +65,42 @@ druid.common.ajaxuri = 'weburi.json?'; druid.common.handleCallback = druid.weburi.handleAjaxResult; druid.common.setOrderBy("URI"); - druid.common.ajaxRequestForBasicInfo(); - setInterval("druid.common.ajaxRequestForBasicInfo();",5000); + //druid.common.ajaxRequestForBasicInfo(); + //setInterval("druid.common.ajaxRequestForBasicInfo();",5000); + druid.weburi.controlRefresh(); }, - + initRefresh : function() { + $("#dataTable th a").click(function(obj) { + druid.common.setOrderBy(obj.target.id.substring(3)) + }) + druid.common.buildHead(5); + druid.common.ajaxuri = 'weburi.json?'; + druid.common.handleCallback = druid.weburi.handleAjaxResult; + druid.common.setOrderBy("URI"); + //druid.common.ajaxRequestForBasicInfo(); + //setInterval("druid.common.ajaxRequestForBasicInfo();",5000); + druid.weburi.controlRefresh(); + }, + controlRefresh : function() { + if(!druid.weburi.disableAutoRefresh){ + druid.common.ajaxRequestForBasicInfo(); + } + if(!druid.weburi.refreshSeconds){ + druid.weburi.refreshSeconds=5; + } + setTimeout(druid.weburi.controlRefresh, druid.weburi.refreshSeconds * 1000); + }, + switchSuspendRefresh : function() { + druid.weburi.disableAutoRefresh = !druid.weburi.disableAutoRefresh; + if(druid.weburi.disableAutoRefresh){ + $("#btnSuspendRefresh").addClass("btn-warning").removeClass("btn-primary"); + } else { + $("#btnSuspendRefresh").addClass("btn-primary").removeClass("btn-warning"); + } + }, + disableAutoRefresh : false, + refreshSeconds : 5, + handleAjaxResult : function(data) { var statList = data.Content; if(statList == null) return; From 4da5d7899aac7d723f271a357996b683ae473303 Mon Sep 17 00:00:00 2001 From: renfufei Date: Sat, 27 Aug 2016 19:55:41 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=88=B7=E6=96=B0?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=8E=A7=E5=88=B6=E4=B8=8E=E4=BF=AE=E6=94=B9?= =?UTF-8?q?-=E5=B7=B2=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../support/http/resources/weburi.html | 34 +++++++++++++------ 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/src/main/resources/support/http/resources/weburi.html b/src/main/resources/support/http/resources/weburi.html index dd3add7add..f4958c2141 100644 --- a/src/main/resources/support/http/resources/weburi.html +++ b/src/main/resources/support/http/resources/weburi.html @@ -17,7 +17,16 @@

Web URI Stat View JSON API - Suspend Refresh + + Suspend Refresh + +

@@ -65,8 +74,6 @@ druid.common.ajaxuri = 'weburi.json?'; druid.common.handleCallback = druid.weburi.handleAjaxResult; druid.common.setOrderBy("URI"); - //druid.common.ajaxRequestForBasicInfo(); - //setInterval("druid.common.ajaxRequestForBasicInfo();",5000); druid.weburi.controlRefresh(); }, initRefresh : function() { @@ -77,18 +84,24 @@ druid.common.ajaxuri = 'weburi.json?'; druid.common.handleCallback = druid.weburi.handleAjaxResult; druid.common.setOrderBy("URI"); - //druid.common.ajaxRequestForBasicInfo(); - //setInterval("druid.common.ajaxRequestForBasicInfo();",5000); druid.weburi.controlRefresh(); }, controlRefresh : function() { - if(!druid.weburi.disableAutoRefresh){ - druid.common.ajaxRequestForBasicInfo(); - } + var FIVE = 5; if(!druid.weburi.refreshSeconds){ - druid.weburi.refreshSeconds=5; + druid.weburi.refreshSeconds=FIVE; } - setTimeout(druid.weburi.controlRefresh, druid.weburi.refreshSeconds * 1000); + if(!druid.weburi.suspendedSeconds){ + druid.weburi.suspendedSeconds=0; + } + druid.weburi.suspendedSeconds += FIVE; + if(!druid.weburi.disableAutoRefresh){ + if(druid.weburi.suspendedSeconds >= druid.weburi.refreshSeconds){ + druid.weburi.suspendedSeconds = 0; + druid.common.ajaxRequestForBasicInfo(); + } + } + setTimeout(druid.weburi.controlRefresh, FIVE * 1000); }, switchSuspendRefresh : function() { druid.weburi.disableAutoRefresh = !druid.weburi.disableAutoRefresh; @@ -100,6 +113,7 @@ }, disableAutoRefresh : false, refreshSeconds : 5, + suspendedSeconds : 0, handleAjaxResult : function(data) { var statList = data.Content; From 402c2670e89383633862c2c8a2768170537c4092 Mon Sep 17 00:00:00 2001 From: renfufei Date: Mon, 29 Aug 2016 14:26:17 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=B7=E6=96=B0?= =?UTF-8?q?=E6=97=B6=E9=97=B4Label=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/support/http/resources/js/lang.js | 1 + src/main/resources/support/http/resources/weburi.html | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/support/http/resources/js/lang.js b/src/main/resources/support/http/resources/js/lang.js index af319b9e9f..9954feb4e4 100644 --- a/src/main/resources/support/http/resources/js/lang.js +++ b/src/main/resources/support/http/resources/js/lang.js @@ -241,6 +241,7 @@ druid.lang = function() { 'RequestTimeMillisTotal':['RequestTimeMillisTotal', '总共请求时间'], 'RequestInterval':['RequestInterval', '请求间隔'], /**weburi-detail*/ + 'RefreshPeriod':['Refresh Period', '刷新时间'], 'SuspendRefresh':['Suspend Refresh', '暂停刷新'], 'RequestTimeMillis':['RequestTimeMillis', '请求时间'], 'JdbcExecutePeak':['JdbcExecutePeak', 'jdbc执行峰值'], diff --git a/src/main/resources/support/http/resources/weburi.html b/src/main/resources/support/http/resources/weburi.html index f4958c2141..55bc00bc22 100644 --- a/src/main/resources/support/http/resources/weburi.html +++ b/src/main/resources/support/http/resources/weburi.html @@ -18,14 +18,15 @@ Web URI Stat View JSON API - Suspend Refresh - + Suspend Refresh
From 06067c8257a7f54598e5cb1873dd77c6591f119d Mon Sep 17 00:00:00 2001 From: renfufei Date: Mon, 29 Aug 2016 14:32:36 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E6=8E=92=E7=89=88=E5=AF=B9=E9=BD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../support/http/resources/weburi.html | 82 +++++++++---------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/src/main/resources/support/http/resources/weburi.html b/src/main/resources/support/http/resources/weburi.html index 55bc00bc22..6f3df58db5 100644 --- a/src/main/resources/support/http/resources/weburi.html +++ b/src/main/resources/support/http/resources/weburi.html @@ -17,17 +17,17 @@

Web URI Stat View JSON API - - - - Suspend Refresh - + + + + Suspend Refresh +

@@ -75,7 +75,7 @@ druid.common.ajaxuri = 'weburi.json?'; druid.common.handleCallback = druid.weburi.handleAjaxResult; druid.common.setOrderBy("URI"); - druid.weburi.controlRefresh(); + druid.weburi.controlRefresh(); }, initRefresh : function() { $("#dataTable th a").click(function(obj) { @@ -85,36 +85,36 @@ druid.common.ajaxuri = 'weburi.json?'; druid.common.handleCallback = druid.weburi.handleAjaxResult; druid.common.setOrderBy("URI"); - druid.weburi.controlRefresh(); + druid.weburi.controlRefresh(); }, - controlRefresh : function() { - var FIVE = 5; - if(!druid.weburi.refreshSeconds){ - druid.weburi.refreshSeconds=FIVE; - } - if(!druid.weburi.suspendedSeconds){ - druid.weburi.suspendedSeconds=0; - } - druid.weburi.suspendedSeconds += FIVE; - if(!druid.weburi.disableAutoRefresh){ - if(druid.weburi.suspendedSeconds >= druid.weburi.refreshSeconds){ - druid.weburi.suspendedSeconds = 0; - druid.common.ajaxRequestForBasicInfo(); - } - } - setTimeout(druid.weburi.controlRefresh, FIVE * 1000); - }, - switchSuspendRefresh : function() { - druid.weburi.disableAutoRefresh = !druid.weburi.disableAutoRefresh; - if(druid.weburi.disableAutoRefresh){ - $("#btnSuspendRefresh").addClass("btn-warning").removeClass("btn-primary"); - } else { - $("#btnSuspendRefresh").addClass("btn-primary").removeClass("btn-warning"); - } - }, - disableAutoRefresh : false, - refreshSeconds : 5, - suspendedSeconds : 0, + controlRefresh : function() { + var FIVE = 5; + if(!druid.weburi.refreshSeconds){ + druid.weburi.refreshSeconds=FIVE; + } + if(!druid.weburi.suspendedSeconds){ + druid.weburi.suspendedSeconds=0; + } + druid.weburi.suspendedSeconds += FIVE; + if(!druid.weburi.disableAutoRefresh){ + if(druid.weburi.suspendedSeconds >= druid.weburi.refreshSeconds){ + druid.weburi.suspendedSeconds = 0; + druid.common.ajaxRequestForBasicInfo(); + } + } + setTimeout(druid.weburi.controlRefresh, FIVE * 1000); + }, + switchSuspendRefresh : function() { + druid.weburi.disableAutoRefresh = !druid.weburi.disableAutoRefresh; + if(druid.weburi.disableAutoRefresh){ + $("#btnSuspendRefresh").addClass("btn-warning").removeClass("btn-primary"); + } else { + $("#btnSuspendRefresh").addClass("btn-primary").removeClass("btn-warning"); + } + }, + disableAutoRefresh : false, + refreshSeconds : 5, + suspendedSeconds : 0, handleAjaxResult : function(data) { var statList = data.Content; From 7160357570d46b9829b3213458ad6ddc8bdbbd1f Mon Sep 17 00:00:00 2001 From: renfufei Date: Mon, 29 Aug 2016 14:36:43 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=8F=96=E5=87=BA=E6=97=A0=E5=85=B3?= =?UTF-8?q?=E5=87=BD=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/support/http/resources/weburi.html | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/main/resources/support/http/resources/weburi.html b/src/main/resources/support/http/resources/weburi.html index 6f3df58db5..0bb79588c2 100644 --- a/src/main/resources/support/http/resources/weburi.html +++ b/src/main/resources/support/http/resources/weburi.html @@ -77,16 +77,6 @@ druid.common.setOrderBy("URI"); druid.weburi.controlRefresh(); }, - initRefresh : function() { - $("#dataTable th a").click(function(obj) { - druid.common.setOrderBy(obj.target.id.substring(3)) - }) - druid.common.buildHead(5); - druid.common.ajaxuri = 'weburi.json?'; - druid.common.handleCallback = druid.weburi.handleAjaxResult; - druid.common.setOrderBy("URI"); - druid.weburi.controlRefresh(); - }, controlRefresh : function() { var FIVE = 5; if(!druid.weburi.refreshSeconds){ From 14d682f882bbb1fa332986e81dac6c6a4b5a40f3 Mon Sep 17 00:00:00 2001 From: ZzzCrazyPig <18825111236@163.com> Date: Wed, 31 Aug 2016 13:46:41 +0800 Subject: [PATCH 8/8] add mysql deallocate prepare statement parse --- .../MysqlDeallocatePrepareStatement.java | 40 +++++++++++++++++++ .../mysql/parser/MySqlStatementParser.java | 18 +++++++++ .../mysql/visitor/MySqlASTVisitor.java | 5 +++ .../mysql/visitor/MySqlASTVisitorAdapter.java | 11 +++++ .../mysql/visitor/MySqlOutputVisitor.java | 12 ++++++ .../mysql/visitor/MySqlSchemaStatVisitor.java | 11 +++++ .../sql/mysql/MySqlASTVisitorAdapterTest.java | 2 + .../sql/parser/DeallocatePrepareTest.java | 23 +++++++++++ 8 files changed, 122 insertions(+) create mode 100644 src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlDeallocatePrepareStatement.java create mode 100644 src/test/java/com/alibaba/druid/sql/parser/DeallocatePrepareTest.java diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlDeallocatePrepareStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlDeallocatePrepareStatement.java new file mode 100644 index 0000000000..04472cdfa1 --- /dev/null +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlDeallocatePrepareStatement.java @@ -0,0 +1,40 @@ +/* + * 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.sql.dialect.mysql.ast.statement; + +import com.alibaba.druid.sql.ast.SQLName; +import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; + +public class MysqlDeallocatePrepareStatement extends MySqlStatementImpl { + + private SQLName statementName; + + public SQLName getStatementName() { + return statementName; + } + + public void setStatementName(SQLName statementName) { + this.statementName = statementName; + } + + public void accept0(MySqlASTVisitor visitor) { + if (visitor.visit(this)) { + acceptChild(visitor, statementName); + } + visitor.endVisit(this); + } + +} diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java index d26ec0224b..64ce2ad047 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java @@ -182,6 +182,7 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowWarningsStatem import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlStartTransactionStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUnlockTablesStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUpdateStatement; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MysqlDeallocatePrepareStatement; import com.alibaba.druid.sql.parser.Lexer; import com.alibaba.druid.sql.parser.ParserException; import com.alibaba.druid.sql.parser.SQLSelectParser; @@ -603,6 +604,12 @@ public class MySqlStatementParser extends SQLStatementParser { statementList.add(stmt); return true; } + + if(identifierEquals("DEALLOCATE")) { + MysqlDeallocatePrepareStatement stmt = parseDeallocatePrepare(); + statementList.add(stmt); + return true; + } if (identifierEquals("LOAD")) { SQLStatement stmt = parseLoad(); @@ -1931,6 +1938,17 @@ public class MySqlStatementParser extends SQLStatementParser { return stmt; } + public MysqlDeallocatePrepareStatement parseDeallocatePrepare() { + acceptIdentifier("DEALLOCATE"); + acceptIdentifier("PREPARE"); + + MysqlDeallocatePrepareStatement stmt = new MysqlDeallocatePrepareStatement(); + SQLName statementName = exprParser.name(); + stmt.setStatementName(statementName); + + return stmt; + } + public SQLInsertStatement parseInsert() { MySqlInsertStatement insertStatement = new MySqlInsertStatement(); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlASTVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlASTVisitor.java index 2e5eff03e5..0e1ea06f2f 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlASTVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlASTVisitor.java @@ -126,6 +126,7 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUnionQuery; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUnlockTablesStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUpdateStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUpdateTableSource; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MysqlDeallocatePrepareStatement; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public interface MySqlASTVisitor extends SQLASTVisitor { @@ -170,6 +171,10 @@ public interface MySqlASTVisitor extends SQLASTVisitor { boolean visit(MySqlPrepareStatement x); void endVisit(MySqlExecuteStatement x); + + boolean visit(MysqlDeallocatePrepareStatement x); + + void endVisit(MysqlDeallocatePrepareStatement x); boolean visit(MySqlExecuteStatement x); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlASTVisitorAdapter.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlASTVisitorAdapter.java index e125e5203c..da27ed482a 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlASTVisitorAdapter.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlASTVisitorAdapter.java @@ -129,6 +129,7 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUnionQuery; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUnlockTablesStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUpdateStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUpdateTableSource; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MysqlDeallocatePrepareStatement; import com.alibaba.druid.sql.visitor.SQLASTVisitorAdapter; public class MySqlASTVisitorAdapter extends SQLASTVisitorAdapter implements MySqlASTVisitor { @@ -228,6 +229,16 @@ public class MySqlASTVisitorAdapter extends SQLASTVisitorAdapter implements MySq return true; } + + @Override + public void endVisit(MysqlDeallocatePrepareStatement x) { + + } + + @Override + public boolean visit(MysqlDeallocatePrepareStatement x) { + return true; + } @Override public void endVisit(MySqlDeleteStatement x) { 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 901f5487b9..77efa363de 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 @@ -163,6 +163,7 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUnionQuery; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUnlockTablesStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUpdateStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUpdateTableSource; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MysqlDeallocatePrepareStatement; import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; import com.alibaba.druid.util.JdbcConstants; @@ -875,6 +876,17 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV } return false; } + + @Override + public void endVisit(MysqlDeallocatePrepareStatement x) { + + } + + public boolean visit(MysqlDeallocatePrepareStatement x) { + print0(ucase ? "DEALLOCATE PREPARE " : "deallocate prepare "); + x.getStatementName().accept(this); + return false; + } @Override public void endVisit(MySqlDeleteStatement x) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlSchemaStatVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlSchemaStatVisitor.java index 1f2c4d40a1..62df154e4b 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlSchemaStatVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlSchemaStatVisitor.java @@ -144,6 +144,7 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUnionQuery; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUnlockTablesStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUpdateStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUpdateTableSource; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MysqlDeallocatePrepareStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Mode; @@ -324,6 +325,16 @@ public class MySqlSchemaStatVisitor extends SchemaStatVisitor implements MySqlAS return true; } + + @Override + public void endVisit(MysqlDeallocatePrepareStatement x) { + + } + + @Override + public boolean visit(MysqlDeallocatePrepareStatement x) { + return true; + } @Override public void endVisit(MySqlLoadDataInFileStatement x) { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlASTVisitorAdapterTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlASTVisitorAdapterTest.java index daf98d69ee..d4753001af 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlASTVisitorAdapterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlASTVisitorAdapterTest.java @@ -84,6 +84,7 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlTableIndex; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUnionQuery; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUnlockTablesStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUpdateStatement; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MysqlDeallocatePrepareStatement; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitorAdapter; import junit.framework.TestCase; @@ -101,6 +102,7 @@ public class MySqlASTVisitorAdapterTest extends TestCase { new SQLBinaryExpr().accept(adapter); new MySqlPrepareStatement().accept(adapter); new MySqlExecuteStatement().accept(adapter); + new MysqlDeallocatePrepareStatement().accept(adapter); new MySqlDeleteStatement().accept(adapter); new MySqlInsertStatement().accept(adapter); new MySqlLoadXmlStatement().accept(adapter); diff --git a/src/test/java/com/alibaba/druid/sql/parser/DeallocatePrepareTest.java b/src/test/java/com/alibaba/druid/sql/parser/DeallocatePrepareTest.java new file mode 100644 index 0000000000..da65fc8964 --- /dev/null +++ b/src/test/java/com/alibaba/druid/sql/parser/DeallocatePrepareTest.java @@ -0,0 +1,23 @@ +package com.alibaba.druid.sql.parser; + +import org.junit.Assert; + +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MysqlDeallocatePrepareStatement; +import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; + +import junit.framework.TestCase; + +public class DeallocatePrepareTest extends TestCase { + + public void test() { + String sql = "DEALLOCATE PREPARE stmt1"; + MySqlStatementParser parser = new MySqlStatementParser(sql); + SQLStatement stmt =parser.parseStatement(); + Assert.assertEquals(MysqlDeallocatePrepareStatement.class, stmt.getClass()); + MysqlDeallocatePrepareStatement dpStmt = (MysqlDeallocatePrepareStatement) stmt; + Assert.assertEquals("stmt1", dpStmt.getStatementName().getSimpleName()); + Assert.assertEquals(sql, dpStmt.toString()); + } + +}