Parser代码整理

lealone · Jul 16, 2015 · 3b3de4d · 3b3de4d
1 parent 46f5798
commit 3b3de4d
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 102 deletions.
diff --git a/lealone-sql/src/main/java/org/lealone/command/Command.java b/lealone-sql/src/main/java/org/lealone/command/Command.java
@@ -54,10 +54,6 @@ protected Command(Session session, String sql) {
         trace = session.getDatabase().getTrace(Trace.COMMAND);
     }
 
-    protected Command(Parser parser, String sql) {
-        this(parser.getSession(), sql);
-    }
-
     /**
      * Check if this command is transactional.
      * If it is not, then it forces the current transaction to commit.

diff --git a/lealone-sql/src/main/java/org/lealone/command/CommandContainer.java b/lealone-sql/src/main/java/org/lealone/command/CommandContainer.java
@@ -10,6 +10,7 @@
 
 import org.lealone.api.DatabaseEventListener;
 import org.lealone.api.ParameterInterface;
+import org.lealone.engine.Session;
 import org.lealone.expression.Parameter;
 import org.lealone.result.ResultInterface;
 import org.lealone.value.Value;
@@ -25,8 +26,8 @@ public class CommandContainer extends Command {
     private boolean readOnlyKnown;
     private boolean readOnly;
 
-    protected CommandContainer(Parser parser, String sql, Prepared prepared) {
+    protected CommandContainer(Session session, String sql, Prepared prepared) {
-        super(parser, sql);
+        super(session, sql);
         prepared.setCommand(this);
         this.prepared = prepared;
     }

diff --git a/lealone-sql/src/main/java/org/lealone/command/CommandList.java b/lealone-sql/src/main/java/org/lealone/command/CommandList.java
@@ -9,6 +9,7 @@
 import java.util.ArrayList;
 
 import org.lealone.api.ParameterInterface;
+import org.lealone.engine.Session;
 import org.lealone.result.ResultInterface;
 
 /**
@@ -19,8 +20,8 @@ class CommandList extends Command {
     private final Command command;
     private final String remaining;
 
-    CommandList(Parser parser, String sql, Command c, String remaining) {
+    CommandList(Session session, String sql, Command c, String remaining) {
-        super(parser, sql);
+        super(session, sql);
         this.command = c;
         this.remaining = remaining;
     }