Merge branch 'master' of github.com:uptrace/bun

uptrace · Sep 9, 2021 · 705a2fe · 705a2fe
2 parents 8c95378 + 36e9451
commit 705a2fe
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/internal/dbtest/db_test.go b/internal/dbtest/db_test.go
@@ -265,6 +265,7 @@ func testSelectScan(t *testing.T, db *bun.DB) {
 func testSelectCount(t *testing.T, db *bun.DB) {
 	if !db.Dialect().Features().Has(feature.CTE) {
 		t.Skip()
+		return
 	}
 
 	values := db.NewValues(&[]map[string]interface{}{
@@ -273,12 +274,19 @@ func testSelectCount(t *testing.T, db *bun.DB) {
 		{"num": 3},
 	})
 
-	count, err := db.NewSelect().
+	q := db.NewSelect().
 		With("t", values).
+		Column("t.num").
 		TableExpr("t").
 		OrderExpr("t.num DESC").
-		Limit(1).
-		Count(ctx)
+		Limit(1)
+
+	var num int
+	err := q.Scan(ctx, &num)
+	require.NoError(t, err)
+	require.Equal(t, 3, num)
+
+	count, err := q.Count(ctx)
 	require.NoError(t, err)
 	require.Equal(t, 3, count)
 }

diff --git a/query_select.go b/query_select.go
@@ -527,7 +527,7 @@ func (q *SelectQuery) appendColumns(fmter schema.Formatter, b []byte) (_ []byte,
 				b = append(b, ", "...)
 			}
 
-			if col.Args == nil {
+			if col.Args == nil && q.table != nil {
 				if field, ok := q.table.FieldMap[col.Query]; ok {
 					b = append(b, q.table.SQLAlias...)
 					b = append(b, '.')