Expand expansions recursively

upper · Feb 15, 2017 · 03a584c · 03a584c
1 parent 337a38c
commit 03a584c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/lib/sqlbuilder/builder_test.go b/lib/sqlbuilder/builder_test.go
@@ -61,6 +61,16 @@ func TestSelect(t *testing.T) {
 		b.Select().Distinct(db.Raw(`ON(?) col1`, db.Raw(`SELECT foo FROM bar`))).Columns("col2", "col3").Distinct("col4", "col5").From("artist").String(),
 	)
 
+	assert.Equal(
+		`SELECT DISTINCT ON (SELECT foo FROM bar, SELECT baz from qux) col1, "col2", "col3", "col4", "col5" FROM "artist"`,
+		b.Select().Distinct(db.Raw(`ON ? col1`, []interface{}{db.Raw(`SELECT foo FROM bar`), db.Raw(`SELECT baz from qux`)})).Columns("col2", "col3").Distinct("col4", "col5").From("artist").String(),
+	)
+
+	assert.Equal(
+		`SELECT DISTINCT ON ((SELECT foo FROM bar, SELECT baz from qux)) col1, "col2", "col3", "col4", "col5" FROM "artist"`,
+		b.Select().Distinct(db.Raw(`ON (?) col1`, []db.RawValue{db.Raw(`SELECT foo FROM bar`), db.Raw(`SELECT baz from qux`)})).Columns("col2", "col3").Distinct("col4", "col5").From("artist").String(),
+	)
+
 	{
 		rawCase := db.Raw("CASE WHEN id IN ? THEN 0 ELSE 1 END", []int{1000, 2000})
 		sel := b.SelectFrom("artist").OrderBy(rawCase)

diff --git a/lib/sqlbuilder/convert.go b/lib/sqlbuilder/convert.go
@@ -35,10 +35,13 @@ func expandQuery(in string, args []interface{}, fn func(interface{}) (string, []
 		}
 		if len(args) > argn {
 			k, values := fn(args[argn])
+			k, values = expandQuery(k, values, fn)
+
 			if k != "" {
 				in = in[:i] + k + in[i+1:]
 				i += len(k) - 1
 			}
+
 			if len(values) > 0 {
 				argx = append(argx, values...)
 			}