limit has been completed in the main & reconstruct feature UNION & update benchmark tests

Author: BetaCat0

builder.go

@@ -110,6 +110,7 @@ func (b *Builder) Union(unionTp string, unionCond *Builder) *Builder {
 builder = &Builder{cond: NewCond()}
 builder.optype = unionType
 builder.dialect = b.dialect
+builder.selects = b.selects
 
 currentUnions := b.unions
 // erase sub unions (actually append to new Builder.unions)
@@ -227,10 +228,6 @@ func (b *Builder) WriteTo(w Writer) error {
 case deleteType:
 return b.deleteWriteTo(w)
 case unionType:
-if b.limitation != nil {
-return b.limitWriteTo(w)
-}
-
 return b.unionWriteTo(w)
 }
 

builder_b_test.go

@@ -140,14 +140,15 @@ func BenchmarkUpdate(b *testing.B) {
 // randQuery Generate a basic query for benchmark test. But be careful it's not a executable SQL in real db.
 func randQuery(dialect string, rgc *randGenConf) *Builder {
 b := randSelectByCondition(dialect, rgc)
-if rgc.allowUnion && rand.Intn(1000) >= 500 {
+isUnionized := rgc.allowUnion && rand.Intn(1000) >= 500
+if isUnionized {
 r := rand.Intn(3) + 1
 for i := r; i < r; i++ {
 b = b.Union("all", randSelectByCondition(dialect, rgc))
 }
 }
 
-if rgc.allowLimit && rand.Intn(1000) >= 500 {
+if isUnionized && rgc.allowLimit && rand.Intn(1000) >= 500 {
 b = randLimit(b)
 }
 

builder_limit.go

@@ -24,30 +24,32 @@ func (b *Builder) limitWriteTo(w Writer) error {
 b.limitation = nil
 ow := w.(*BytesWriter)
 
-var final *Builder
-
 switch strings.ToLower(strings.TrimSpace(b.dialect)) {
 case ORACLE:
-if ow.writer.Len() > 0 {
-// flush writer, both buffer & args
-ow.writer.Reset()
-ow.args = nil
+if len(b.selects) == 0 {
+b.selects = append(b.selects, "*")
 }
 
+var final *Builder
 selects := b.selects
 b.selects = append(selects, "ROWNUM RN")
-if limit.offset == 0 {
-if len(selects) == 0 {
-selects = append(selects, "*")
-}
 
-final = Dialect(b.dialect).Select("*").From("at", b).
+var wb *Builder
+if b.optype == unionType {
+wb = Dialect(b.dialect).Select("at.*", "ROWNUM RN").
+From("at", b)
+} else {
+wb = b
+}
+
+if limit.offset == 0 {
+final = Dialect(b.dialect).Select(selects...).From("at", wb).
 Where(Lte{"at.RN": limit.limitN})
 } else {
 sub := Dialect(b.dialect).Select("*").
 From("at", b).Where(Lte{"at.RN": limit.offset + limit.limitN})
 
-final = Dialect(b.dialect).Select("*").From("att", sub).
+final = Dialect(b.dialect).Select(selects...).From("att", sub).
 Where(Gt{"att.RN": limit.offset})
 }
 
@@ -64,34 +66,27 @@ func (b *Builder) limitWriteTo(w Writer) error {
 fmt.Fprintf(ow, " LIMIT %v OFFSET %v", limit.limitN, limit.offset)
 }
 case MSSQL:
-if ow.writer.Len() > 0 {
-// flush writer, both buffer & args
-ow.writer.Reset()
-ow.args = nil
+if len(b.selects) == 0 {
+b.selects = append(b.selects, "*")
 }
 
+var final *Builder
 selects := b.selects
-if limit.offset == 0 {
-if len(selects) == 0 {
-selects = append(selects, "*")
-}
+b.selects = append(append([]string{fmt.Sprintf("TOP %d %v", limit.limitN+limit.offset, b.selects[0])},
+b.selects[1:]...), "ROW_NUMBER() OVER (ORDER BY (SELECT 1)) AS RN")
 
-final = Dialect(b.dialect).
-Select(fmt.Sprintf("TOP %d %v", limit.limitN, strings.Join(selects, ","))).
+var wb *Builder
+if b.optype == unionType {
+wb = Dialect(b.dialect).Select("*", "ROW_NUMBER() OVER (ORDER BY (SELECT 1)) AS RN").
 From("at", b)
 } else {
-sub := Dialect(b.dialect).Select(
-fmt.Sprintf("TOP %d %v,%v", limit.limitN+limit.offset,
-strings.Join(selects, ","), "ROW_NUMBER() OVER (ORDER BY (SELECT 1)) AS RN")).
-From(b.tableName).Where(b.cond)
-
-if len(selects) == 0 {
-return ErrNotSupportType
-}
-
-final = Dialect(b.dialect).Select(
-fmt.Sprintf("TOP %d %v", limit.limitN, strings.Join(append(selects, "RN"), ","))).
-From("at", sub).Where(Gt{"at.RN": limit.limitN})
+wb = b
+}
+
+if limit.offset == 0 {
+final = Dialect(b.dialect).Select(selects...).From("at", wb)
+} else {
+final = Dialect(b.dialect).Select(selects...).From("at", wb).Where(Gt{"at.RN": limit.offset})
 }
 
 return final.WriteTo(ow)

builder_limit_test.go

@@ -0,0 +1,104 @@
+// Copyright 2018 The Xorm Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package builder
+
+import (
+"testing"
+
+"github.com/stretchr/testify/assert"
+)
+
+func TestBuilder_Limit(t *testing.T) {
+// simple -- OracleSQL style
+sql, args, err := Dialect(ORACLE).Select("a", "b", "c").From("table1").OrderBy("a ASC").
+Limit(5, 10).ToSQL()
+assert.NoError(t, err)
+assert.EqualValues(t, "SELECT a,b,c FROM (SELECT * FROM (SELECT a,b,c,ROWNUM RN FROM table1 ORDER BY a ASC) at WHERE at.RN<=?) att WHERE att.RN>?", sql)
+assert.EqualValues(t, []interface{}{15, 10}, args)
+
+// simple with join -- OracleSQL style
+sql, args, err = Dialect(ORACLE).Select("a", "b", "c", "d").From("table1 t1").
+InnerJoin("table2 t2", "t1.id = t2.ref_id").OrderBy("a ASC").Limit(5, 10).ToSQL()
+assert.NoError(t, err)
+assert.EqualValues(t, "SELECT a,b,c,d FROM (SELECT * FROM (SELECT a,b,c,d,ROWNUM RN FROM table1 t1 INNER JOIN table2 t2 ON t1.id = t2.ref_id ORDER BY a ASC) at WHERE at.RN<=?) att WHERE att.RN>?", sql)
+assert.EqualValues(t, []interface{}{15, 10}, args)
+
+// simple -- OracleSQL style
+sql, args, err = Dialect(ORACLE).Select("a", "b", "c").From("table1").
+OrderBy("a ASC").Limit(5).ToSQL()
+assert.NoError(t, err)
+assert.EqualValues(t, "SELECT a,b,c FROM (SELECT a,b,c,ROWNUM RN FROM table1 ORDER BY a ASC) at WHERE at.RN<=?", sql)
+assert.EqualValues(t, []interface{}{5}, args)
+
+// simple with where -- OracleSQL style
+sql, args, err = Dialect(ORACLE).Select("a", "b", "c").From("table1").Where(Neq{"a": "10", "b": "20"}).
+OrderBy("a ASC").Limit(5, 1).ToSQL()
+assert.NoError(t, err)
+assert.EqualValues(t, "SELECT a,b,c FROM (SELECT * FROM (SELECT a,b,c,ROWNUM RN FROM table1 WHERE a<>? AND b<>? ORDER BY a ASC) at WHERE at.RN<=?) att WHERE att.RN>?", sql)
+assert.EqualValues(t, []interface{}{"10", "20", 6, 1}, args)
+
+// simple -- MySQL/SQLite/PostgreSQL style
+sql, args, err = Dialect(MYSQL).Select("a", "b", "c").From("table1").OrderBy("a ASC").
+Limit(5, 10).ToSQL()
+assert.NoError(t, err)
+assert.EqualValues(t, "SELECT a,b,c FROM table1 ORDER BY a ASC LIMIT 5 OFFSET 10", sql)
+assert.EqualValues(t, 0, len(args))
+
+// simple -- MySQL/SQLite/PostgreSQL style
+sql, args, err = Dialect(MYSQL).Select("a", "b", "c").From("table1").
+OrderBy("a ASC").Limit(5).ToSQL()
+assert.NoError(t, err)
+assert.EqualValues(t, "SELECT a,b,c FROM table1 ORDER BY a ASC LIMIT 5", sql)
+assert.EqualValues(t, 0, len(args))
+
+// simple with where -- MySQL/SQLite/PostgreSQL style
+sql, args, err = Dialect(MYSQL).Select("a", "b", "c").From("table1").
+Where(Eq{"f1": "v1", "f2": "v2"}).OrderBy("a ASC").Limit(5, 10).ToSQL()
+assert.NoError(t, err)
+assert.EqualValues(t, "SELECT a,b,c FROM table1 WHERE f1=? AND f2=? ORDER BY a ASC LIMIT 5 OFFSET 10", sql)
+assert.EqualValues(t, []interface{}{"v1", "v2"}, args)
+
+// simple -- MsSQL style
+sql, args, err = Dialect(MSSQL).Select("a", "b", "c").From("table1").
+OrderBy("a ASC").Limit(5).ToSQL()
+assert.NoError(t, err)
+assert.EqualValues(t, "SELECT a,b,c FROM (SELECT TOP 5 a,b,c,ROW_NUMBER() OVER (ORDER BY (SELECT 1)) AS RN FROM table1 ORDER BY a ASC) at", sql)
+assert.EqualValues(t, []interface{}([]interface{}(nil)), args)
+
+// simple with where -- MsSQL style
+sql, args, err = Dialect(MSSQL).Select("a", "b", "c").From("table1").
+Where(Neq{"a": "3"}).OrderBy("a ASC").Limit(5, 10).ToSQL()
+assert.NoError(t, err)
+assert.EqualValues(t, "SELECT a,b,c FROM (SELECT TOP 15 a,b,c,ROW_NUMBER() OVER (ORDER BY (SELECT 1)) AS RN FROM table1 WHERE a<>? ORDER BY a ASC) at WHERE at.RN>?", sql)
+assert.EqualValues(t, []interface{}{"3", 10}, args)
+// union with limit -- OracleSQL style
+sql, args, err = Dialect(ORACLE).Select("a", "b", "c").From("at",
+Dialect(ORACLE).Select("a", "b", "c").From("table1").
+Where(Neq{"a": "0"}).OrderBy("a ASC").Limit(5, 10).Union("ALL",
+Select("a", "b", "c").From("table1").Where(Neq{"b": "48"}).OrderBy("a DESC").Limit(10))).Limit(3).ToSQL()
+assert.NoError(t, err)
+assert.EqualValues(t, "SELECT a,b,c FROM (SELECT a,b,c,ROWNUM RN FROM ((SELECT a,b,c FROM (SELECT * FROM (SELECT a,b,c,ROWNUM RN FROM table1 WHERE a<>? ORDER BY a ASC) at WHERE at.RN<=?) att WHERE att.RN>?) UNION ALL (SELECT a,b,c FROM (SELECT a,b,c,ROWNUM RN FROM table1 WHERE b<>? ORDER BY a DESC) at WHERE at.RN<=?)) at) at WHERE at.RN<=?", sql)
+assert.EqualValues(t, []interface{}{"0", 15, 10, "48", 10, 3}, args)
+
+// union -- MySQL/SQLite/PostgreSQL style
+sql, args, err = Dialect(MYSQL).Select("a", "b", "c").From("at",
+Dialect(MYSQL).Select("a", "b", "c").From("table1").Where(Eq{"a": 1}).OrderBy("a ASC").
+Limit(5, 9).Union("ALL",
+Select("a", "b", "c").From("table1").Where(Eq{"a": 2}).OrderBy("a DESC").Limit(10))).
+Limit(5, 10).ToSQL()
+assert.NoError(t, err)
+assert.EqualValues(t, "SELECT a,b,c FROM ((SELECT a,b,c FROM table1 WHERE a=? ORDER BY a ASC LIMIT 5 OFFSET 9) UNION ALL (SELECT a,b,c FROM table1 WHERE a=? ORDER BY a DESC LIMIT 10)) at LIMIT 5 OFFSET 10", sql)
+assert.EqualValues(t, []interface{}{1, 2}, args)
+
+// union with limit -- MsSQL style
+sql, args, err = Dialect(MSSQL).Select("a", "b", "c").From("at",
+Dialect(MSSQL).Select("a", "b", "c").From("table1").Where(Neq{"a": "1"}).
+OrderBy("a ASC").Limit(5, 6).Union("ALL",
+Select("a", "b", "c").From("table1").Where(Neq{"b": "2"}).OrderBy("a DESC").Limit(10))).
+OrderBy("b DESC").Limit(7, 9).ToSQL()
+assert.NoError(t, err)
+assert.EqualValues(t, "SELECT a,b,c FROM (SELECT TOP 16 a,b,c,ROW_NUMBER() OVER (ORDER BY (SELECT 1)) AS RN FROM ((SELECT a,b,c FROM (SELECT TOP 11 a,b,c,ROW_NUMBER() OVER (ORDER BY (SELECT 1)) AS RN FROM table1 WHERE a<>? ORDER BY a ASC) at WHERE at.RN>?) UNION ALL (SELECT a,b,c FROM (SELECT TOP 10 a,b,c,ROW_NUMBER() OVER (ORDER BY (SELECT 1)) AS RN FROM table1 WHERE b<>? ORDER BY a DESC) at)) at ORDER BY b DESC) at WHERE at.RN>?", sql)
+assert.EqualValues(t, []interface{}{"1", 6, "2", 9}, args)
+}

builder_select_test.go

@@ -92,95 +92,3 @@ func TestBuilder_From(t *testing.T) {
 assert.Error(t, err)
 fmt.Println(err)
 }
-
-func TestBuilder_Limit(t *testing.T) {
-// simple -- OracleSQL style
-sql, args, err := Dialect(ORACLE).Select("a", "b", "c").From("table1").OrderBy("a ASC").
-Limit(5, 10).ToSQL()
-assert.NoError(t, err)
-assert.EqualValues(t, "SELECT * FROM (SELECT * FROM (SELECT a,b,c,ROWNUM RN FROM table1 ORDER BY a ASC) at WHERE at.RN<=?) att WHERE att.RN>?", sql)
-assert.EqualValues(t, []interface{}{15, 10}, args)
-
-// simple with join -- OracleSQL style
-sql, args, err = Dialect(ORACLE).Select("a", "b", "c", "d").From("table1 t1").
-InnerJoin("table2 t2", "t1.id = t2.ref_id").OrderBy("a ASC").Limit(5, 10).ToSQL()
-assert.NoError(t, err)
-assert.EqualValues(t, "SELECT * FROM (SELECT * FROM (SELECT a,b,c,d,ROWNUM RN FROM table1 t1 INNER JOIN table2 t2 ON t1.id = t2.ref_id ORDER BY a ASC) at WHERE at.RN<=?) att WHERE att.RN>?", sql)
-assert.EqualValues(t, []interface{}{15, 10}, args)
-
-// simple -- OracleSQL style
-sql, args, err = Dialect(ORACLE).Select("a", "b", "c").From("table1").
-OrderBy("a ASC").Limit(5).ToSQL()
-assert.NoError(t, err)
-assert.EqualValues(t, "SELECT * FROM (SELECT a,b,c,ROWNUM RN FROM table1 ORDER BY a ASC) at WHERE at.RN<=?", sql)
-assert.EqualValues(t, []interface{}{5}, args)
-
-// simple with where -- OracleSQL style
-sql, args, err = Dialect(ORACLE).Select("a", "b", "c").From("table1").Where(Eq{"a": "10", "b": "10"}).
-OrderBy("a ASC").Limit(5, 1).ToSQL()
-assert.NoError(t, err)
-assert.EqualValues(t, "SELECT * FROM (SELECT * FROM (SELECT a,b,c,ROWNUM RN FROM table1 WHERE a=? AND b=? ORDER BY a ASC) at WHERE at.RN<=?) att WHERE att.RN>?", sql)
-assert.EqualValues(t, []interface{}{"10", "10", 6, 1}, args)
-
-// simple -- MySQL/SQLite/PostgreSQL style
-sql, args, err = Dialect(MYSQL).Select("a", "b", "c").From("table1").OrderBy("a ASC").
-Limit(5, 10).ToSQL()
-assert.NoError(t, err)
-assert.EqualValues(t, "SELECT a,b,c FROM table1 ORDER BY a ASC LIMIT 5 OFFSET 10", sql)
-assert.EqualValues(t, 0, len(args))
-
-// simple -- MySQL/SQLite/PostgreSQL style
-sql, args, err = Dialect(MYSQL).Select("a", "b", "c").From("table1").
-OrderBy("a ASC").Limit(5).ToSQL()
-assert.NoError(t, err)
-assert.EqualValues(t, "SELECT a,b,c FROM table1 ORDER BY a ASC LIMIT 5", sql)
-assert.EqualValues(t, 0, len(args))
-
-// simple with where -- MySQL/SQLite/PostgreSQL style
-sql, args, err = Dialect(MYSQL).Select("a", "b", "c").From("table1").
-Where(Eq{"f1": "v1", "f2": "v2"}).OrderBy("a ASC").Limit(5, 10).ToSQL()
-assert.NoError(t, err)
-assert.EqualValues(t, "SELECT a,b,c FROM table1 WHERE f1=? AND f2=? ORDER BY a ASC LIMIT 5 OFFSET 10", sql)
-assert.EqualValues(t, []interface{}{"v1", "v2"}, args)
-
-// simple -- MsSQL style
-sql, args, err = Dialect(MSSQL).Select("a", "b", "c").From("table1").
-OrderBy("a ASC").Limit(5).ToSQL()
-assert.NoError(t, err)
-assert.EqualValues(t, "SELECT TOP 5 a,b,c FROM (SELECT a,b,c FROM table1 ORDER BY a ASC) at", sql)
-assert.EqualValues(t, 0, len(args))
-
-// simple with where -- MsSQL style
-sql, args, err = Dialect(MSSQL).Select("a", "b", "c").From("table1").
-Where(Eq{"a": "3"}).OrderBy("a ASC").Limit(5, 10).ToSQL()
-assert.NoError(t, err)
-assert.EqualValues(t, "SELECT TOP 5 a,b,c,RN FROM (SELECT TOP 15 a,b,c,ROW_NUMBER() OVER (ORDER BY (SELECT 1)) AS RN FROM table1 WHERE a=?) at WHERE at.RN>?", sql)
-assert.EqualValues(t, []interface{}{"3", 5}, args)
-
-// union with limit -- OracleSQL style
-sql, args, err = Dialect(ORACLE).Select("a", "b", "c").From("table1").
-Where(Neq{"a": "0"}).OrderBy("a ASC").Limit(5, 10).Union("ALL",
-Select("a", "b", "c").From("table1").Where(Neq{"b": "48"}).OrderBy("a DESC").Limit(10)).
-Limit(3).ToSQL()
-assert.NoError(t, err)
-assert.EqualValues(t, "SELECT * FROM ((SELECT * FROM (SELECT * FROM (SELECT a,b,c,ROWNUM RN FROM table1 WHERE a<>? ORDER BY a ASC) at WHERE at.RN<=?) att WHERE att.RN>?) UNION ALL (SELECT * FROM (SELECT a,b,c,ROWNUM RN FROM table1 WHERE b<>? ORDER BY a DESC) at WHERE at.RN<=?)) at WHERE at.RN<=?", sql)
-assert.EqualValues(t, []interface{}{"0", 15, 10, "48", 10, 3}, args)
-
-// union -- MySQL/SQLite/PostgreSQL style
-sql, args, err = Dialect(MYSQL).Select("a", "b", "c").From("table1").Where(Eq{"a": 1}).
-OrderBy("a ASC").Limit(5, 9).Union("ALL",
-Select("a", "b", "c").From("table1").Where(Eq{"a": 2}).OrderBy("a DESC").Limit(10)).
-Limit(5, 10).ToSQL()
-assert.NoError(t, err)
-assert.EqualValues(t, "(SELECT a,b,c FROM table1 WHERE a=? ORDER BY a ASC LIMIT 5 OFFSET 9) UNION ALL (SELECT a,b,c FROM table1 WHERE a=? ORDER BY a DESC LIMIT 10) LIMIT 5 OFFSET 10", sql)
-assert.EqualValues(t, []interface{}{1, 2}, args)
-
-// union with limit -- MsSQL style
-sql, args, err = Dialect(MSSQL).Select("a", "b", "c").From("table1").
-Where(Eq{"a": 1}).OrderBy("a ASC").Limit(5, 6).Union("ALL",
-Select("a", "b", "c").From("table1").Where(Eq{"b": 2}).OrderBy("a DESC").Limit(10)).
-OrderBy("b DESC").Limit(7).ToSQL()
-assert.NoError(t, err)
-assert.EqualValues(t, "SELECT TOP 7 * FROM ((SELECT TOP 5 a,b,c,RN FROM (SELECT TOP 11 a,b,c,ROW_NUMBER() OVER (ORDER BY (SELECT 1)) AS RN FROM table1 WHERE a=?) at WHERE at.RN>?) UNION ALL (SELECT TOP 10 a,b,c FROM (SELECT a,b,c FROM table1 WHERE b=? ORDER BY a DESC) at)) at", sql)
-assert.EqualValues(t, []interface{}{1, 5, 2}, args)
-}

builder_union.go

@@ -11,6 +11,11 @@ import (
 )
 
 func (b *Builder) unionWriteTo(w Writer) error {
+if b.limitation != nil || b.cond != NewCond() ||
+b.orderBy != "" || b.having != "" || b.groupBy != "" {
+return errors.New("builder in unionType should not have any conditional fields in it(like Where or Limit)")
+}
+
 for idx, u := range b.unions {
 current := u.builder
 if current.optype != selectType {
@@ -27,29 +32,27 @@ func (b *Builder) unionWriteTo(w Writer) error {
 }
 fmt.Fprint(w, "(")
 
-if current.limitation != nil {
-switch current.dialect {
-case ORACLE, MSSQL:
-// if dialect is Oracle or Mssql, we need to make a copy of current context
-// coz the result of current will turn into a sub-query when building LIMIT query
-tw := NewWriter()
-if err := current.selectWriteTo(tw); err != nil {
-return err
-}
-
-fmt.Fprintf(w, tw.writer.String())
-w.(*BytesWriter).args = append(w.(*BytesWriter).args, tw.args...)
-case MYSQL, SQLITE, POSTGRES:
-if err := current.selectWriteTo(w); err != nil {
-return err
-}
-default:
-return ErrNotSupportType
-}
-} else {
-if err := current.selectWriteTo(w); err != nil {
-return err
-}
+// switch b.dialect {
+// case ORACLE, MSSQL:
+//	// if dialect is Oracle or Mssql, we need to make a copy of current context
+//	// coz the result of current will turn into a sub-query when building LIMIT query
+//	tw := NewWriter()
+//	if err := current.selectWriteTo(tw); err != nil {
+//	return err
+//	}
+//
+//	fmt.Fprintf(w, tw.writer.String())
+//	w.(*BytesWriter).args = append(w.(*BytesWriter).args, tw.args...)
+// case MYSQL, SQLITE, POSTGRES:
+//	if err := current.selectWriteTo(w); err != nil {
+//	return err
+//	}
+// default:
+//	return ErrNotSupportType
+// }
+
+if err := current.selectWriteTo(w); err != nil {
+return err
 }
 
 fmt.Fprint(w, ")")