forked from opengaussexamples/examples
refractor
This commit is contained in:
parent
d4dca20bb9
commit
3c0cbcdad8
|
|
@ -4,11 +4,9 @@
|
|||
<option name="autoReloadType" value="SELECTIVE" />
|
||||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add join">
|
||||
<list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add join convert rule">
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Join/JoinConditionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Join/JoinConditionNode.java" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
|
|
@ -379,7 +377,14 @@
|
|||
<option name="project" value="LOCAL" />
|
||||
<updated>1726127728384</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="40" />
|
||||
<task id="LOCAL-00040" summary="add join convert rule">
|
||||
<created>1726129122571</created>
|
||||
<option name="number" value="00040" />
|
||||
<option name="presentableId" value="LOCAL-00040" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1726129122571</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="41" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="Vcs.Log.Tabs.Properties">
|
||||
|
|
@ -414,7 +419,8 @@
|
|||
<MESSAGE value="add join pattern" />
|
||||
<MESSAGE value="add join class" />
|
||||
<MESSAGE value="add join" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="add join" />
|
||||
<MESSAGE value="add join convert rule" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="add join convert rule" />
|
||||
</component>
|
||||
<component name="XDebuggerManager">
|
||||
<watches-manager>
|
||||
|
|
|
|||
|
|
@ -16,14 +16,14 @@ public class Main {
|
|||
// ");";
|
||||
// String sql = "INSERT INTO employees (first_name, last_name, email) VALUES ('Jane', 'Smith', 'janesm@example.com');";
|
||||
// String sql = "DROP TABLE employees CASCADE CONSTRAINTS;";
|
||||
// String sql = "SELECT e.first_name, d.department_name FROM employees e JOIN departments d ON e.department_id = d.department_id;";
|
||||
String sql = "Customers\n" +
|
||||
"LEFT JOIN Orders USING Customers.CustomerID = Orders.CustomerID where";
|
||||
String sql = "SELECT e.first_name, d.department_name FROM employees e JOIN departments d ON e.department_id = d.department_id;";
|
||||
// String sql = "Customers\n" +
|
||||
// "LEFT JOIN Orders USING Customers.CustomerID = Orders.CustomerID where";
|
||||
OracleLexer lexer = new OracleLexer(sql);
|
||||
lexer.printTokens();
|
||||
OracleParser parser = new OracleParser(lexer);
|
||||
// ASTNode root = parser.parse();
|
||||
ASTNode root = OracleParser.parseJoin(lexer.getTokens());
|
||||
ASTNode root = parser.parse();
|
||||
// ASTNode root = OracleParser.parseJoin(lexer.getTokens());
|
||||
System.out.println(root.toQueryString());
|
||||
System.out.println(root.getASTString());
|
||||
OpenGaussGenerator generator = new OpenGaussGenerator(root);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,45 @@
|
|||
package Parser.AST.Select;
|
||||
|
||||
import Lexer.Token;
|
||||
import Parser.AST.ASTNode;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class SelectContentNode extends ASTNode {
|
||||
public SelectContentNode(List<Token> tokens)
|
||||
{
|
||||
super(tokens);
|
||||
this.isDistinct = "";
|
||||
}
|
||||
|
||||
public SelectContentNode(ASTNode node)
|
||||
{
|
||||
super(node);
|
||||
this.isDistinct = "";
|
||||
}
|
||||
|
||||
private String isDistinct;
|
||||
|
||||
public SelectContentNode() {
|
||||
super();
|
||||
}
|
||||
|
||||
public String getIsDistinct()
|
||||
{
|
||||
return isDistinct;
|
||||
}
|
||||
|
||||
public void setIsDistinct(String isDistinct) {
|
||||
this.isDistinct = isDistinct + " ";
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visit(ASTNode node, StringBuilder queryString)
|
||||
{
|
||||
queryString.append(isDistinct + toString() + " FROM ");
|
||||
for (ASTNode child : getChildren())
|
||||
{
|
||||
child.visit(child, queryString);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -9,34 +9,16 @@ public class SelectObjNode extends ASTNode {
|
|||
public SelectObjNode(List<Token> tokens)
|
||||
{
|
||||
super(tokens);
|
||||
this.isDistinct = "";
|
||||
}
|
||||
|
||||
public SelectObjNode(ASTNode node)
|
||||
{
|
||||
super(node);
|
||||
this.isDistinct = "";
|
||||
}
|
||||
|
||||
private String isDistinct;
|
||||
|
||||
public SelectObjNode() {
|
||||
super();
|
||||
}
|
||||
|
||||
public String getIsDistinct()
|
||||
{
|
||||
return isDistinct;
|
||||
}
|
||||
|
||||
public void setIsDistinct(String isDistinct) {
|
||||
this.isDistinct = isDistinct + " ";
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visit(ASTNode node, StringBuilder queryString)
|
||||
{
|
||||
queryString.append(isDistinct + toString() + " FROM ");
|
||||
queryString.append(toString() + " ");
|
||||
for (ASTNode child : getChildren())
|
||||
{
|
||||
child.visit(child, queryString);
|
||||
|
|
|
|||
|
|
@ -1,27 +0,0 @@
|
|||
package Parser.AST.Select;
|
||||
|
||||
import Lexer.Token;
|
||||
import Parser.AST.ASTNode;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class SelectTableNode extends ASTNode {
|
||||
public SelectTableNode(List<Token> tokens)
|
||||
{
|
||||
super(tokens);
|
||||
}
|
||||
|
||||
public SelectTableNode(ASTNode node)
|
||||
{
|
||||
super(node);
|
||||
}
|
||||
|
||||
public void visit(ASTNode node, StringBuilder queryString)
|
||||
{
|
||||
queryString.append(toString() + " ");
|
||||
for (ASTNode child : getChildren())
|
||||
{
|
||||
child.visit(child, queryString);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -378,7 +378,7 @@ public class OracleParser {
|
|||
for(int i = 1; i < parseTokens.size(); i++) {
|
||||
// match select_obj
|
||||
if (i == 1 && parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("DISTINCT")) {
|
||||
SelectObjNode childNode = new SelectObjNode();
|
||||
SelectContentNode childNode = new SelectContentNode();
|
||||
childNode.setIsDistinct(parseTokens.get(i).getValue());
|
||||
tokens = new ArrayList<>();
|
||||
for (int j = i + 1; j < parseTokens.size(); j++) {
|
||||
|
|
@ -401,12 +401,12 @@ public class OracleParser {
|
|||
}
|
||||
tokens.add(parseTokens.get(j));
|
||||
}
|
||||
ASTNode childNode = new SelectObjNode(tokens);
|
||||
ASTNode childNode = new SelectContentNode(tokens);
|
||||
currentNode.addChild(childNode);
|
||||
currentNode = childNode;
|
||||
}
|
||||
// match select_tab (possible last token: ; | GROUP BY | ORDER BY | HAVING | WHERE | UNION)
|
||||
else if (currentNode instanceof SelectObjNode) {
|
||||
else if (currentNode instanceof SelectContentNode) {
|
||||
tokens = new ArrayList<>();
|
||||
for (int j = i; j < parseTokens.size(); j++) {
|
||||
if (
|
||||
|
|
@ -422,7 +422,7 @@ public class OracleParser {
|
|||
}
|
||||
tokens.add(parseTokens.get(j));
|
||||
}
|
||||
ASTNode childNode = new SelectTableNode(tokens);
|
||||
ASTNode childNode = new SelectObjNode(tokens);
|
||||
currentNode.addChild(childNode);
|
||||
currentNode = childNode;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue