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 branch 'master' of https://github.com/AlibabaTech/druid

Browse Source 
Conflicts:
	src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLCreateMappingStatement.java
	src/main/java/com/alibaba/druid/hbase/hbql/parser/HBQLStatementParser.java
This commit is contained in:
温少
2012-05-20 01:12:28 +08:00
parent 78235af596 ca778ea3c3
commit a0865d1b01
2 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLCreateMappingStatement.java
+6
View File
@@ -1,12 +1,16 @@
package com.alibaba.druid.hbase.hbql.ast;
<<<<<<< HEAD
import com.alibaba.druid.hbase.mapping.HMapping;
=======
>>>>>>> ca778ea3c3ae05528c08c708193c8a4f79392825
import com.alibaba.druid.sql.ast.SQLStatementImpl;
public class HBQLCreateMappingStatement extends SQLStatementImpl implements HBQLStatement {
private static final long serialVersionUID = 1L;
<<<<<<< HEAD
private HMapping mapping = new HMapping();
public HMapping getMapping() {
@@ -17,4 +21,6 @@ public class HBQLCreateMappingStatement extends SQLStatementImpl implements HBQL
this.mapping = mapping;
}
=======
>>>>>>> ca778ea3c3ae05528c08c708193c8a4f79392825
}
src/main/java/com/alibaba/druid/hbase/hbql/parser/HBQLStatementParser.java
+1 -16
View File
@@ -1,21 +1,6 @@
package com.alibaba.druid.hbase.hbql.parser;
import com.alibaba.druid.sql.parser.Lexer;
import com.alibaba.druid.sql.parser.SQLExprParser;
import com.alibaba.druid.sql.parser.SQLStatementParser;
public class HBQLStatementParser {
public class HBQLStatementParser extends SQLStatementParser {
protected SQLExprParser exprParser;
public HBQLStatementParser(String sql){
super(sql);
this.exprParser = new SQLExprParser(lexer);
}
public HBQLStatementParser(Lexer lexer){
super(lexer);
this.exprParser = new SQLExprParser(lexer);
}
}