fix using timeout order in select stmt

This commit is contained in:
yemin.li
2022-03-23 18:32:12 -04:00
committed by Michal Jan Matczuk
parent 25d81de30e
commit c965fdf183
2 changed files with 5 additions and 4 deletions

View File

@@ -84,7 +84,6 @@ func (b *SelectBuilder) ToCql() (stmt string, names []string) {
cql.WriteString(b.table) cql.WriteString(b.table)
cql.WriteByte(' ') cql.WriteByte(' ')
names = append(names, b.using.writeCql(&cql)...)
names = append(names, b.where.writeCql(&cql)...) names = append(names, b.where.writeCql(&cql)...)
if len(b.groupBy) > 0 { if len(b.groupBy) > 0 {
@@ -110,6 +109,8 @@ func (b *SelectBuilder) ToCql() (stmt string, names []string) {
cql.WriteString("BYPASS CACHE ") cql.WriteString("BYPASS CACHE ")
} }
names = append(names, b.using.writeCql(&cql)...)
stmt = cql.String() stmt = cql.String()
return return
} }

View File

@@ -81,13 +81,13 @@ func TestSelectBuilder(t *testing.T) {
// Add TIMEOUT // Add TIMEOUT
{ {
B: Select("cycling.cyclist_name").Where(w, Gt("firstname")).Timeout(time.Second), 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"}, N: []string{"expr", "firstname"},
}, },
{ {
B: Select("cycling.cyclist_name").Where(w, Gt("firstname")).TimeoutNamed("to"), B: Select("cycling.cyclist_name").Where(w, Gt("firstname")).TimeoutNamed("to"),
S: "SELECT * FROM cycling.cyclist_name USING TIMEOUT ? WHERE id=? AND firstname>? ", S: "SELECT * FROM cycling.cyclist_name WHERE id=? AND firstname>? USING TIMEOUT ? ",
N: []string{"to", "expr", "firstname"}, N: []string{"expr", "firstname", "to"},
}, },
// Add GROUP BY // Add GROUP BY
{ {