fix range between queries

Author: mayberryzane

go.mod

@@ -1,4 +1,4 @@
-module github.com/AfterShip/clickhouse-sql-parser
+module github.com/highlight/clickhouse-sql-parser
 
 go 1.18
 

main.go

@@ -7,7 +7,7 @@ import (
 	"os"
 	"strings"
 
-	clickhouse "github.com/AfterShip/clickhouse-sql-parser/parser"
+	clickhouse "github.com/highlight/clickhouse-sql-parser/parser"
 )
 
 const VERSION = "0.3.8"

parser/ast.go

@@ -5208,8 +5208,11 @@ func (f *BetweenClause) End() Pos {
 
 func (f *BetweenClause) String() string {
 	var builder strings.Builder
-	builder.WriteString(f.Expr.String())
-	builder.WriteString(" BETWEEN ")
+	if f.Expr != nil {
+		builder.WriteString(f.Expr.String())
+		builder.WriteString(" ")
+	}
+	builder.WriteString("BETWEEN ")
 	builder.WriteString(f.Between.String())
 	builder.WriteString(" AND ")
 	builder.WriteString(f.And.String())
@@ -5266,7 +5269,7 @@ func (f *WindowFrameUnbounded) End() Pos {
 }
 
 func (f *WindowFrameUnbounded) String() string {
-	return f.Direction + " UNBOUNDED"
+	return "UNBOUNDED " + f.Direction
 }
 
 func (f *WindowFrameUnbounded) Accept(visitor ASTVisitor) error {