Simplify literal expressions.

sqlite/cast.go

@@ -4,21 +4,20 @@ import (
 	"github.com/go-jet/jet/v2/internal/jet"
 )
 
-type cast struct {
-	jet.Cast
+// CAST function converts an expr (of any type) into later specified datatype.
+func CAST(expr Expression) *cast {
+	return &cast{
+		expr: expr,
+	}
 }
 
-// CAST function converts a expr (of any type) into latter specified datatype.
-func CAST(expr Expression) *cast {
-	ret := &cast{}
-	ret.Cast = jet.NewCastImpl(expr)
-
-	return ret
+type cast struct {
+	expr Expression
 }
 
 // AS casts expressions to castType
 func (c *cast) AS(castType string) Expression {
-	return c.Cast.AS(castType)
+	return jet.AtomicCustomExpression(Token("CAST("), c.expr, Token("AS "+castType+")"))
 }
 
 // AS_TEXT cast expression to TEXT type

sqlite/expressions_test.go

@@ -1,8 +1,9 @@
 package sqlite
 
 import (
-	"github.com/stretchr/testify/require"
 	"testing"
+
+	"github.com/stretchr/testify/require"
 )
 
 func TestRaw(t *testing.T) {
@@ -46,7 +47,7 @@ func TestRawInvalidArguments(t *testing.T) {
 
 func TestRawType(t *testing.T) {
 	assertSerialize(t, RawBool("table.colInt < :float", RawArgs{":float": 11.22}).IS_FALSE(),
-		"(table.colInt < ?) IS FALSE", 11.22)
+		"((table.colInt < ?) IS FALSE)", 11.22)
 
 	assertSerialize(t, RawFloat("table.colInt + &float", RawArgs{"&float": 11.22}).EQ(Float(3.14)),
 		"((table.colInt + ?) = ?)", 11.22, 3.14)