rename func

Author: BetaCat0

builder.go

@@ -245,7 +245,7 @@ func (b *Builder) ToSQL() (string, []interface{}, error) {
 }
 
 // ToBoundSQL
-func (b *Builder) ToBindedSQL() (string, error) {
+func (b *Builder) ToBoundSQL() (string, error) {
 w := NewWriter()
 if err := b.WriteTo(w); err != nil {
 return "", err

builder_limit_test.go

@@ -19,14 +19,14 @@ func TestBuilder_Limit4Mssql(t *testing.T) {
 
 // simple -- MsSQL style
 sql, err := Dialect(MSSQL).Select("a", "b", "c").From("table1").
-OrderBy("a ASC").Limit(5).ToBindedSQL()
+OrderBy("a ASC").Limit(5).ToBoundSQL()
 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.NoError(t, f.executableCheck(sql))
 
 // 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()
+Where(Neq{"a": "3"}).OrderBy("a ASC").Limit(5, 10).ToBoundSQL()
 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<>'3' ORDER BY a ASC) at WHERE at.RN>10", sql)
 assert.NoError(t, f.executableCheck(sql))
@@ -36,7 +36,7 @@ func TestBuilder_Limit4Mssql(t *testing.T) {
 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()
+OrderBy("b DESC").Limit(7, 9).ToBoundSQL()
 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))
@@ -51,21 +51,21 @@ func TestBuilder_Limit4MysqlLike(t *testing.T) {
 
 // simple -- MySQL/SQLite/PostgreSQL style
 sql, err := Dialect(MYSQL).Select("a", "b", "c").From("table1").OrderBy("a ASC").
-Limit(5, 10).ToBindedSQL()
+Limit(5, 10).ToBoundSQL()
 assert.NoError(t, err)
 assert.EqualValues(t, "SELECT a,b,c FROM table1 ORDER BY a ASC LIMIT 5 OFFSET 10", sql)
 assert.NoError(t, f.executableCheck(sql))
 
 // simple -- MySQL/SQLite/PostgreSQL style
 sql, err = Dialect(MYSQL).Select("a", "b", "c").From("table1").
-OrderBy("a ASC").Limit(5).ToBindedSQL()
+OrderBy("a ASC").Limit(5).ToBoundSQL()
 assert.NoError(t, err)
 assert.EqualValues(t, "SELECT a,b,c FROM table1 ORDER BY a ASC LIMIT 5", sql)
 assert.NoError(t, f.executableCheck(sql))
 
 // simple with where -- MySQL/SQLite/PostgreSQL style
 sql, err = Dialect(MYSQL).Select("a", "b", "c").From("table1").
-Where(Eq{"a": "1", "b": "1"}).OrderBy("a ASC").Limit(5, 10).ToBindedSQL()
+Where(Eq{"a": "1", "b": "1"}).OrderBy("a ASC").Limit(5, 10).ToBoundSQL()
 assert.NoError(t, err)
 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))
@@ -75,7 +75,7 @@ func TestBuilder_Limit4MysqlLike(t *testing.T) {
 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()
+Limit(5, 10).ToBoundSQL()
 assert.NoError(t, err)
 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))
@@ -90,28 +90,28 @@ func TestBuilder_Limit4Oracle(t *testing.T) {
 
 // simple -- OracleSQL style
 sql, err := Dialect(ORACLE).Select("a", "b", "c").From("table1").OrderBy("a ASC").
-Limit(5, 10).ToBindedSQL()
+Limit(5, 10).ToBoundSQL()
 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<=15) att WHERE att.RN>10", sql)
 assert.NoError(t, f.executableCheck(sql))
 
 // 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()
+InnerJoin("table2 t2", "t1.id = t2.ref_id").OrderBy("a ASC").Limit(5, 10).ToBoundSQL()
 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()
+OrderBy("a ASC").Limit(5).ToBoundSQL()
 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()
+OrderBy("a ASC").Limit(5, 1).ToBoundSQL()
 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))
@@ -122,7 +122,7 @@ func TestBuilder_Limit4Oracle(t *testing.T) {
 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()
+Limit(3).ToBoundSQL()
 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<>'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))

builder_test.go

@@ -442,8 +442,8 @@ func TestExprCond(t *testing.T) {
 assert.EqualValues(t, []interface{}{1, 2, 3, 4}, args)
 }
 
-func TestBuilderToBindedSQL(t *testing.T) {
-newSQL, err := Select("id").From("table").Where(In("a", 1, 2)).ToBindedSQL()
+func TestBuilderToBoundSQL(t *testing.T) {
+newSQL, err := Select("id").From("table").Where(In("a", 1, 2)).ToBoundSQL()
 assert.NoError(t, err)
 assert.EqualValues(t, "SELECT id FROM table WHERE a IN (1,2)", newSQL)
 }

sql.go

@@ -51,7 +51,7 @@ func ToBoundSQL(cond interface{}) (string, error) {
 case Cond:
 return condToBoundSQL(cond.(Cond))
 case *Builder:
-return cond.(*Builder).ToBindedSQL()
+return cond.(*Builder).ToBoundSQL()
 }
 return "", ErrNotSupportType
 }

sql_test.go

@@ -116,7 +116,7 @@ func (f *fiddler) executableCheck(obj interface{}) error {
 var err error
 switch obj.(type) {
 case *Builder:
-sql, err = obj.(*Builder).ToBindedSQL()
+sql, err = obj.(*Builder).ToBoundSQL()
 if err != nil {
 return err
 }