Rename IsValidDBNameChar to IsInvalidDBNameChar (#7582)

Author: mengxunQAQ

chainable_api.go

@@ -178,7 +178,7 @@ func (db *DB) Omit(columns ...string) (tx *DB) {
 	tx = db.getInstance()
 
 	if len(columns) == 1 && strings.ContainsRune(columns[0], ',') {
-		tx.Statement.Omits = strings.FieldsFunc(columns[0], utils.IsValidDBNameChar)
+		tx.Statement.Omits = strings.FieldsFunc(columns[0], utils.IsInvalidDBNameChar)
 	} else {
 		tx.Statement.Omits = columns
 	}
@@ -283,7 +283,7 @@ func joins(db *DB, joinType clause.JoinType, query string, args ...interface{})
 func (db *DB) Group(name string) (tx *DB) {
 	tx = db.getInstance()
 
-	fields := strings.FieldsFunc(name, utils.IsValidDBNameChar)
+	fields := strings.FieldsFunc(name, utils.IsInvalidDBNameChar)
 	tx.Statement.AddClause(clause.GroupBy{
 		Columns: []clause.Column{{Name: name, Raw: len(fields) != 1}},
 	})

finisher_api.go

@@ -465,7 +465,7 @@ func (db *DB) Count(count *int64) (tx *DB) {
 
 		if len(tx.Statement.Selects) == 1 {
 			dbName := tx.Statement.Selects[0]
-			fields := strings.FieldsFunc(dbName, utils.IsValidDBNameChar)
+			fields := strings.FieldsFunc(dbName, utils.IsInvalidDBNameChar)
 			if len(fields) == 1 || (len(fields) == 3 && (strings.ToUpper(fields[1]) == "AS" || fields[1] == ".")) {
 				if tx.Statement.Parse(tx.Statement.Model) == nil {
 					if f := tx.Statement.Schema.LookUpField(dbName); f != nil {
@@ -564,7 +564,7 @@ func (db *DB) Pluck(column string, dest interface{}) (tx *DB) {
 	}
 
 	if len(tx.Statement.Selects) != 1 {
-		fields := strings.FieldsFunc(column, utils.IsValidDBNameChar)
+		fields := strings.FieldsFunc(column, utils.IsInvalidDBNameChar)
 		tx.Statement.AddClauseIfNotExists(clause.Select{
 			Distinct: tx.Statement.Distinct,
 			Columns:  []clause.Column{{Name: column, Raw: len(fields) != 1}},

utils/utils.go

@@ -48,7 +48,7 @@ func FileWithLineNum() string {
 	return ""
 }
 
-func IsValidDBNameChar(c rune) bool {
+func IsInvalidDBNameChar(c rune) bool {
 	return !unicode.IsLetter(c) && !unicode.IsNumber(c) && c != '.' && c != '*' && c != '_' && c != '$' && c != '@'
 }
 

utils/utils_test.go

@@ -10,9 +10,9 @@ import (
 	"time"
 )
 
-func TestIsValidDBNameChar(t *testing.T) {
+func TestIsInvalidDBNameChar(t *testing.T) {
 	for _, db := range []string{"db", "dbName", "db_name", "db1", "1dbname", "db$name"} {
-		if fields := strings.FieldsFunc(db, IsValidDBNameChar); len(fields) != 1 {
+		if fields := strings.FieldsFunc(db, IsInvalidDBNameChar); len(fields) != 1 {
 			t.Fatalf("failed to parse db name %v", db)
 		}
 	}