add sql fiddler & test data sql scripts

Author: BetaCat0

builder.go

@@ -244,12 +244,12 @@ func (b *Builder) ToSQL() (string, []interface{}, error) {
 return w.writer.String(), w.args, nil
 }
 
-// ToBindedSQL
+// ToBoundSQL
 func (b *Builder) ToBindedSQL() (string, error) {
 w := NewWriter()
 if err := b.WriteTo(w); err != nil {
 return "", err
 }
 
-return ConvertToBindedSQL(w.writer.String(), w.args)
+return ConvertToBoundSQL(w.writer.String(), w.args)
 }

builder_b_test.go

@@ -149,7 +149,7 @@ func randQuery(dialect string, rgc *randGenConf) *Builder {
 }
 
 if isUnionized && rgc.allowLimit && rand.Intn(1000) >= 500 {
-b = randLimit(b)
+b = randLimit(Dialect(dialect).Select().From("t", b))
 }
 
 return b

builder_limit_test.go

@@ -10,95 +10,120 @@ import (
 "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()
+func TestBuilder_Limit4Mssql(t *testing.T) {
+sqlFromFile, err := readPreparationSQLFromFile("testdata/mssql_fiddle_data.sql")
+assert.NoError(t, err)
+f, err := newFiddler("", MSSQL, sqlFromFile)
 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)
+assert.NotEmpty(t, f.sessionCode)
 
-// 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()
+// simple -- MsSQL style
+sql, err := Dialect(MSSQL).Select("a", "b", "c").From("table1").
+OrderBy("a ASC").Limit(5).ToBindedSQL()
 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)
+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.NoError(t, f.executableCheck(sql))
 
-// simple -- OracleSQL style
-sql, args, err = Dialect(ORACLE).Select("a", "b", "c").From("table1").
-OrderBy("a ASC").Limit(5).ToSQL()
+// simple with where -- MsSQL style
+sql, err = Dialect(MSSQL).Select("a", "b", "c").From("table1").
+Where(Neq{"a": "3"}).OrderBy("a ASC").Limit(5, 10).ToBindedSQL()
 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)
+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<>'3' ORDER BY a ASC) at WHERE at.RN>10", sql)
+assert.NoError(t, f.executableCheck(sql))
 
-// 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()
+// union with limit -- MsSQL style
+sql, 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).ToBindedSQL()
+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<>'1' ORDER BY a ASC) at WHERE at.RN>6) 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<>'2' ORDER BY a DESC) at)) at ORDER BY b DESC) at WHERE at.RN>9", sql)
+assert.NoError(t, f.executableCheck(sql))
+}
+
+func TestBuilder_Limit4MysqlLike(t *testing.T) {
+sqlFromFile, err := readPreparationSQLFromFile("testdata/mysql_fiddle_data.sql")
+assert.NoError(t, err)
+f, err := newFiddler("", MYSQL, sqlFromFile)
 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)
+assert.NotEmpty(t, f.sessionCode)
 
 // simple -- MySQL/SQLite/PostgreSQL style
-sql, args, err = Dialect(MYSQL).Select("a", "b", "c").From("table1").OrderBy("a ASC").
-Limit(5, 10).ToSQL()
+sql, err := Dialect(MYSQL).Select("a", "b", "c").From("table1").OrderBy("a ASC").
+Limit(5, 10).ToBindedSQL()
 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))
+assert.NoError(t, f.executableCheck(sql))
 
 // simple -- MySQL/SQLite/PostgreSQL style
-sql, args, err = Dialect(MYSQL).Select("a", "b", "c").From("table1").
-OrderBy("a ASC").Limit(5).ToSQL()
+sql, err = Dialect(MYSQL).Select("a", "b", "c").From("table1").
+OrderBy("a ASC").Limit(5).ToBindedSQL()
 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))
+assert.NoError(t, f.executableCheck(sql))
 
 // 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()
+sql, err = Dialect(MYSQL).Select("a", "b", "c").From("table1").
+Where(Eq{"a": "1", "b": "1"}).OrderBy("a ASC").Limit(5, 10).ToBindedSQL()
 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)
+assert.EqualValues(t, "SELECT a,b,c FROM table1 WHERE a='1' AND b='1' ORDER BY a ASC LIMIT 5 OFFSET 10", sql)
+assert.NoError(t, f.executableCheck(sql))
 
-// simple -- MsSQL style
-sql, args, err = Dialect(MSSQL).Select("a", "b", "c").From("table1").
-OrderBy("a ASC").Limit(5).ToSQL()
+// union -- MySQL/SQLite/PostgreSQL style
+sql, 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).ToBindedSQL()
 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)
+assert.EqualValues(t, "SELECT a,b,c FROM ((SELECT a,b,c FROM table1 WHERE a='1' ORDER BY a ASC LIMIT 5 OFFSET 9) UNION ALL (SELECT a,b,c FROM table1 WHERE a='2' ORDER BY a DESC LIMIT 10)) at LIMIT 5 OFFSET 10", sql)
+assert.NoError(t, f.executableCheck(sql))
+}
 
-// 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()
+func TestBuilder_Limit4Oracle(t *testing.T) {
+sqlFromFile, err := readPreparationSQLFromFile("testdata/oracle_fiddle_data.sql")
 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()
+f, err := newFiddler("", ORACLE, sqlFromFile)
 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)
+assert.NotEmpty(t, f.sessionCode)
 
-// 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()
+// simple -- OracleSQL style
+sql, err := Dialect(ORACLE).Select("a", "b", "c").From("table1").OrderBy("a ASC").
+Limit(5, 10).ToBindedSQL()
 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)
+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<=15) att WHERE att.RN>10", sql)
+assert.NoError(t, f.executableCheck(sql))
 
-// 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()
+// simple with join -- OracleSQL style
+sql, 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).ToBindedSQL()
+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<=15) att WHERE att.RN>10", sql)
+assert.NoError(t, f.executableCheck(sql))
+
+// simple -- OracleSQL style
+sql, err = Dialect(ORACLE).Select("a", "b", "c").From("table1").
+OrderBy("a ASC").Limit(5).ToBindedSQL()
+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<=5", sql)
+assert.NoError(t, f.executableCheck(sql))
+
+// simple with where -- OracleSQL style
+sql, err = Dialect(ORACLE).Select("a", "b", "c").From("table1").Where(Neq{"a": "10", "b": "20"}).
+OrderBy("a ASC").Limit(5, 1).ToBindedSQL()
+assert.NoError(t, err)
+assert.EqualValues(t, "SELECT a,b,c FROM (SELECT * FROM (SELECT a,b,c,ROWNUM RN FROM table1 WHERE a<>'10' AND b<>'20' ORDER BY a ASC) at WHERE at.RN<=6) att WHERE att.RN>1", sql)
+assert.NoError(t, f.executableCheck(sql))
+
+// union with limit -- OracleSQL style
+sql, 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).ToBindedSQL()
 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)
+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<>'0' ORDER BY a ASC) at WHERE at.RN<=15) att WHERE att.RN>10) UNION ALL (SELECT a,b,c FROM (SELECT a,b,c,ROWNUM RN FROM table1 WHERE b<>'48' ORDER BY a DESC) at WHERE at.RN<=10)) at) at WHERE at.RN<=3", sql)
+assert.NoError(t, f.executableCheck(sql))
 }

error.go

@@ -19,4 +19,6 @@ var (
 ErrNoTableName = errors.New("No table indicated")
 // ErrNoColumnToUpdate no column to update
 ErrNoColumnToUpdate = errors.New("No column to be update")
+// ErrNotSupportDialectType not supported dialect type error
+ErrNotSupportDialectType = errors.New("Not supported dialect type")
 )

sql.go

@@ -22,7 +22,7 @@ func condToSQL(cond Cond) (string, []interface{}, error) {
 return w.writer.String(), w.args, nil
 }
 
-func condToBindedSQL(cond Cond) (string, error) {
+func condToBoundSQL(cond Cond) (string, error) {
 if cond == nil || !cond.IsValid() {
 return "", nil
 }
@@ -31,10 +31,10 @@ func condToBindedSQL(cond Cond) (string, error) {
 if err := cond.WriteTo(w); err != nil {
 return "", err
 }
-return ConvertToBindedSQL(w.writer.String(), w.args)
+return ConvertToBoundSQL(w.writer.String(), w.args)
 }
 
-// ToSQL convert a builder or condtions to SQL and args
+// ToSQL convert a builder or conditions to SQL and args
 func ToSQL(cond interface{}) (string, []interface{}, error) {
 switch cond.(type) {
 case Cond:
@@ -45,11 +45,11 @@ func ToSQL(cond interface{}) (string, []interface{}, error) {
 return "", nil, ErrNotSupportType
 }
 
-// ToBindedSQL convert a builder or condtions to parameters binded SQL
-func ToBindedSQL(cond interface{}) (string, error) {
+// ToBoundSQL convert a builder or conditions to parameters bound SQL
+func ToBoundSQL(cond interface{}) (string, error) {
 switch cond.(type) {
 case Cond:
-return condToBindedSQL(cond.(Cond))
+return condToBoundSQL(cond.(Cond))
 case *Builder:
 return cond.(*Builder).ToBindedSQL()
 }
@@ -89,8 +89,8 @@ func noSQLQuoteNeeded(a interface{}) bool {
 return false
 }
 
-// ConvertToBindedSQL will convert SQL and args to a binded SQL
-func ConvertToBindedSQL(sql string, args []interface{}) (string, error) {
+// ConvertToBoundSQL will convert SQL and args to a bound SQL
+func ConvertToBoundSQL(sql string, args []interface{}) (string, error) {
 buf := StringBuilder{}
 var i, j, start int
 for ; i < len(sql); i++ {

sql_fiddler.go

@@ -0,0 +1,80 @@
+// 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 (
+"io/ioutil"
+"os"
+
+"github.com/go-xorm/sqlfiddle"
+)
+
+type fiddler struct {
+sessionCode string
+dbType int
+f *sqlfiddle.Fiddle
+}
+
+func readPreparationSQLFromFile(path string) (string, error) {
+file, err := os.Open(path)
+defer file.Close()
+if err != nil {
+return "", err
+}
+
+data, err := ioutil.ReadAll(file)
+if err != nil {
+return "", err
+}
+
+return string(data), nil
+}
+
+func newFiddler(fiddleServerAddr, dbDialect, preparationSQL string) (*fiddler, error) {
+var dbType int
+switch dbDialect {
+case MYSQL:
+dbType = sqlfiddle.Mysql5_6
+case MSSQL:
+dbType = sqlfiddle.MSSQL2017
+case POSTGRES:
+dbType = sqlfiddle.PostgreSQL96
+case ORACLE:
+dbType = sqlfiddle.Oracle11gR2
+case SQLITE:
+dbType = sqlfiddle.SQLite_WebSQL
+default:
+return nil, ErrNotSupportDialectType
+}
+
+f := sqlfiddle.NewFiddle(fiddleServerAddr)
+response, err := f.CreateSchema(dbType, preparationSQL)
+if err != nil {
+return nil, err
+}
+
+return &fiddler{sessionCode: response.Code, f: f, dbType: dbType}, nil
+}
+
+func (f *fiddler) executableCheck(obj interface{}) error {
+var sql string
+var err error
+switch obj.(type) {
+case *Builder:
+sql, err = obj.(*Builder).ToBindedSQL()
+if err != nil {
+return err
+}
+case string:
+sql = obj.(string)
+}
+
+_, err = f.f.RunSQL(f.dbType, f.sessionCode, sql)
+if err != nil {
+return err
+}
+
+return nil
+}

sql_fiddler_test.go

@@ -0,0 +1,40 @@
+// 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 (
+"fmt"
+"testing"
+
+"github.com/stretchr/testify/assert"
+)
+
+func TestReadPreparationSQLFromFile(t *testing.T) {
+sqlFromFile, err := readPreparationSQLFromFile("testdata/mysql_fiddle_data.sql")
+assert.NoError(t, err)
+fmt.Println(sqlFromFile)
+}
+
+func TestNewFiddler(t *testing.T) {
+sqlFromFile, err := readPreparationSQLFromFile("testdata/mysql_fiddle_data.sql")
+assert.NoError(t, err)
+f, err := newFiddler("", MYSQL, sqlFromFile)
+assert.NoError(t, err)
+assert.NotEmpty(t, f.sessionCode)
+}
+
+func TestExecutableCheck(t *testing.T) {
+sqlFromFile, err := readPreparationSQLFromFile("testdata/mysql_fiddle_data.sql")
+assert.NoError(t, err)
+f, err := newFiddler("", MYSQL, sqlFromFile)
+assert.NoError(t, err)
+assert.NotEmpty(t, f.sessionCode)
+
+assert.NoError(t, f.executableCheck("SELECT * FROM table1"))
+
+err = f.executableCheck("SELECT * FROM table3")
+assert.Error(t, err)
+fmt.Println(err)
+}