feat: fix the problem

Signed-off-by: Manan Gupta <[email protected]>
vitessio · Dec 26, 2024 · a2e1ffb · a2e1ffb
1 parent 44c1dc2
commit a2e1ffb
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/go/mysql/datetime/spec.go b/go/mysql/datetime/spec.go
@@ -374,10 +374,7 @@ func (u fmtWeek0) parse(t *timeparts, bytes string) (string, bool) {
 type fmtWeek1 struct{}
 
 func (fmtWeek1) format(dst []byte, t DateTime, prec uint8) []byte {
-	year, week := t.Date.ISOWeek()
-	if year < t.Date.Year() {
-		week = 0
-	}
+	week := t.Date.Week(1)
 	return appendInt(dst, week, 2)
 }
 

diff --git a/go/vt/vtgate/evalengine/compiler_test.go b/go/vt/vtgate/evalengine/compiler_test.go
@@ -741,9 +741,25 @@ func TestCompilerSingle(t *testing.T) {
 			result:     `VARBINARY("\x00\x00\x00\xff")`,
 		},
 		{
-			expression: `DATE_FORMAT(timestamp '2024-12-30 10:34:58', "%u");`,
+			expression: `DATE_FORMAT(timestamp '2024-12-30 10:34:58', "%u")`,
 			result:     `VARCHAR("53")`,
 		},
+		{
+			expression: `WEEK(timestamp '2024-12-30 10:34:58', 0)`,
+			result:     `INT64(52)`,
+		},
+		{
+			expression: `WEEK(timestamp '2024-12-30 10:34:58', 1)`,
+			result:     `INT64(53)`,
+		},
+		{
+			expression: `WEEK(timestamp '2024-01-01 10:34:58', 0)`,
+			result:     `INT64(0)`,
+		},
+		{
+			expression: `WEEK(timestamp '2024-01-01 10:34:58', 1)`,
+			result:     `INT64(1)`,
+		},
 	}
 
 	tz, _ := time.LoadLocation("Europe/Madrid")