#67: Fixed LISTAGG syntax (#68)

exasol · Feb 1, 2023 · f20e5c9 · f20e5c9
1 parent 58cc65c
commit f20e5c9
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 14 deletions.
diff --git a/doc/changes/changes_2.4.0.md b/doc/changes/changes_2.4.0.md
@@ -1,6 +1,6 @@
-# virtual-schema-common-lua 2.4.0, released 2023-01-??
+# virtual-schema-common-lua 2.4.0, released 2023-02-01
 
-Code name: Boolean Properties
+Code name: Boolean Properties, IS JSON, LISTAGG
 
 ## Summary
 
@@ -16,4 +16,8 @@ The core database does not push the `OVER` clause that makes the main difference
 
 * #19: Added `LISTAGG` aggregate function rendering
 * #60: Added `IS [NOT] JSON` predicate rendering
-* #63: Added support for boolean Virtual Schema properties
+* #63: Added support for boolean Virtual Schema properties
+
+## Bugfixes
+
+* #67: Fixed `LISTAGG` overflow clause
diff --git a/spec/RequestDispatcher_spec.lua b/spec/RequestDispatcher_spec.lua
@@ -127,7 +127,7 @@ describe("RequestDispatcher", function()
         assert.error_contains(call_with_illegal_request_type, "Unknown Virtual Schema request type 'illegal' received.")
     end)
 
-    it("wraps caught errors to log them",function()
+    it("wraps caught errors to log them", function()
         assert.has_error(call_with_illegal_request_type)
         assert.spy(log_mock.fatal).was.called_with(
                 [[F-RQD-1: Unknown Virtual Schema request type 'illegal' received.

diff --git a/spec/queryrenderer/AggregateFunctionAppender_spec.lua b/spec/queryrenderer/AggregateFunctionAppender_spec.lua
@@ -181,7 +181,7 @@ describe("AggregateFunctionRenderer", function()
     )
 
     it_asserts(
-            [[LISTAGG("capabilities"."name") ON OVERFLOW ERROR]],
+            [[LISTAGG("capabilities"."name" ON OVERFLOW ERROR)]],
             run_complex_function("LISTAGG",
                     {
                         arguments = {reference.column("capabilities", "name")},
@@ -192,7 +192,7 @@ describe("AggregateFunctionRenderer", function()
     )
 
     it_asserts(
-            [[LISTAGG("capabilities"."name") ON OVERFLOW TRUNCATE WITHOUT COUNT]],
+            [[LISTAGG("capabilities"."name" ON OVERFLOW TRUNCATE WITHOUT COUNT)]],
             run_complex_function("LISTAGG",
                     {
                         arguments = {reference.column("capabilities", "name")},
@@ -203,7 +203,7 @@ describe("AggregateFunctionRenderer", function()
     )
 
     it_asserts(
-            [[LISTAGG("capabilities"."name") ON OVERFLOW TRUNCATE ', etc.' WITHOUT COUNT]],
+            [[LISTAGG("capabilities"."name" ON OVERFLOW TRUNCATE ', etc.' WITHOUT COUNT)]],
             run_complex_function("LISTAGG",
                     {
                         arguments = {reference.column("capabilities", "name")},
@@ -217,7 +217,7 @@ describe("AggregateFunctionRenderer", function()
     )
 
     it_asserts(
-            [[LISTAGG("capabilities"."name") ON OVERFLOW TRUNCATE WITH COUNT]],
+            [[LISTAGG("capabilities"."name" ON OVERFLOW TRUNCATE WITH COUNT)]],
             run_complex_function("LISTAGG",
                     {
                         arguments = {reference.column("capabilities", "name")},

diff --git a/src/exasolvs/queryrenderer/AggregateFunctionAppender.lua b/src/exasolvs/queryrenderer/AggregateFunctionAppender.lua
@@ -139,12 +139,6 @@ function AggregateFunctionAppender:_listagg(f)
         self:_append(", ")
         self:_append_expression(f.separator)
     end
-    self:_append(")")
-    if f.orderBy then
-        self:_append(" WITHIN GROUP (")
-        SelectAppender._append_order_by(self, f.orderBy, true)
-        self:_append(")")
-    end
     local overflow = f.overflowBehavior
     if overflow then
         if overflow.type == "ERROR" then
@@ -158,6 +152,12 @@ function AggregateFunctionAppender:_listagg(f)
             self:_append((overflow.truncationType == "WITH COUNT") and " WITH COUNT" or " WITHOUT COUNT")
         end
     end
+    self:_append(")")
+    if f.orderBy then
+        self:_append(" WITHIN GROUP (")
+        SelectAppender._append_order_by(self, f.orderBy, true)
+        self:_append(")")
+    end
 end
 
 AggregateFunctionAppender._max = AggregateFunctionAppender._append_distinct_function