From 82d47b4d93eabfe402a1bbe22987611b9c8da604 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 18 Jul 2022 12:33:32 +0800
Subject: [PATCH] chore: revise weekday logic using mod

---
 .../db/sql-data-mapper/lib/sql/functionMappings/mysql.ts   | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/mysql.ts b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/mysql.ts
index 9c35ee09ad..9d8df34256 100644
--- a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/mysql.ts
+++ b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/mysql.ts
@@ -68,12 +68,7 @@ const mysql2 = {
     };
     const offset = m[pt?.arguments[1]?.value.toLowerCase()] || 0;
     return knex.raw(
-      `CASE
-      WHEN WEEKDAY(${fn(pt.arguments[0])}) >= ${offset} THEN
-        WEEKDAY(${fn(pt.arguments[0])}) - ${offset}
-      ELSE
-       7 - ${offset} + WEEKDAY(${fn(pt.arguments[0])})
-      END${colAlias}`
+      `(WEEKDAY(${fn(pt.arguments[0])}) - ${offset} % 7 + 7) % 7 ${colAlias}`
     );
   },
 };