update From(take out NestedFlag) & optimize Limit(use ROW_NUMBER() supported by mssql 2005 or later) & update test cases

Author: BetaCat0

builder.go

@@ -44,7 +44,6 @@ type Builder struct {
 optype
 dialect string
 tableName string
-pk []string
 subQuery *Builder
 cond Cond
 selects []string
@@ -56,7 +55,6 @@ type Builder struct {
 orderBy string
 groupBy string
 having string
-isNested bool
 }
 
 // Dialect sets the db dialect of Builder.
@@ -82,23 +80,6 @@ func (b *Builder) From(tableName string, subQuery ...*Builder) *Builder {
 return b
 }
 
-// PK sets the pk(s) of table
-// Usually this indicates PK(s) when performing a LIMIT operation in mssql(especially in LIMIT n,m).
-// Use full name to avoid ambiguity
-func (b *Builder) PK(pk ...string) *Builder {
-b.pk = pk
-
-return b
-}
-
-// NestedFlag set the nested flag. If turn this on, current builder would accept empty table name when building SQL
-// and this builder would also be treated as a nested query at the same time.
-func (b *Builder) NestedFlag(isNested bool) *Builder {
-b.isNested = isNested
-
-return b
-}
-
 // TableName returns the table name
 func (b *Builder) TableName() string {
 return b.tableName

builder_b_test.go

@@ -193,9 +193,9 @@ func randSelectByCondition(dialect string, rgc *randGenConf) *Builder {
 if rgc.allowSubQuery {
 cpRgc := *rgc
 cpRgc.allowSubQuery = false
-b = Dialect(dialect).Select(randSelects()...).From(randTableName(0), randQuery(dialect, &cpRgc)).PK("id")
+b = Dialect(dialect).Select(randSelects()...).From(randTableName(0), randQuery(dialect, &cpRgc))
 } else {
-b = Dialect(dialect).Select(randSelects()...).From(randTableName(0)).PK("id")
+b = Dialect(dialect).Select(randSelects()...).From(randTableName(0))
 }
 if rgc.allowJoin {
 b = randJoin(b, 3)

builder_limit.go

@@ -37,17 +37,19 @@ func (b *Builder) limitWriteTo(w Writer) error {
 selects := b.selects
 b.selects = append(selects, "ROWNUM RN")
 if limit.offset == 0 {
-final = Dialect(b.dialect).Select(selects...).From("at", b).PK(b.pk...).
-Where(Lte{"at.ROWNUM": limit.limitN})
-} else {
-sub := Dialect(b.dialect).Select(append(selects, "RN")...).
-From("at", b).PK(b.pk...).Where(Lte{"at.ROWNUM": limit.offset + limit.limitN})
-
 if len(selects) == 0 {
-return ErrNotSupportType
+selects = append(selects, "*")
+} else {
+selects = append(selects)
 }
 
-final = Dialect(b.dialect).Select(selects...).From("att", sub).PK(b.pk...).
+final = Dialect(b.dialect).Select(selects...).From("at", b).
+Where(Lte{"at.ROWNUM": limit.limitN})
+} else {
+sub := Dialect(b.dialect).Select("*").
+From("at", b).Where(Lte{"at.ROWNUM": limit.offset + limit.limitN})
+
+final = Dialect(b.dialect).Select("*").From("att", sub).
 Where(Gt{"att.RN": limit.offset})
 }
 
@@ -78,33 +80,20 @@ func (b *Builder) limitWriteTo(w Writer) error {
 
 final = Dialect(b.dialect).
 Select(fmt.Sprintf("TOP %d %v", limit.limitN, strings.Join(selects, ","))).
-From("", b).PK(b.pk...).NestedFlag(true)
+From("at", b)
 } else {
-var column string
-if len(b.pk) != 0 {
-column = strings.TrimSpace(b.pk[0])
-if column == "" {
-return errors.New("please assign a PK for MsSQL LIMIT operation")
-}
-}
+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 column == "" {
-return errors.New("please assign a PK for MsSQL LIMIT operation")
-} else {
-b.selects = append(b.selects, column)
-sub := Dialect(b.dialect).Select(fmt.Sprintf("TOP %d %v", limit.limitN+limit.offset,
-strings.Join(append(selects, column), ","))).From("", b).
-PK(b.pk...).NestedFlag(true)
-
-if len(selects) == 0 {
-return ErrNotSupportType
-}
-
-final = Dialect(b.dialect).
-Select(fmt.Sprintf("TOP %d %v", limit.limitN, strings.Join(selects, ","))).
-From("", sub).PK(b.pk...).NestedFlag(true).
-Where(NotIn(column, sub))
+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})
 }
 
 return final.WriteTo(ow)

builder_select.go

@@ -16,7 +16,7 @@ func Select(cols ...string) *Builder {
 }
 
 func (b *Builder) selectWriteTo(w Writer) error {
-if !b.isNested && len(b.tableName) <= 0 {
+if len(b.tableName) <= 0 {
 return errors.New("no table indicated")
 }
 

builder_select_test.go

@@ -77,15 +77,15 @@ func TestBuilder_From(t *testing.T) {
 Select("id").From("table1").Where(Eq{"a": 1})).Where(Eq{"b": 1}).ToSQL()
 assert.NoError(t, err)
 assert.EqualValues(t, "SELECT sub.id FROM (SELECT id FROM table1 WHERE a=?) sub WHERE b=?", sql)
-assert.EqualValues(t, 2, len(args))
+assert.EqualValues(t, []interface{}{1, 1}, args)
 
 // from union
 sql, args, err = Select("sub.id").From("sub",
 Select("id").From("table1").Where(Eq{"a": 1}).
 Union("all", Select("id").From("table1").Where(Eq{"a": 2}))).Where(Eq{"b": 1}).ToSQL()
 assert.NoError(t, err)
 assert.EqualValues(t, "SELECT sub.id FROM ((SELECT id FROM table1 WHERE a=?) UNION ALL (SELECT id FROM table1 WHERE a=?)) sub WHERE b=?", sql)
-assert.EqualValues(t, 3, len(args))
+assert.EqualValues(t, []interface{}{1, 2, 1}, args)
 
 // will raise error
 sql, args, err = Select("c").From("table1", Insert(Eq{"a": 1}).From("table1")).ToSQL()
@@ -98,29 +98,29 @@ func TestBuilder_Limit(t *testing.T) {
 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 a,b,c,RN FROM (SELECT a,b,c,ROWNUM RN FROM table1 ORDER BY a ASC) at WHERE at.ROWNUM<=?) att WHERE att.RN>?", sql)
-assert.EqualValues(t, 2, len(args))
+assert.EqualValues(t, "SELECT * FROM (SELECT * FROM (SELECT a,b,c,ROWNUM RN FROM table1 ORDER BY a ASC) at WHERE at.ROWNUM<=?) 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").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 FROM (SELECT a,b,c,RN FROM (SELECT a,b,c,ROWNUM RN FROM table1 t1 INNER JOIN table2 t2 ON t1.id = t2.ref_id ORDER BY a ASC) at WHERE at.ROWNUM<=?) att WHERE att.RN>?", sql)
-assert.EqualValues(t, 2, len(args))
+assert.EqualValues(t, "SELECT * FROM (SELECT * FROM (SELECT a,b,c,ROWNUM RN FROM table1 t1 INNER JOIN table2 t2 ON t1.id = t2.ref_id ORDER BY a ASC) at WHERE at.ROWNUM<=?) 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.ROWNUM<=?", sql)
-assert.EqualValues(t, 1, len(args))
+assert.EqualValues(t, []interface{}{5}, args)
 
 // simple with where -- OracleSQL style
 sql, args, err = Dialect(ORACLE).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 (SELECT a,b,c,RN FROM (SELECT a,b,c,ROWNUM RN FROM table1 WHERE f1=? AND f2=? ORDER BY a ASC) at WHERE at.ROWNUM<=?) att WHERE att.RN>?", sql)
-assert.EqualValues(t, 4, len(args))
+assert.EqualValues(t, "SELECT * FROM (SELECT * FROM (SELECT a,b,c,ROWNUM RN FROM table1 WHERE f1=? AND f2=? ORDER BY a ASC) at WHERE at.ROWNUM<=?) att WHERE att.RN>?", sql)
+assert.EqualValues(t, []interface{}{"v1", "v2", 15, 10}, args)
 
 // simple -- MySQL/SQLite/PostgreSQL style
 sql, args, err = Dialect(MYSQL).Select("a", "b", "c").From("table1").OrderBy("a ASC").
@@ -141,36 +141,30 @@ func TestBuilder_Limit(t *testing.T) {
 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, 2, len(args))
+assert.EqualValues(t, []interface{}{"v1", "v2"}, args)
 
 // simple -- MsSQL style
-sql, args, err = Dialect(MSSQL).Select("a", "b", "c").PK("id").From("table1").
-OrderBy("a ASC").Limit(5, 10).ToSQL()
+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 TOP 15 a,b,c,id FROM (SELECT a,b,c,id FROM table1 ORDER BY a ASC)) WHERE id NOT IN (SELECT TOP 15 a,b,c,id FROM (SELECT a,b,c,id FROM table1 ORDER BY a ASC))", sql)
+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").PK("id").From("table1").
+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 FROM (SELECT TOP 15 a,b,c,id FROM (SELECT a,b,c,id FROM table1 WHERE a=? ORDER BY a ASC)) WHERE id NOT IN (SELECT TOP 15 a,b,c,id FROM (SELECT a,b,c,id FROM table1 WHERE a=? ORDER BY a ASC))", sql)
-assert.EqualValues(t, 2, len(args))
-
-// raise error
-sql, args, err = Dialect(MSSQL).Select("a", "b", "c").From("table1").
-OrderBy("a ASC").Limit(5, 10).ToSQL()
-assert.Error(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(Eq{"a": 1}).OrderBy("a ASC").Limit(5, 10).Union("ALL",
 Select("a", "b", "c").From("table1").Where(Eq{"a": 2}).OrderBy("a DESC").Limit(10)).
 Limit(3).ToSQL()
 assert.NoError(t, err)
-assert.EqualValues(t, "SELECT * FROM ((SELECT a,b,c FROM (SELECT a,b,c,RN FROM (SELECT a,b,c,ROWNUM RN FROM table1 WHERE a=? ORDER BY a ASC) at WHERE at.ROWNUM<=?) att WHERE att.RN>?) UNION ALL (SELECT a,b,c FROM (SELECT a,b,c,ROWNUM RN FROM table1 WHERE a=? ORDER BY a DESC) at WHERE at.ROWNUM<=?)) at WHERE at.ROWNUM<=?", sql)
-assert.EqualValues(t, 6, len(args))
-assert.EqualValues(t, "[1 15 10 2 10 3]", fmt.Sprintf("%v", args))
+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.ROWNUM<=?) att WHERE att.RN>?) UNION ALL (SELECT a,b,c FROM (SELECT a,b,c,ROWNUM RN FROM table1 WHERE a=? ORDER BY a DESC) at WHERE at.ROWNUM<=?)) at WHERE at.ROWNUM<=?", sql)
+assert.EqualValues(t, []interface{}{1, 15, 10, 2, 10, 3}, args)
 
 // union -- MySQL/SQLite/PostgreSQL style
 sql, args, err = Dialect(MYSQL).Select("a", "b", "c").From("table1").Where(Eq{"a": 1}).
@@ -179,14 +173,14 @@ func TestBuilder_Limit(t *testing.T) {
 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, 2, len(args))
+assert.EqualValues(t, []interface{}{1, 2}, args)
 
 // union with limit -- MsSQL style
 sql, args, err = Dialect(MSSQL).Select("a", "b", "c").From("table1").
-PK("id1").Where(Eq{"a": 1}).OrderBy("a ASC").Limit(5, 6).Union("ALL",
-Select("a", "b").From("table1").Where(Eq{"b": 2}).OrderBy("a DESC").Limit(10)).
+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 FROM (SELECT TOP 11 a,b,c,id1 FROM (SELECT a,b,c,id1 FROM table1 WHERE a=? ORDER BY a ASC)) WHERE id1 NOT IN (SELECT TOP 11 a,b,c,id1 FROM (SELECT a,b,c,id1 FROM table1 WHERE a=? ORDER BY a ASC))) UNION ALL (SELECT TOP 10 a,b FROM (SELECT a,b FROM table1 WHERE b=? ORDER BY a DESC)))", sql)
-assert.EqualValues(t, 3, len(args))
+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_test.go

@@ -18,7 +18,7 @@ func TestBuilder_Union(t *testing.T) {
 Union("", Select("*").From("t2").Where(Eq{"status": "3"})).
 ToSQL()
 assert.NoError(t, err)
-assert.EqualValues(t, 4, len(args))
+assert.EqualValues(t, []interface{}{"1", "2", "3", "3"}, args)
 fmt.Println(sql, args)
 
 // will raise error