feat: SessionStatement with options

Signed-off-by: Andreas Reichel <[email protected]>

Author: manticore-projects

src/main/java/net/sf/jsqlparser/statement/SessionStatement.java

@@ -9,6 +9,10 @@
  */
 package net.sf.jsqlparser.statement;
 
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
+
 public class SessionStatement implements Statement {
     public enum Action {
         START, APPLY, DROP, SHOW, DESCRIBE;
@@ -20,6 +24,7 @@ public static Action from(String flag) {
 
     final private Action action;
     final private String id;
+    final private LinkedHashMap<String, String> options = new LinkedHashMap<>();
 
     public SessionStatement(Action action, String id) {
         this.action = action;
@@ -43,6 +48,54 @@ public String getId() {
         return id;
     }
 
+    public int size() {
+        return options.size();
+    }
+
+    public String putOption(String key, String value) {
+        return options.put(key.replaceAll("[\"']", "").toLowerCase(), value.toLowerCase());
+    }
+
+    public boolean hasOptions() {
+        return !options.isEmpty();
+    }
+
+    public void clearOptions() {
+        options.clear();
+    }
+
+    public boolean removeOption(String key, String value) {
+        return options.remove(key, value);
+    }
+
+    public boolean containsOption(String value) {
+        return options.containsValue(value);
+    }
+
+    public String removeOption(String key) {
+        return options.remove(key);
+    }
+
+    public String getOption(String key) {
+        return options.get(key);
+    }
+
+    public Set<String> getOptionKeySet() {
+        return options.keySet();
+    }
+
+    public Set<Map.Entry<String, String>> getOptions() {
+        return options.entrySet();
+    }
+
+    public boolean hasOption(String key) {
+        return options.containsKey(key);
+    }
+
+    public String getOptionOrDefault(String key, String defaultValue) {
+        return options.getOrDefault(key, defaultValue);
+    }
+
     @Override
     public <T, S> T accept(StatementVisitor<T> statementVisitor, S context) {
         return statementVisitor.visit(this, context);
@@ -55,6 +108,20 @@ public void accept(StatementVisitor<?> statementVisitor) {
 
     @Override
     public String toString() {
-        return "SESSION " + action + " " + (id != null ? id : "") + ";";
+        StringBuilder builder =
+                new StringBuilder("SESSION " + action + " " + (id != null ? id : ""));
+        if (!options.isEmpty()) {
+            builder.append(" WITH ");
+            int i = 0;
+            for (Map.Entry<String, String> e : options.entrySet()) {
+                if (i++ > 0) {
+                    builder.append(", ");
+                }
+                builder.append(e.getKey()).append("=").append(e.getValue());
+            }
+        }
+        builder.append(";");
+
+        return builder.toString();
     }
 }

src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt

@@ -2091,6 +2091,7 @@ DeclareStatement Declare(): {
 
 SessionStatement SessionStatement():
 {
+    SessionStatement sessionsStatement;
     Token actionToken;
     Token idToken = null;
     String id = null;
@@ -2133,12 +2134,30 @@ SessionStatement SessionStatement():
             ) { id += "." + idToken.image; }
         )?
     ]
-
     {
-        SessionStatement sessionsStatement = id!=null
+        sessionsStatement = id!=null
             ? new SessionStatement(actionToken.image, id)
             : new SessionStatement(actionToken.image);
+    }
+
+    // options
+    [
+        LOOKAHEAD(2) <K_WITH>
+        idToken = <S_IDENTIFIER>
+        "="
+        ( actionToken = <S_IDENTIFIER> | actionToken = <S_QUOTED_IDENTIFIER> | actionToken = <S_CHAR_LITERAL> | actionToken = <S_LONG> | actionToken = <K_TRUE> | actionToken = <K_FALSE> | actionToken = <K_ON> | actionToken = <K_OFF>  | actionToken = <K_YES> | actionToken = <K_NO> )
+        { sessionsStatement.putOption(idToken.image, actionToken.image ); }
+
+        (
+            ","
+            idToken = <S_IDENTIFIER>
+            "="
+            ( actionToken = <S_IDENTIFIER> | actionToken = <S_QUOTED_IDENTIFIER> | actionToken = <S_CHAR_LITERAL> | actionToken = <S_LONG> | actionToken = <K_TRUE> | actionToken = <K_FALSE> | actionToken = <K_ON> | actionToken = <K_OFF>  | actionToken = <K_YES> | actionToken = <K_NO> )
+            { sessionsStatement.putOption(idToken.image, actionToken.image ); }
+        )*
+    ]
 
+    {
         //linkAST(sessionsStatement,jjtThis);
         return sessionsStatement;
     }

src/test/java/net/sf/jsqlparser/statement/SessionStatementTest.java

@@ -21,7 +21,8 @@ class SessionStatementTest {
     @ValueSource(strings = {
             "SESSION START 1234", "SESSION START", "SESSION APPLY 'test'", "SESSION APPLY",
             "SESSION DROP \"test\"", "SESSION DROP", "SESSION SHOW test", "SESSION SHOW",
-            "SESSION DESCRIBE 1234", "SESSION DESCRIBE", "SESSION START unnamed.session1"
+            "SESSION DESCRIBE 1234", "SESSION DESCRIBE", "SESSION START unnamed.session1",
+            "SESSION START unnamed.session1 WITH persist=false,cleanup=on"
     })
     void testStartSession(String sqlStr) throws JSQLParserException {
         SessionStatement sessionStatement =