Browse Source

Fix golint ' receiver name ... should be ...' warnings

xormplus 9 years ago
parent
commit
8c02cf66fe
1 changed files with 21 additions and 21 deletions
  1. 21 21
      statement.go

+ 21 - 21
statement.go

@@ -809,9 +809,9 @@ func (statement *Statement) ForUpdate() *Statement {
 }
 
 // Select replace select
-func (s *Statement) Select(str string) *Statement {
-	s.selectStr = str
-	return s
+func (statement *Statement) Select(str string) *Statement {
+	statement.selectStr = str
+	return statement
 }
 
 // Cols generate "col1, col2" statement
@@ -1031,11 +1031,11 @@ func (statement *Statement) genCreateTableSQL() string {
 		statement.StoreEngine, statement.Charset)
 }
 
-func (s *Statement) genIndexSQL() []string {
+func (statement *Statement) genIndexSQL() []string {
 	var sqls []string
-	tbName := s.TableName()
-	quote := s.Engine.Quote
-	for idxName, index := range s.RefTable.Indexes {
+	tbName := statement.TableName()
+	quote := statement.Engine.Quote
+	for idxName, index := range statement.RefTable.Indexes {
 		if index.Type == core.IndexType {
 			sql := fmt.Sprintf("CREATE INDEX %v ON %v (%v);", quote(indexName(tbName, idxName)),
 				quote(tbName), quote(strings.Join(index.Cols, quote(","))))
@@ -1049,41 +1049,41 @@ func uniqueName(tableName, uqeName string) string {
 	return fmt.Sprintf("UQE_%v_%v", tableName, uqeName)
 }
 
-func (s *Statement) genUniqueSQL() []string {
+func (statement *Statement) genUniqueSQL() []string {
 	var sqls []string
-	tbName := s.TableName()
-	for _, index := range s.RefTable.Indexes {
+	tbName := statement.TableName()
+	for _, index := range statement.RefTable.Indexes {
 		if index.Type == core.UniqueType {
-			sql := s.Engine.dialect.CreateIndexSql(tbName, index)
+			sql := statement.Engine.dialect.CreateIndexSql(tbName, index)
 			sqls = append(sqls, sql)
 		}
 	}
 	return sqls
 }
 
-func (s *Statement) genDelIndexSQL() []string {
+func (statement *Statement) genDelIndexSQL() []string {
 	var sqls []string
-	tbName := s.TableName()
-	for idxName, index := range s.RefTable.Indexes {
+	tbName := statement.TableName()
+	for idxName, index := range statement.RefTable.Indexes {
 		var rIdxName string
 		if index.Type == core.UniqueType {
 			rIdxName = uniqueName(tbName, idxName)
 		} else if index.Type == core.IndexType {
 			rIdxName = indexName(tbName, idxName)
 		}
-		sql := fmt.Sprintf("DROP INDEX %v", s.Engine.Quote(rIdxName))
-		if s.Engine.dialect.IndexOnTable() {
-			sql += fmt.Sprintf(" ON %v", s.Engine.Quote(s.TableName()))
+		sql := fmt.Sprintf("DROP INDEX %v", statement.Engine.Quote(rIdxName))
+		if statement.Engine.dialect.IndexOnTable() {
+			sql += fmt.Sprintf(" ON %v", statement.Engine.Quote(statement.TableName()))
 		}
 		sqls = append(sqls, sql)
 	}
 	return sqls
 }
 
-func (s *Statement) genAddColumnStr(col *core.Column) (string, []interface{}) {
-	quote := s.Engine.Quote
-	sql := fmt.Sprintf("ALTER TABLE %v ADD %v;", quote(s.TableName()),
-		col.String(s.Engine.dialect))
+func (statement *Statement) genAddColumnStr(col *core.Column) (string, []interface{}) {
+	quote := statement.Engine.Quote
+	sql := fmt.Sprintf("ALTER TABLE %v ADD %v;", quote(statement.TableName()),
+		col.String(statement.Engine.dialect))
 	return sql, []interface{}{}
 }