fix #192 Add new flavor Doris

Author: huandu

args.go

@@ -149,6 +149,18 @@ func (args *Args) CompileWithFlavor(format string, flavor Flavor, initialValue .
 	return
 }
 
+// Value returns the value of the arg.
+// The arg must be the value returned by `Add`.
+func (args *Args) Value(arg string) interface{} {
+	_, values := args.Compile(arg)
+
+	if len(values) == 0 {
+		return nil
+	}
+
+	return values[0]
+}
+
 func (args *Args) compileNamed(ctx *argsCompileContext, format string) string {
 	i := 1
 
@@ -324,7 +336,7 @@ func (ctx *argsCompileContext) WriteValue(arg interface{}) {
 
 	default:
 		switch ctx.Flavor {
-		case MySQL, SQLite, CQL, ClickHouse, Presto, Informix:
+		case MySQL, SQLite, CQL, ClickHouse, Presto, Informix, Doris:
 			ctx.WriteRune('?')
 		case PostgreSQL:
 			fmt.Fprintf(ctx, "$%d", len(ctx.Values)+1)

args_test.go

@@ -138,3 +138,17 @@ func TestArgsAdd(t *testing.T) {
 		a.Equal(actual, fmt.Sprintf("$%v", i))
 	}
 }
+
+func TestArgsValue(t *testing.T) {
+	a := assert.New(t)
+	args := &Args{}
+
+	v1 := 123
+	arg1 := args.Add(v1)
+	argInvalid := "invalid"
+	argLooselyTyped := arg1 + "something else"
+
+	a.Equal(v1, args.Value(arg1))
+	a.Equal(nil, args.Value(argInvalid))
+	a.Equal(v1, args.Value(argLooselyTyped))
+}

flavor.go

@@ -21,6 +21,7 @@ const (
 	Presto
 	Oracle
 	Informix
+	Doris
 )
 
 var (
@@ -64,6 +65,8 @@ func (f Flavor) String() string {
 		return "Oracle"
 	case Informix:
 		return "Informix"
+	case Doris:
+		return "Doris"
 	}
 
 	return "<invalid>"
@@ -94,6 +97,8 @@ func (f Flavor) Interpolate(sql string, args []interface{}) (string, error) {
 		return oracleInterpolate(sql, args...)
 	case Informix:
 		return informixInterpolate(sql, args...)
+	case Doris:
+		return dorisInterpolate(sql, args...)
 	}
 
 	return "", ErrInterpolateNotImplemented
@@ -162,7 +167,7 @@ func (f Flavor) NewCTEQueryBuilder() *CTEQueryBuilder {
 //   - For PostgreSQL, SQL Server and SQLite, use double quote (") to quote name.
 func (f Flavor) Quote(name string) string {
 	switch f {
-	case MySQL, ClickHouse:
+	case MySQL, ClickHouse, Doris:
 		return fmt.Sprintf("`%s`", name)
 	case PostgreSQL, SQLServer, SQLite, Presto, Oracle, Informix:
 		return fmt.Sprintf(`"%s"`, name)
@@ -190,7 +195,7 @@ func (f Flavor) PrepareInsertIgnore(table string, ib *InsertBuilder) {
 		// see https://www.sqlite.org/lang_insert.html
 		ib.verb = "INSERT OR IGNORE"
 
-	case ClickHouse, CQL, SQLServer, Presto, Informix:
+	case ClickHouse, CQL, SQLServer, Presto, Informix, Doris:
 		// All other databases do not support insert ignore
 		ib.verb = "INSERT"
 

flavor_test.go

@@ -22,6 +22,7 @@ func TestFlavor(t *testing.T) {
 		ClickHouse: "ClickHouse",
 		Oracle:     "Oracle",
 		Informix:   "Informix",
+		Doris:      "Doris",
 	}
 
 	for f, expected := range cases {

interpolate.go

@@ -403,6 +403,10 @@ func informixInterpolate(query string, args ...interface{}) (string, error) {
 	return mysqlLikeInterpolate(Informix, query, args...)
 }
 
+func dorisInterpolate(query string, args ...interface{}) (string, error) {
+	return mysqlLikeInterpolate(Doris, query, args...)
+}
+
 // oraclelInterpolate parses query and replace all ":*" with encoded args.
 // If there are more ":*" than len(args), returns ErrMissingArgs.
 // Otherwise, if there are less ":*" than len(args), the redundant args are omitted.
@@ -590,7 +594,7 @@ func encodeValue(buf []byte, arg interface{}, flavor Flavor) ([]byte, error) {
 		v = v.Add(500 * time.Nanosecond)
 
 		switch flavor {
-		case MySQL:
+		case MySQL, ClickHouse, Informix, Doris:
 			buf = append(buf, v.Format("'2006-01-02 15:04:05.999999'")...)
 
 		case PostgreSQL:
@@ -605,20 +609,13 @@ func encodeValue(buf []byte, arg interface{}, flavor Flavor) ([]byte, error) {
 		case CQL:
 			buf = append(buf, v.Format("'2006-01-02 15:04:05.999999Z0700'")...)
 
-		case ClickHouse:
-			buf = append(buf, v.Format("'2006-01-02 15:04:05.999999'")...)
-
 		case Presto:
 			buf = append(buf, v.Format("'2006-01-02 15:04:05.000'")...)
 
 		case Oracle:
 			buf = append(buf, "to_timestamp('"...)
 			buf = append(buf, v.Format("2006-01-02 15:04:05.999999")...)
 			buf = append(buf, "', 'YYYY-MM-DD HH24:MI:SS.FF')"...)
-
-		case Informix:
-			buf = append(buf, v.Format("'2006-01-02 15:04:05.999999'")...)
-
 		}
 
 	case fmt.Stringer:
@@ -741,6 +738,7 @@ func encodeValue(buf []byte, arg interface{}, flavor Flavor) ([]byte, error) {
 				buf = append(buf, "hextoraw('"...)
 				buf = appendHex(buf, data)
 				buf = append(buf, "')"...)
+
 			default:
 				return nil, ErrInterpolateUnsupportedArgs
 			}

interpolate_test.go

@@ -371,6 +371,11 @@ func TestFlavorInterpolate(t *testing.T) {
 			"SELECT ?", []interface{}{errorValuer(1)},
 			"", ErrErrorValuer,
 		},
+		{
+			Doris,
+			"SELECT ?", []interface{}{errorValuer(1)},
+			"", ErrErrorValuer,
+		},
 	}
 
 	for idx, c := range cases {

select.go

@@ -452,11 +452,13 @@ func (sb *SelectBuilder) BuildWithFlavor(flavor Flavor, initialArg ...interface{
 				buf.WriteString(sb.offsetVar)
 			}
 		}
+
 	case CQL:
 		if len(sb.limitVar) > 0 {
 			buf.WriteLeadingString("LIMIT ")
 			buf.WriteString(sb.limitVar)
 		}
+
 	case PostgreSQL:
 		if len(sb.limitVar) > 0 {
 			buf.WriteLeadingString("LIMIT ")
@@ -467,6 +469,7 @@ func (sb *SelectBuilder) BuildWithFlavor(flavor Flavor, initialArg ...interface{
 			buf.WriteLeadingString("OFFSET ")
 			buf.WriteString(sb.offsetVar)
 		}
+
 	case Presto:
 		// There might be a hidden constraint in Presto requiring offset to be set before limit.
 		// The select statement documentation (https://prestodb.io/docs/current/sql/select.html)
@@ -536,6 +539,7 @@ func (sb *SelectBuilder) BuildWithFlavor(flavor Flavor, initialArg ...interface{
 				buf.WriteString(" + 1")
 			}
 		}
+
 	case Informix:
 		// [SKIP N] FIRST M
 		// M must be greater than 0
@@ -548,6 +552,18 @@ func (sb *SelectBuilder) BuildWithFlavor(flavor Flavor, initialArg ...interface{
 			buf.WriteLeadingString("FIRST ")
 			buf.WriteString(sb.limitVar)
 		}
+
+	case Doris:
+		// #192: Doris doesn't support ? in OFFSET and LIMIT.
+		if len(sb.limitVar) > 0 {
+			buf.WriteLeadingString("LIMIT ")
+			buf.WriteString(fmt.Sprint(sb.args.Value(sb.limitVar)))
+
+			if len(sb.offsetVar) > 0 {
+				buf.WriteLeadingString("OFFSET ")
+				buf.WriteString(fmt.Sprint(sb.args.Value(sb.offsetVar)))
+			}
+		}
 	}
 
 	if len(sb.limitVar) > 0 {

select_test.go

@@ -118,7 +118,7 @@ func ExampleSelectBuilder_join() {
 }
 
 func ExampleSelectBuilder_limit_offset() {
-	flavors := []Flavor{MySQL, PostgreSQL, SQLite, SQLServer, CQL, ClickHouse, Presto, Oracle, Informix}
+	flavors := []Flavor{MySQL, PostgreSQL, SQLite, SQLServer, CQL, ClickHouse, Presto, Oracle, Informix, Doris}
 	results := make([][]string, len(flavors))
 	sb := NewSelectBuilder()
 	saveResults := func() {
@@ -246,6 +246,13 @@ func ExampleSelectBuilder_limit_offset() {
 	// #3: SELECT * FROM user SKIP ? FIRST ?
 	// #4: SELECT * FROM user FIRST ?
 	// #5: SELECT * FROM user ORDER BY id SKIP ? FIRST ?
+	//
+	// Doris
+	// #1: SELECT * FROM user
+	// #2: SELECT * FROM user
+	// #3: SELECT * FROM user LIMIT 1 OFFSET 0
+	// #4: SELECT * FROM user LIMIT 1
+	// #5: SELECT * FROM user ORDER BY id LIMIT 1 OFFSET 1
 }
 
 func ExampleSelectBuilder_ForUpdate() {