From c965fdf183424ec8173bcc930c68c7c3e62793c9 Mon Sep 17 00:00:00 2001
From: "yemin.li" <yemin@stackadapt.com>
Date: Wed, 23 Mar 2022 18:32:12 -0400
Subject: [PATCH] fix using timeout order in select stmt

---
 qb/select.go      | 3 ++-
 qb/select_test.go | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/qb/select.go b/qb/select.go
index b160b28..afadc04 100644
--- a/qb/select.go
+++ b/qb/select.go
@@ -84,7 +84,6 @@ func (b *SelectBuilder) ToCql() (stmt string, names []string) {
 	cql.WriteString(b.table)
 	cql.WriteByte(' ')
 
-	names = append(names, b.using.writeCql(&cql)...)
 	names = append(names, b.where.writeCql(&cql)...)
 
 	if len(b.groupBy) > 0 {
@@ -110,6 +109,8 @@ func (b *SelectBuilder) ToCql() (stmt string, names []string) {
 		cql.WriteString("BYPASS CACHE ")
 	}
 
+	names = append(names, b.using.writeCql(&cql)...)
+
 	stmt = cql.String()
 	return
 }
diff --git a/qb/select_test.go b/qb/select_test.go
index 3afedea..80df9ca 100644
--- a/qb/select_test.go
+++ b/qb/select_test.go
@@ -81,13 +81,13 @@ func TestSelectBuilder(t *testing.T) {
 		// Add TIMEOUT
 		{
 			B: Select("cycling.cyclist_name").Where(w, Gt("firstname")).Timeout(time.Second),
-			S: "SELECT * FROM cycling.cyclist_name USING TIMEOUT 1s WHERE id=? AND firstname>? ",
+			S: "SELECT * FROM cycling.cyclist_name WHERE id=? AND firstname>? USING TIMEOUT 1s ",
 			N: []string{"expr", "firstname"},
 		},
 		{
 			B: Select("cycling.cyclist_name").Where(w, Gt("firstname")).TimeoutNamed("to"),
-			S: "SELECT * FROM cycling.cyclist_name USING TIMEOUT ? WHERE id=? AND firstname>? ",
-			N: []string{"to", "expr", "firstname"},
+			S: "SELECT * FROM cycling.cyclist_name WHERE id=? AND firstname>? USING TIMEOUT ? ",
+			N: []string{"expr", "firstname", "to"},
 		},
 		// Add GROUP BY
 		{