chore: revise weekday logic using mod

2 years ago · 82d47b4d93
1 changed files with 1 additions and 6 deletions
--- 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
+      `(WEEKDAY(${fn(pt.arguments[0])}) - ${offset} % 7 + 7) % 7 ${colAlias}`
      WHEN WEEKDAY(${fn(pt.arguments[0])}) >= ${offset} THEN
        WEEKDAY(${fn(pt.arguments[0])}) - ${offset}
      ELSE
       7 - ${offset} + WEEKDAY(${fn(pt.arguments[0])})
      END${colAlias}`
    );
  },
 };