Allow parsing sql expressions (#2389)

finos · Oct 19, 2023 · bdd95cf · bdd95cf
1 parent c6100b9
commit bdd95cf
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 0 deletions.
diff --git a/...mar/src/main/java/org/finos/legend/engine/language/sql/grammar/from/SQLGrammarParser.java b/...mar/src/main/java/org/finos/legend/engine/language/sql/grammar/from/SQLGrammarParser.java
@@ -28,6 +28,7 @@
 import org.finos.legend.engine.language.sql.grammar.from.antlr4.SqlBaseLexer;
 import org.finos.legend.engine.language.sql.grammar.from.antlr4.SqlBaseParser;
 import org.finos.legend.engine.protocol.pure.v1.model.SourceInformation;
+import org.finos.legend.engine.protocol.sql.metamodel.Expression;
 import org.finos.legend.engine.protocol.sql.metamodel.Statement;
 
 import java.util.BitSet;
@@ -51,6 +52,12 @@ public Statement parseStatement(String query)
         return this.parse(query, "statement");
     }
 
+    public Expression parseExpression(String expression)
+    {
+        SqlBaseParser parser = getSqlBaseParser(expression, "expression");
+        return (Expression) sqlVisitor.visitSingleExpression(parser.singleExpression());
+    }
+
     private Statement parse(String query, String name)
     {
         SqlBaseParser parser = getSqlBaseParser(query, name);

diff --git a/...st/java/org/finos/legend/engine/language/sql/grammar/test/roundtrip/TestSQLRoundTrip.java b/...st/java/org/finos/legend/engine/language/sql/grammar/test/roundtrip/TestSQLRoundTrip.java
@@ -128,18 +128,36 @@ public void testWhere()
         check("SELECT * FROM myTable WHERE col1 = 1");
     }
 
+    @Test
+    public void testWhereExpression()
+    {
+        checkExpression("col1 = 1");
+    }
+
     @Test
     public void testCompositeWhere()
     {
         check("SELECT * FROM myTable WHERE col1 = 1 AND col2 = 1");
     }
 
+    @Test
+    public void testCompositeWhereExpression()
+    {
+        checkExpression("col1 = 1 AND col2 = 1");
+    }
+
     @Test
     public void testWhereQualified()
     {
         check("SELECT * FROM myTable WHERE myTable.col1 = 1");
     }
 
+    @Test
+    public void testWhereQualifiedExpression()
+    {
+        checkExpression("myTable.col1 = 1");
+    }
+
     @Test
     public void testCompositeWhereQualifiedWithAlias()
     {
@@ -155,6 +173,15 @@ public void testCompositeWhereOperators()
                 "col BETWEEN 0 AND 1");
     }
 
+    @Test
+    public void testCompositeWhereOperatorsExpression()
+    {
+        checkExpression("col = 1 AND col > 1 AND col < 1 " +
+                "AND col >= 1 AND col <= 1 AND col IN (1, 2, 3) AND col IS NULL AND " +
+                "col IS NOT NULL AND col IS DISTINCT FROM 1 AND col IS NOT DISTINCT FROM 1 AND " +
+                "col BETWEEN 0 AND 1");
+    }
+
     @Test
     public void testGroupBy()
     {
@@ -324,4 +351,19 @@ private void check(String sql, String expected)
         String result = composer.renderNode(node);
         MatcherAssert.assertThat(result.trim(), IsEqualIgnoringCase.equalToIgnoringCase(expected));
     }
+
+    private void checkExpression(String expression)
+    {
+        checkExpression(expression, expression);
+        checkExpression(expression.toLowerCase(), expression);
+    }
+
+    private void checkExpression(String expression, String expected)
+    {
+        SQLGrammarParser parser = SQLGrammarParser.newInstance();
+        Node node = parser.parseExpression(expression);
+        SQLGrammarComposer composer = SQLGrammarComposer.newInstance();
+        String result = composer.renderNode(node);
+        MatcherAssert.assertThat(result.trim(), IsEqualIgnoringCase.equalToIgnoringCase(expected));
+    }
 }