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

Merge pull request #930 from 52Jolynn/master

Browse Source 
修复若干bug及增加若干特性
This commit is contained in:
高铁
2015-08-22 00:53:52 +08:00
parent 9007375ca0 7d1b290c43
commit 91edb244f2
7 changed files with 78 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGInsertStatement.java
+10 -1
View File
@@ -29,6 +29,7 @@ public class PGInsertStatement extends SQLInsertStatement implements PGSQLStatem
private PGWithClause with;
private List<ValuesClause> valuesList = new ArrayList<ValuesClause>();
private SQLExpr returning;
private boolean defaultValues = false;
public SQLExpr getReturning() {
return returning;
@@ -70,7 +71,15 @@ public class PGInsertStatement extends SQLInsertStatement implements PGSQLStatem
valuesList.add(valueClause);
}
protected void accept0(SQLASTVisitor visitor) {
public boolean isDefaultValues() {
return defaultValues;
}
public void setDefaultValues(boolean defaultValues) {
this.defaultValues = defaultValues;
}
protected void accept0(SQLASTVisitor visitor) {
accept0((PGASTVisitor) visitor);
}
src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGLexer.java
+2
View File
@@ -94,6 +94,7 @@ public class PGLexer extends Lexer {
hasSpecial = true;
}
putChar('\\');
switch (ch) {
case '\0':
putChar('\0');
@@ -139,6 +140,7 @@ public class PGLexer extends Lexer {
arraycopy(mark + 1, buf, 0, bufPos);
hasSpecial = true;
putChar('\'');
putChar('\'');
continue;
}
}
src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGSQLStatementParser.java
+23 -1
View File
@@ -21,6 +21,7 @@ import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.ast.SQLName;
import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.ast.expr.SQLCurrentOfCursorExpr;
import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
import com.alibaba.druid.sql.ast.expr.SQLQueryExpr;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableAlterColumn;
import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition;
@@ -101,6 +102,12 @@ public class PGSQLStatementParser extends SQLStatementParser {
}
}
if (lexer.token() == Token.DEFAULT) {
lexer.nextToken();
accept(Token.VALUES);
stmt.setDefaultValues(true);
}
if (lexer.token() == (Token.LPAREN)) {
lexer.nextToken();
@@ -152,6 +159,14 @@ public class PGSQLStatementParser extends SQLStatementParser {
SQLName tableName = exprParser.name();
deleteStatement.setTableName(tableName);
if (lexer.token() == Token.AS) {
accept(Token.AS);
}
if (lexer.token() == Token.IDENTIFIER) {
deleteStatement.setAlias(lexer.stringVal());
lexer.nextToken();
}
if (lexer.token() == Token.USING) {
lexer.nextToken();
@@ -225,7 +240,14 @@ public class PGSQLStatementParser extends SQLStatementParser {
private PGWithQuery withQuery() {
PGWithQuery withQuery = new PGWithQuery();
withQuery.setName(this.exprParser.expr());
if (lexer.token() == Token.LITERAL_ALIAS) {
withQuery.setName(new SQLIdentifierExpr("\"" + lexer.stringVal()
+ "\""));
} else {
withQuery.setName(new SQLIdentifierExpr(lexer.stringVal()));
}
lexer.nextToken();
if (lexer.token() == Token.LPAREN) {
lexer.nextToken();
src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGSelectParser.java
+1 -2
View File
@@ -259,11 +259,10 @@ public class PGSelectParser extends SQLSelectParser {
protected SQLTableSource parseTableSourceRest(SQLTableSource tableSource) {
if (lexer.token() == Token.AS && tableSource instanceof SQLExprTableSource) {
String alias = this.as();
if (lexer.token() == Token.LPAREN) {
SQLExprTableSource exprTableSource = (SQLExprTableSource) tableSource;
String alias = this.as();
PGFunctionTableSource functionTableSource = new PGFunctionTableSource(exprTableSource.getExpr());
functionTableSource.setAlias(alias);
src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest.java
+13
View File
@@ -21,6 +21,7 @@ import org.junit.Assert;
import com.alibaba.druid.sql.PGTest;
import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGDeleteStatement;
import com.alibaba.druid.sql.dialect.postgresql.parser.PGSQLStatementParser;
import com.alibaba.druid.sql.dialect.postgresql.visitor.PGSchemaStatVisitor;
import com.alibaba.druid.stat.TableStat;
@@ -50,5 +51,17 @@ public class PGDeleteTest extends PGTest {
//Assert.assertTrue(visitor.getFields().size() == 0);
}
public void test_1() {
String sql = "delete from test01 as a where a.id = 2";
PGSQLStatementParser parser = new PGSQLStatementParser(sql);
List<SQLStatement> statementList = parser.parseStatementList();
SQLStatement statemen = statementList.get(0);
print(statementList);
assertTrue(statementList.size() == 1);
assertTrue(statemen instanceof PGDeleteStatement);
PGDeleteStatement delete = (PGDeleteStatement) statemen;
assertTrue(delete.getAlias().equalsIgnoreCase("a"));
assertTrue(delete.getTableName().getSimpleName().equals("test01"));
}
}
src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest0.java
+12 -1
View File
@@ -21,6 +21,7 @@ import org.junit.Assert;
import com.alibaba.druid.sql.PGTest;
import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGInsertStatement;
import com.alibaba.druid.sql.dialect.postgresql.parser.PGSQLStatementParser;
import com.alibaba.druid.sql.dialect.postgresql.visitor.PGSchemaStatVisitor;
import com.alibaba.druid.stat.TableStat;
@@ -51,5 +52,15 @@ public class PGInsertTest0 extends PGTest {
// Assert.assertTrue(visitor.getFields().contains(new TableStat.Column("films", "producer_id")));
}
public void test_1() {
String sql = "insert into test01 DEFAULT VALUES";
PGSQLStatementParser parser = new PGSQLStatementParser(sql);
List<SQLStatement> statementList = parser.parseStatementList();
SQLStatement statemen = statementList.get(0);
print(statementList);
assertTrue(statemen instanceof PGInsertStatement);
PGInsertStatement insert = (PGInsertStatement) statemen;
assertTrue(insert.getTableName().getSimpleName()
.equalsIgnoreCase("test01"));
}
}
src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest21.java
+17
View File
@@ -21,6 +21,7 @@ import org.junit.Assert;
import com.alibaba.druid.sql.PGTest;
import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGSelectStatement;
import com.alibaba.druid.sql.dialect.postgresql.parser.PGSQLStatementParser;
import com.alibaba.druid.sql.dialect.postgresql.visitor.PGSchemaStatVisitor;
@@ -48,4 +49,20 @@ public class PGSelectTest21 extends PGTest {
Assert.assertEquals(1, visitor.getColumns().size());
Assert.assertEquals(1, visitor.getTables().size());
}
public void test_1() throws Exception {
String sql = "with a(a1,b1) as (select * from b) select * from a";
PGSQLStatementParser parser = new PGSQLStatementParser(sql);
List<SQLStatement> statementList = parser.parseStatementList();
SQLStatement statemen = statementList.get(0);
print(statementList);
assertTrue(statemen instanceof PGSelectStatement);
assertTrue(((PGSelectStatement)statemen).getWith().getWithQuery().size()==1);
StringBuffer sb = new StringBuffer();
((PGSelectStatement)statemen).getWith().getWithQuery().get(0).getName().output(sb);
assertTrue("a".equals(sb.toString()));
assertTrue(((PGSelectStatement)statemen).getWith().getWithQuery().get(0).getColumns().size()==2);
}
}