From 7de83fa1972d08ea39587ba2c91471005d2660cd Mon Sep 17 00:00:00 2001
From: pokeeffe-molecula <patrick.okeeffe@molecula.com>
Date: Thu, 6 Apr 2023 14:58:31 -0500
Subject: [PATCH] improved testing

---
 sql3/parser/ast.go             |  3 ++-
 sql3/test/defs/defs_groupby.go | 47 +++++++++++++++++++++++++++++-----
 2 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/sql3/parser/ast.go b/sql3/parser/ast.go
index 9b4baa91b..aa63e6e4c 100644
--- a/sql3/parser/ast.go
+++ b/sql3/parser/ast.go
@@ -4230,13 +4230,14 @@ func (n *QualifiedTableName) String() string {
 	}
 
 	if n.With.IsValid() {
-		buf.WriteString(" WITH")
+		buf.WriteString(" WITH (")
 		for i, o := range n.QueryOptions {
 			if i > 0 {
 				buf.WriteString(", ")
 			}
 			fmt.Fprintf(&buf, " %s", o.String())
 		}
+		buf.WriteString(")")
 	}
 	return buf.String()
 }
diff --git a/sql3/test/defs/defs_groupby.go b/sql3/test/defs/defs_groupby.go
index 29651e4eb..bc71c1f0a 100644
--- a/sql3/test/defs/defs_groupby.go
+++ b/sql3/test/defs/defs_groupby.go
@@ -272,6 +272,7 @@ var groupBySetDistinctTests = TableTest{
 			srcRow(int64(2), []int64{3, 4}, []string{"d", "e"}),
 			srcRow(int64(3), []int64{1, 4}, []string{"a", "d"}),
 			srcRow(int64(4), []int64{3, 2}, []string{"c", "b"}),
+			srcRow(int64(5), []int64{3, 2}, []string{"c", "b"}),
 		),
 	),
 	SQLTests: []SQLTest{
@@ -323,6 +324,40 @@ var groupBySetDistinctTests = TableTest{
 			),
 			Compare: CompareExactUnordered,
 		},
+		{
+			SQLs: sqls(
+				"select distinct ids1, ss1 from groupby_set_test",
+			),
+			ExpHdrs: hdrs(
+				hdr("ids1", fldTypeIDSet),
+				hdr("ss1", fldTypeStringSet),
+			),
+			ExpRows: rows(
+				row([]int64{1, 2}, []string{"a", "b"}),
+				row([]int64{3, 4}, []string{"d", "e"}),
+				row([]int64{1, 4}, []string{"a", "d"}),
+				row([]int64{2, 3}, []string{"b", "c"}),
+			),
+			Compare:        CompareExactUnordered,
+			SortStringKeys: true,
+		},
+		{
+			SQLs: sqls(
+				"select distinct ids1, ss1 from groupby_set_test with (flatten(ids1))",
+			),
+			ExpHdrs: hdrs(
+				hdr("ids1", fldTypeIDSet),
+				hdr("ss1", fldTypeStringSet),
+			),
+			ExpRows: rows(
+				row([]int64{1, 2}, []string{"a", "b"}),
+				row([]int64{3, 4}, []string{"d", "e"}),
+				row([]int64{1, 4}, []string{"a", "d"}),
+				row([]int64{2, 3}, []string{"b", "c"}),
+			),
+			Compare:        CompareExactUnordered,
+			SortStringKeys: true,
+		},
 		{
 			SQLs: sqls(
 				"select count(*), ids1 from groupby_set_test group by ids1",
@@ -335,7 +370,7 @@ var groupBySetDistinctTests = TableTest{
 				row(int64(1), []int64{1, 2}),
 				row(int64(1), []int64{3, 4}),
 				row(int64(1), []int64{1, 4}),
-				row(int64(1), []int64{2, 3}),
+				row(int64(2), []int64{2, 3}),
 			),
 			Compare: CompareExactUnordered,
 		},
@@ -349,8 +384,8 @@ var groupBySetDistinctTests = TableTest{
 			),
 			ExpRows: rows(
 				row(int64(2), []int64{1}),
-				row(int64(2), []int64{2}),
-				row(int64(2), []int64{3}),
+				row(int64(3), []int64{2}),
+				row(int64(3), []int64{3}),
 				row(int64(2), []int64{4}),
 			),
 			Compare: CompareExactUnordered,
@@ -400,7 +435,7 @@ var groupBySetDistinctTests = TableTest{
 				row(int64(1), []string{"a", "b"}),
 				row(int64(1), []string{"d", "e"}),
 				row(int64(1), []string{"a", "d"}),
-				row(int64(1), []string{"b", "c"}),
+				row(int64(2), []string{"b", "c"}),
 			),
 			Compare:        CompareExactUnordered,
 			SortStringKeys: true,
@@ -415,8 +450,8 @@ var groupBySetDistinctTests = TableTest{
 			),
 			ExpRows: rows(
 				row(int64(2), []string{"a"}),
-				row(int64(2), []string{"b"}),
-				row(int64(1), []string{"c"}),
+				row(int64(3), []string{"b"}),
+				row(int64(2), []string{"c"}),
 				row(int64(2), []string{"d"}),
 				row(int64(1), []string{"e"}),
 			),