Merge pull request #65 from NathanEckert/fix/spark_lambdas

Fix spark lambdas
vertical-blank · May 25, 2023 · 5120732 · 5120732
2 parents c75a4ac + 0d9aa91
commit 5120732
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/src/main/java/com/github/vertical_blank/sqlformatter/languages/SparkSqlFormatter.java b/src/main/java/com/github/vertical_blank/sqlformatter/languages/SparkSqlFormatter.java
@@ -252,7 +252,7 @@ public DialectConfig dialectConfig() {
         .indexedPlaceholderTypes(Collections.singletonList("?"))
         .namedPlaceholderTypes(Collections.singletonList("$"))
         .lineCommentTypes(Collections.singletonList("--"))
-        .operators(Arrays.asList("!=", "<=>", "&&", "||", "=="))
+        .operators(Arrays.asList("!=", "<=>", "&&", "||", "==", "->"))
         .build();
   }
 

diff --git a/src/test/java/com/github/vertical_blank/sqlformatter/SqlFormatterTest.java b/src/test/java/com/github/vertical_blank/sqlformatter/SqlFormatterTest.java
@@ -75,4 +75,14 @@ public void withIndexedParams() {
     String format = SqlFormatter.format("SELECT * FROM tbl WHERE foo = ?", Arrays.asList("'bar'"));
     assertEquals(format, "SELECT\n" + "  *\n" + "FROM\n" + "  tbl\n" + "WHERE\n" + "  foo = 'bar'");
   }
+
+  @Test
+  public void withLambdasParams() {
+    String format =
+        SqlFormatter.of(Dialect.SparkSql)
+            .format("SELECT aggregate(array(1, 2, 3), 0, (acc, x) -> acc + x, acc -> acc * 10);");
+    assertEquals(
+        format,
+        "SELECT\n" + "  aggregate(array(1, 2, 3), 0, (acc, x) -> acc + x, acc -> acc * 10);");
+  }
 }
diff --git a/src/test/kotlin/com/github/vertical_blank/sqlformatter/SparkSqlFormatterTest.kt b/src/test/kotlin/com/github/vertical_blank/sqlformatter/SparkSqlFormatterTest.kt
@@ -31,7 +31,7 @@ object SparkSqlFormatterTest :
         supportsSchema(formatter)
         supportsOperators(
           formatter,
-          listOf("!=", "%", "|", "&", "^", "~", "!", "<=>", "%", "&&", "||", "==")
+          listOf("!=", "%", "|", "&", "^", "~", "!", "<=>", "%", "&&", "||", "==", "->")
         )
         supportsJoin(
           formatter,