Fix bug in JOIN USING

stephenafamo · Nov 16, 2023 · ff7112d · ff7112d
1 parent 4b60617
commit ff7112d
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 6 deletions.
diff --git a/clause/join.go b/clause/join.go
@@ -46,20 +46,21 @@ func (j Join) WriteSQL(w io.Writer, d bob.Dialect, start int) ([]any, error) {
 	args = append(args, onArgs...)
 
 	for k, col := range j.Using {
-		if k != 0 {
-			w.Write([]byte("USING("))
+		if k == 0 {
+			w.Write([]byte(" USING("))
 		} else {
 			w.Write([]byte(", "))
 		}
 
-		if k == len(j.Using)-1 {
-			w.Write([]byte(")"))
-		}
-
 		_, err = expr.Quote(col).WriteSQL(w, d, 1) // start does not matter
 		if err != nil {
 			return nil, err
 		}
+
+		if k == len(j.Using)-1 {
+			w.Write([]byte(") "))
+		}
+
 	}
 
 	return args, nil

diff --git a/dialect/psql/select_test.go b/dialect/psql/select_test.go
@@ -121,6 +121,14 @@ func TestSelect(t *testing.T) {
 				sm.Limit(psql.Arg(10)),
 			),
 		},
+		"join using": {
+			ExpectedSQL: "SELECT id FROM test1 LEFT JOIN test2 USING (id)",
+			Query: psql.Select(
+				sm.Columns("id"),
+				sm.From("test1"),
+				sm.LeftJoin("test2").Using("id"),
+			),
+		},
 	}
 
 	testutils.RunTests(t, examples, formatter)

diff --git a/website/docs/query-builder/psql/examples/select.md b/website/docs/query-builder/psql/examples/select.md
@@ -212,3 +212,21 @@ psql.Select(
   sm.Limit(psql.Arg(10)),
 )
 ```
+
+## Join Using
+
+SQL:
+
+```sql
+SELECT id FROM test1 LEFT JOIN test2 USING (id)
+```
+
+Code:
+
+```go
+psql.Select(
+  sm.Columns("id"),
+  sm.From("test1"),
+  sm.LeftJoin("test2").Using("id"),
+)
+```