Fix Select with specific symbol, close go-gorm#3158

mehdy · Jul 17, 2020 · 58e3241 · 58e3241
1 parent b8692c7
commit 58e3241
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/tests/query_test.go b/tests/query_test.go
@@ -310,19 +310,24 @@ func TestSelect(t *testing.T) {
 	dryDB := DB.Session(&gorm.Session{DryRun: true})
 	r := dryDB.Select("name", "age").Find(&User{})
 	if !regexp.MustCompile("SELECT .*name.*,.*age.* FROM .*users.*").MatchString(r.Statement.SQL.String()) {
-		t.Fatalf("Build NOT condition, but got %v", r.Statement.SQL.String())
+		t.Fatalf("Build Select with strings, but got %v", r.Statement.SQL.String())
 	}
 
 	r = dryDB.Select([]string{"name", "age"}).Find(&User{})
 	if !regexp.MustCompile("SELECT .*name.*,.*age.* FROM .*users.*").MatchString(r.Statement.SQL.String()) {
-		t.Fatalf("Build NOT condition, but got %v", r.Statement.SQL.String())
+		t.Fatalf("Build Select with slice, but got %v", r.Statement.SQL.String())
 	}
 
 	r = dryDB.Table("users").Select("COALESCE(age,?)", 42).Find(&User{})
-	if !regexp.MustCompile("SELECT COALESCE\\(age,.*\\) FROM .*users.*").MatchString(r.Statement.SQL.String()) {
-		t.Fatalf("Build NOT condition, but got %v", r.Statement.SQL.String())
+	if !regexp.MustCompile(`SELECT COALESCE\(age,.*\) FROM .*users.*`).MatchString(r.Statement.SQL.String()) {
+		t.Fatalf("Build Select with func, but got %v", r.Statement.SQL.String())
 	}
 	// SELECT COALESCE(age,'42') FROM users;
+
+	r = dryDB.Select("u.*").Table("users as u").First(&User{}, user.ID)
+	if !regexp.MustCompile(`SELECT u\.\* FROM .*users.*`).MatchString(r.Statement.SQL.String()) {
+		t.Fatalf("Build Select with u.*, but got %v", r.Statement.SQL.String())
+	}
 }
 
 func TestPluckWithSelect(t *testing.T) {

diff --git a/utils/utils.go b/utils/utils.go
@@ -30,7 +30,7 @@ func FileWithLineNum() string {
 }
 
 func IsChar(c rune) bool {
-	return !unicode.IsLetter(c) && !unicode.IsNumber(c)
+	return !unicode.IsLetter(c) && !unicode.IsNumber(c) && c != '.' && c != '*'
 }
 
 func CheckTruth(val interface{}) bool {