mirror of
https://github.com/alibaba/druid.git
synced 2023-03-04 19:17:16 +00:00
odps sql parser improved comment support
This commit is contained in:
@@ -24,9 +24,9 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor;
|
||||
|
||||
public abstract class SQLObjectImpl implements SQLObject {
|
||||
|
||||
private SQLObject parent;
|
||||
private SQLObject parent;
|
||||
|
||||
private Map<String, Object> attributes;
|
||||
protected Map<String, Object> attributes;
|
||||
|
||||
public SQLObjectImpl(){
|
||||
}
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
package com.alibaba.druid.sql.ast.statement;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
|
||||
import com.alibaba.druid.sql.ast.SQLName;
|
||||
@@ -119,4 +120,37 @@ public class SQLCreateTableStatement extends SQLStatementImpl implements SQLDDLS
|
||||
}
|
||||
visitor.endVisit(this);
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
public void addBodyBeforeComment(List<String> comments) {
|
||||
if (attributes == null) {
|
||||
attributes = new HashMap<String, Object>(1);
|
||||
}
|
||||
|
||||
List<String> attrComments = (List<String>) attributes.get("format.body_before_comment");
|
||||
if (attrComments == null) {
|
||||
attributes.put("format.body_before_comment", comments);
|
||||
} else {
|
||||
attrComments.addAll(comments);
|
||||
}
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
public List<String> getBodyBeforeCommentsDirect() {
|
||||
if (attributes == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return (List<String>) attributes.get("format.body_before_comment");
|
||||
}
|
||||
|
||||
public boolean hasBodyBeforeComment() {
|
||||
List<String> comments = getBodyBeforeCommentsDirect();
|
||||
if (comments == null) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return !comments.isEmpty();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -22,7 +22,6 @@ import static com.alibaba.druid.sql.parser.Token.LITERAL_CHARS;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import com.alibaba.druid.sql.parser.CharTypes;
|
||||
import com.alibaba.druid.sql.parser.Keywords;
|
||||
import com.alibaba.druid.sql.parser.Lexer;
|
||||
import com.alibaba.druid.sql.parser.NotAllowCommentException;
|
||||
@@ -512,9 +511,28 @@ public class MySqlLexer extends Lexer {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
private final static boolean[] identifierFlags = new boolean[256];
|
||||
static {
|
||||
for (char c = 0; c < identifierFlags.length; ++c) {
|
||||
if (c >= 'A' && c <= 'Z') {
|
||||
identifierFlags[c] = true;
|
||||
} else if (c >= 'a' && c <= 'z') {
|
||||
identifierFlags[c] = true;
|
||||
} else if (c >= '0' && c <= '9') {
|
||||
identifierFlags[c] = true;
|
||||
}
|
||||
}
|
||||
// identifierFlags['`'] = true;
|
||||
identifierFlags['_'] = true;
|
||||
identifierFlags['-'] = true; // mysql
|
||||
}
|
||||
|
||||
private boolean isIdentifierChar(char c) {
|
||||
return c != '#' && CharTypes.isIdentifierChar(c);
|
||||
public static boolean isIdentifierChar(char c) {
|
||||
if (c <= identifierFlags.length) {
|
||||
return identifierFlags[c];
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public void scanNumber() {
|
||||
|
||||
@@ -73,6 +73,10 @@ public class OdpsCreateTableParser extends SQLCreateTableParser {
|
||||
} else {
|
||||
accept(Token.LPAREN);
|
||||
|
||||
if (lexer.isKeepComments() && lexer.hasComment()) {
|
||||
stmt.addBodyBeforeComment(lexer.readAndResetComments());
|
||||
}
|
||||
|
||||
for (;;) {
|
||||
if (lexer.token() != Token.IDENTIFIER) {
|
||||
throw new ParserException("expect identifier");
|
||||
|
||||
@@ -96,6 +96,12 @@ public class OdpsOutputVisitor extends SQLASTOutputVisitor implements OdpsASTVis
|
||||
int size = x.getTableElementList().size();
|
||||
if (size > 0) {
|
||||
print0(" (");
|
||||
|
||||
if (this.isPrettyFormat() && x.hasBodyBeforeComment()) {
|
||||
print(' ');
|
||||
printComment(x.getBodyBeforeCommentsDirect(), "");
|
||||
}
|
||||
|
||||
incrementIndent();
|
||||
println();
|
||||
for (int i = 0; i < size; ++i) {
|
||||
|
||||
@@ -0,0 +1,48 @@
|
||||
/*
|
||||
* 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.ast.SQLStatement;
|
||||
import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser;
|
||||
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor;
|
||||
|
||||
public class MySqlShowTest_table2 extends MysqlTest {
|
||||
|
||||
public void test_0() throws Exception {
|
||||
String sql = "SHOW FULL TABLES FROM test-db WHERE Table_type != 'VIEW'";
|
||||
|
||||
MySqlStatementParser parser = new MySqlStatementParser(sql);
|
||||
List<SQLStatement> statementList = parser.parseStatementList();
|
||||
SQLStatement stmt = statementList.get(0);
|
||||
|
||||
Assert.assertEquals(1, statementList.size());
|
||||
|
||||
MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor();
|
||||
stmt.accept(visitor);
|
||||
|
||||
Assert.assertEquals(0, visitor.getTables().size());
|
||||
Assert.assertEquals(0, visitor.getColumns().size());
|
||||
Assert.assertEquals(0, visitor.getConditions().size());
|
||||
Assert.assertEquals(0, visitor.getOrderByColumns().size());
|
||||
|
||||
// Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("mytable")));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
package com.alibaba.druid.bvt.sql.odps;
|
||||
|
||||
import org.junit.Assert;
|
||||
|
||||
import com.alibaba.druid.sql.SQLUtils;
|
||||
|
||||
import junit.framework.TestCase;
|
||||
|
||||
public class OdpsFormatCommentTest29 extends TestCase {
|
||||
public void test_drop_function() throws Exception {
|
||||
String sql = "create table xxxx001( --测试"
|
||||
+ "\ncol string, --测试2"
|
||||
+ "\ncol2 string --测试3"
|
||||
+ "\n)";
|
||||
Assert.assertEquals("CREATE TABLE xxxx001 ( --测试"
|
||||
+ "\n\tcol STRING, --测试2"
|
||||
+ "\n\tcol2 STRING --测试3"
|
||||
+ "\n)", SQLUtils.formatOdps(sql));
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user