This is an automated cherry-pick of pingcap#46314

Signed-off-by: ti-chi-bot <[email protected]>
ti-chi-bot · Aug 22, 2023 · 76b4285 · 76b4285
1 parent 8040e28
commit 76b4285
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/parser/misc.go b/parser/misc.go
@@ -995,11 +995,27 @@ func (s *Scanner) isTokenIdentifier(lit string, offset int) int {
 	// An identifier before or after '.' means it is part of a qualified identifier.
 	// We do not parse it as keyword.
 	if s.r.peek() == '.' {
+<<<<<<< HEAD
 		return 0
 	}
 	if offset > 0 && s.r.s[offset-1] == '.' {
 		return 0
 	}
+=======
+		return 0
+	}
+
+	for idx := offset - 1; idx >= 0; idx-- {
+		if s.r.s[idx] == ' ' {
+			continue
+		} else if s.r.s[idx] == '.' {
+			return 0
+		} else {
+			break
+		}
+	}
+
+>>>>>>> 1769f3a1ac3 (parser: fix parser identifier with dot (#46314))
 	buf := &s.buf
 	buf.Reset()
 	buf.Grow(len(lit))

diff --git a/parser/parser_test.go b/parser/parser_test.go
@@ -1017,6 +1017,7 @@ AAAAAAAAAAAA5gm5Mg==
 
 		{"select `t`.`1a`.1 from t;", true, "SELECT `t`.`1a`.`1` FROM `t`"},
 		{"select * from 1db.1table;", true, "SELECT * FROM `1db`.`1table`"},
+		{"select * from t where t. status = 1;", true, "SELECT * FROM `t` WHERE `t`.`status`=1"},
 
 		// for show placement
 		{"SHOW PLACEMENT", true, "SHOW PLACEMENT"},