pgstmt: handle raw (#26)

* pgstmt: handle raw

* add timestamp test

pgstmt/arg.go

@@ -7,6 +7,7 @@ func Arg(v interface{}) interface{} {
 		return arg{v}
 	case arg:
 	case notArg:
+	case raw:
 	case _any:
 	case all:
 	case defaultValue:
@@ -30,6 +31,15 @@ type notArg struct {
 	value interface{}
 }
 
+// Raw marks value as raw sql without escape
+func Raw(v interface{}) interface{} {
+	return raw{v}
+}
+
+type raw struct {
+	value interface{}
+}
+
 // Any marks value as any($?)
 func Any(v interface{}) interface{} {
 	return _any{v}

pgstmt/build.go

@@ -4,6 +4,9 @@ import (
 	"fmt"
 	"strconv"
 	"strings"
+	"time"
+
+	"github.com/lib/pq"
 )
 
 type buffer struct {
@@ -49,7 +52,7 @@ func build(b *buffer) (string, []interface{}) {
 		for _, x := range p {
 			switch x := x.(type) {
 			default:
-				q = append(q, convertToString(x))
+				q = append(q, convertToString(x, false))
 			case builder:
 				q = append(q, f(x.build(), " "))
 			case arg:
@@ -80,11 +83,14 @@ func build(b *buffer) (string, []interface{}) {
 	return query, args
 }
 
-func convertToString(x interface{}) string {
+func convertToString(x interface{}, quoteStr bool) string {
 	switch x := x.(type) {
 	default:
 		return fmt.Sprint(x)
 	case string:
+		if quoteStr {
+			return pq.QuoteLiteral(x)
+		}
 		return x
 	case int:
 		return strconv.Itoa(x)
@@ -94,8 +100,12 @@ func convertToString(x interface{}) string {
 		return strconv.FormatInt(x, 10)
 	case bool:
 		return strconv.FormatBool(x)
+	case time.Time:
+		return convertToString(string(pq.FormatTimestamp(x)), true)
 	case notArg:
-		return convertToString(x.value)
+		return convertToString(x.value, true)
+	case raw:
+		return fmt.Sprint(x.value)
 	case defaultValue:
 		return "default"
 	}

pgstmt/cond.go

@@ -54,7 +54,7 @@ func (st *cond) Op(field, op string, value interface{}) {
 func (st *cond) OpRaw(field, op string, rawValue interface{}) {
 	var x group
 	x.sep = " "
-	x.push(field, op, rawValue)
+	x.push(field, op, Raw(rawValue))
 	st.ops.push(&x)
 }
 

pgstmt/update_test.go

@@ -2,6 +2,7 @@ package pgstmt_test
 
 import (
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/assert"
 
@@ -15,7 +16,7 @@ func TestUpdate(t *testing.T) {
 		q, args := pgstmt.Update(func(b pgstmt.UpdateStatement) {
 			b.Table("users")
 			b.Set("name").To("test")
-			b.Set("email", "address", "updated_at").To("test@localhost", "123", pgstmt.NotArg("now()"))
+			b.Set("email", "address", "updated_at").To("test@localhost", "123", pgstmt.Raw("now()"))
 			b.Set("age").ToRaw(1)
 			b.Where(func(b pgstmt.Cond) {
 				b.Eq("id", 5)
@@ -89,6 +90,7 @@ func TestUpdate(t *testing.T) {
 			b.Set("name").ToRaw("p.name")
 			b.Set("address").ToRaw("p.address")
 			b.Set("updated_at").ToRaw("now()")
+			b.Set("date").To(pgstmt.NotArg(time.Date(2022, 1, 2, 3, 4, 5, 6, time.UTC)))
 			b.From("users")
 			b.InnerJoin("profiles p").Using("email")
 			b.Where(func(b pgstmt.Cond) {
@@ -101,7 +103,8 @@ func TestUpdate(t *testing.T) {
 				update users
 				set name = p.name,
 					address = p.address,
-					updated_at = now()
+					updated_at = now(),
+					date = '2022-01-02 03:04:05.000000006Z'
 				from users
 				inner join profiles p using (email)
 				where (users.id = $1)