From 560cf9fc62eacc9ee1048549f182346f2f125d15 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Sat, 3 Dec 2022 14:20:52 +0800
Subject: [PATCH 01/29] feat(nc-gui): add time formats

---
 packages/nc-gui/utils/dateTimeUtils.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/utils/dateTimeUtils.ts b/packages/nc-gui/utils/dateTimeUtils.ts
index 8736221840..6f58db18c5 100644
--- a/packages/nc-gui/utils/dateTimeUtils.ts
+++ b/packages/nc-gui/utils/dateTimeUtils.ts
@@ -5,17 +5,19 @@ export const timeAgo = (date: any) => {
 }
 
 export const dateFormats = [
+  'YYYY-MM-DD',
+  'YYYY/MM/DD',
   'DD-MM-YYYY',
   'MM-DD-YYYY',
-  'YYYY-MM-DD',
   'DD/MM/YYYY',
   'MM/DD/YYYY',
-  'YYYY/MM/DD',
   'DD MM YYYY',
   'MM DD YYYY',
   'YYYY MM DD',
 ]
 
+export const timeFormats = ['HH:mm', 'HH:mm:ss', 'HH:mm:ss.SSS']
+
 export const handleTZ = (val: any) => {
   if (!val) {
     return
@@ -60,7 +62,7 @@ export function getDateFormat(v: string) {
 
 export function getDateTimeFormat(v: string) {
   for (const format of dateFormats) {
-    for (const timeFormat of ['HH:mm', 'HH:mm:ss', 'HH:mm:ss.SSS']) {
+    for (const timeFormat of timeFormats) {
       const dateTimeFormat = `${format} ${timeFormat}`
       if (dayjs(v, dateTimeFormat, true).isValid() as any) {
         return dateTimeFormat

From 0295f4ca7163a93972173efdaed447439a7e02e2 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Sat, 3 Dec 2022 14:21:04 +0800
Subject: [PATCH 02/29] feat(nc-gui): add LazySmartsheetColumnDateTimeOptions
 for DateTime

---
 packages/nc-gui/components/smartsheet/column/EditOrAdd.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue b/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
index f7a63fe1de..cfe70bae07 100644
--- a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
+++ b/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
@@ -177,6 +177,7 @@ useEventListener('keydown', (e: KeyboardEvent) => {
         <LazySmartsheetColumnCheckboxOptions v-if="formState.uidt === UITypes.Checkbox" v-model:value="formState" />
         <LazySmartsheetColumnLookupOptions v-if="!isEdit && formState.uidt === UITypes.Lookup" v-model:value="formState" />
         <LazySmartsheetColumnDateOptions v-if="formState.uidt === UITypes.Date" v-model:value="formState" />
+        <LazySmartsheetColumnDateTimeOptions v-if="formState.uidt === UITypes.DateTime" v-model:value="formState" />
         <LazySmartsheetColumnRollupOptions v-if="!isEdit && formState.uidt === UITypes.Rollup" v-model:value="formState" />
         <LazySmartsheetColumnLinkedToAnotherRecordOptions
           v-if="!isEdit && formState.uidt === UITypes.LinkToAnotherRecord"

From 2d466830129d8f9661cd7bed705e962b11867f49 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Sat, 3 Dec 2022 14:21:41 +0800
Subject: [PATCH 03/29] feat(nc-gui): add DateTimeOptions

---
 .../smartsheet/column/DateTimeOptions.vue     | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 packages/nc-gui/components/smartsheet/column/DateTimeOptions.vue

diff --git a/packages/nc-gui/components/smartsheet/column/DateTimeOptions.vue b/packages/nc-gui/components/smartsheet/column/DateTimeOptions.vue
new file mode 100644
index 0000000000..6b0f8e25e6
--- /dev/null
+++ b/packages/nc-gui/components/smartsheet/column/DateTimeOptions.vue
@@ -0,0 +1,46 @@
+<script setup lang="ts">
+import { dateFormats, timeFormats, useVModel } from '#imports'
+
+const props = defineProps<{
+  value: any
+}>()
+
+const emit = defineEmits(['update:value'])
+
+const vModel = useVModel(props, 'value', emit)
+
+if (!vModel.value.meta?.date_format) {
+  if (!vModel.value.meta) vModel.value.meta = {}
+  vModel.value.meta.date_format = dateFormats[0]
+}
+
+if (!vModel.value.meta?.time_format) {
+  if (!vModel.value.meta) vModel.value.meta = {}
+  vModel.value.meta.time_format = timeFormats[0]
+}
+</script>
+
+<template>
+  <a-form-item label="Date Format">
+    <a-select v-model:value="vModel.meta.date_format" dropdown-class-name="nc-dropdown-date-format">
+      <a-select-option v-for="(format, i) of dateFormats" :key="i" :value="format">
+        <div class="flex flex-row items-center">
+          <div class="text-xs">
+            {{ format }}
+          </div>
+        </div>
+      </a-select-option>
+    </a-select>
+  </a-form-item>
+  <a-form-item label="Time Format">
+    <a-select v-model:value="vModel.meta.time_format" dropdown-class-name="nc-dropdown-time-format">
+      <a-select-option v-for="(format, i) of timeFormats" :key="i" :value="format">
+        <div class="flex flex-row items-center">
+          <div class="text-xs">
+            {{ format }}
+          </div>
+        </div>
+      </a-select-option>
+    </a-select>
+  </a-form-item>
+</template>

From 55fd0fee74ce814cb0a4ea42a741182433b57f15 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Sat, 3 Dec 2022 14:22:09 +0800
Subject: [PATCH 04/29] feat(nc-gui): format DateTime data

---
 .../nc-gui/components/cell/DateTimePicker.vue     | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/components/cell/DateTimePicker.vue b/packages/nc-gui/components/cell/DateTimePicker.vue
index 8819d23ce7..ffd88acc0c 100644
--- a/packages/nc-gui/components/cell/DateTimePicker.vue
+++ b/packages/nc-gui/components/cell/DateTimePicker.vue
@@ -2,10 +2,13 @@
 import dayjs from 'dayjs'
 import {
   ActiveCellInj,
+  ColumnInj,
   ReadonlyInj,
+  dateFormats,
   inject,
   isDrawerOrModalExist,
   ref,
+  timeFormats,
   useProject,
   useSelectedCellKeyupListener,
   watch,
@@ -28,9 +31,15 @@ const active = inject(ActiveCellInj, ref(false))
 
 const editable = inject(EditModeInj, ref(false))
 
+const columnMeta = inject(ColumnInj, null)!
+
 let isDateInvalid = $ref(false)
 
-const dateFormat = isMysql ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD HH:mm:ssZ'
+const dateTimeFormat = $computed(() => {
+  const dateFormat = columnMeta?.value?.meta?.date_format ?? dateFormats[0]
+  const timeFormat = columnMeta?.value?.meta?.time_format ?? timeFormats[0]
+  return `${dateFormat} ${timeFormat}${!isMysql ? 'Z' : ''}`
+})
 
 let localState = $computed({
   get() {
@@ -52,7 +61,7 @@ let localState = $computed({
     }
 
     if (val.isValid()) {
-      emit('update:modelValue', val?.format(dateFormat))
+      emit('update:modelValue', val?.format(dateTimeFormat))
     }
   },
 })
@@ -163,7 +172,7 @@ useSelectedCellKeyupListener(active, (e: KeyboardEvent) => {
     :show-time="true"
     :bordered="false"
     class="!w-full !px-0 !border-none"
-    format="YYYY-MM-DD HH:mm"
+    :format="dateTimeFormat"
     :placeholder="isDateInvalid ? 'Invalid date' : ''"
     :allow-clear="!readOnly && !localState && !isPk"
     :input-read-only="true"

From 164f0c9f8eb82024cd95cfabfe24ea648c3c9273 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Sat, 3 Dec 2022 16:27:53 +0800
Subject: [PATCH 05/29] feat(playwrights): add DateTimeCell.ts

---
 .../Dashboard/common/Cell/DateTimeCell.ts     | 36 +++++++++++++++++++
 .../pages/Dashboard/common/Cell/index.ts      |  3 ++
 2 files changed, 39 insertions(+)
 create mode 100644 tests/playwright/pages/Dashboard/common/Cell/DateTimeCell.ts

diff --git a/tests/playwright/pages/Dashboard/common/Cell/DateTimeCell.ts b/tests/playwright/pages/Dashboard/common/Cell/DateTimeCell.ts
new file mode 100644
index 0000000000..9d876726cb
--- /dev/null
+++ b/tests/playwright/pages/Dashboard/common/Cell/DateTimeCell.ts
@@ -0,0 +1,36 @@
+import { CellPageObject } from '.';
+import BasePage from '../../../Base';
+
+export class DateTimeCellPageObject extends BasePage {
+  readonly cell: CellPageObject;
+
+  constructor(cell: CellPageObject) {
+    super(cell.rootPage);
+    this.cell = cell;
+  }
+
+  get({ index, columnHeader }: { index?: number; columnHeader: string }) {
+    return this.cell.get({ index, columnHeader });
+  }
+
+  async open({ index, columnHeader }: { index: number; columnHeader: string }) {
+    await this.cell.dblclick({
+      index,
+      columnHeader,
+    });
+  }
+
+  async selectDateTime({
+    // date in format `YYYY-MM-DD`
+    // time in format 'HH:mm'
+    dateTime,
+  }: {
+    dateTime: string;
+  }) {
+    await this.rootPage.locator(`td[title="${dateTime}"]`).click();
+  }
+
+  async close() {
+    await this.rootPage.keyboard.press('Escape');
+  }
+}
diff --git a/tests/playwright/pages/Dashboard/common/Cell/index.ts b/tests/playwright/pages/Dashboard/common/Cell/index.ts
index 22052a2ca6..92fdf7a2f2 100644
--- a/tests/playwright/pages/Dashboard/common/Cell/index.ts
+++ b/tests/playwright/pages/Dashboard/common/Cell/index.ts
@@ -7,6 +7,7 @@ import { SharedFormPage } from '../../../SharedForm';
 import { CheckboxCellPageObject } from './CheckboxCell';
 import { RatingCellPageObject } from './RatingCell';
 import { DateCellPageObject } from './DateCell';
+import { DateTimeCellPageObject } from './DateTimeCell';
 
 export class CellPageObject extends BasePage {
   readonly parent: GridPage | SharedFormPage;
@@ -15,6 +16,7 @@ export class CellPageObject extends BasePage {
   readonly checkbox: CheckboxCellPageObject;
   readonly rating: RatingCellPageObject;
   readonly date: DateCellPageObject;
+  readonly dateTime: DateTimeCellPageObject;
 
   constructor(parent: GridPage | SharedFormPage) {
     super(parent.rootPage);
@@ -24,6 +26,7 @@ export class CellPageObject extends BasePage {
     this.checkbox = new CheckboxCellPageObject(this);
     this.rating = new RatingCellPageObject(this);
     this.date = new DateCellPageObject(this);
+    this.dateTime = new DateTimeCellPageObject(this);
   }
 
   get({ index, columnHeader }: { index?: number; columnHeader: string }): Locator {

From beb9c3bbf2e73ed211667e59ca91d9c8a0e07115 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Sat, 3 Dec 2022 20:07:01 +0800
Subject: [PATCH 06/29] refactor(nc-gui): add class to select and remove
 unnecessary div

---
 .../smartsheet/column/DateTimeOptions.vue        | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/column/DateTimeOptions.vue b/packages/nc-gui/components/smartsheet/column/DateTimeOptions.vue
index 6b0f8e25e6..152b504fd4 100644
--- a/packages/nc-gui/components/smartsheet/column/DateTimeOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/DateTimeOptions.vue
@@ -22,24 +22,16 @@ if (!vModel.value.meta?.time_format) {
 
 <template>
   <a-form-item label="Date Format">
-    <a-select v-model:value="vModel.meta.date_format" dropdown-class-name="nc-dropdown-date-format">
+    <a-select v-model:value="vModel.meta.date_format" class="nc-date-select" dropdown-class-name="nc-dropdown-date-format">
       <a-select-option v-for="(format, i) of dateFormats" :key="i" :value="format">
-        <div class="flex flex-row items-center">
-          <div class="text-xs">
-            {{ format }}
-          </div>
-        </div>
+        {{ format }}
       </a-select-option>
     </a-select>
   </a-form-item>
   <a-form-item label="Time Format">
-    <a-select v-model:value="vModel.meta.time_format" dropdown-class-name="nc-dropdown-time-format">
+    <a-select v-model:value="vModel.meta.time_format" class="nc-time-select" dropdown-class-name="nc-dropdown-time-format">
       <a-select-option v-for="(format, i) of timeFormats" :key="i" :value="format">
-        <div class="flex flex-row items-center">
-          <div class="text-xs">
-            {{ format }}
-          </div>
-        </div>
+        {{ format }}
       </a-select-option>
     </a-select>
   </a-form-item>

From 8a84ad6838c31fec1dca8354322cf168e386cb7c Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Sat, 3 Dec 2022 20:07:28 +0800
Subject: [PATCH 07/29] chore(nc-gui): remove HH:mm:ss.SSS as SSS is not
 configurable in picker

---
 packages/nc-gui/utils/dateTimeUtils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/utils/dateTimeUtils.ts b/packages/nc-gui/utils/dateTimeUtils.ts
index 6f58db18c5..9b28637e9f 100644
--- a/packages/nc-gui/utils/dateTimeUtils.ts
+++ b/packages/nc-gui/utils/dateTimeUtils.ts
@@ -16,7 +16,7 @@ export const dateFormats = [
   'YYYY MM DD',
 ]
 
-export const timeFormats = ['HH:mm', 'HH:mm:ss', 'HH:mm:ss.SSS']
+export const timeFormats = ['HH:mm', 'HH:mm:ss']
 
 export const handleTZ = (val: any) => {
   if (!val) {

From 8d85fe2063cf97518df6994928cdee7b5499e304 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Sat, 3 Dec 2022 20:07:57 +0800
Subject: [PATCH 08/29] feat(playwright): add selectDate & selectTime

---
 .../Dashboard/common/Cell/DateTimeCell.ts     | 34 ++++++++++++++++---
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/tests/playwright/pages/Dashboard/common/Cell/DateTimeCell.ts b/tests/playwright/pages/Dashboard/common/Cell/DateTimeCell.ts
index 9d876726cb..0445b7fa60 100644
--- a/tests/playwright/pages/Dashboard/common/Cell/DateTimeCell.ts
+++ b/tests/playwright/pages/Dashboard/common/Cell/DateTimeCell.ts
@@ -20,14 +20,38 @@ export class DateTimeCellPageObject extends BasePage {
     });
   }
 
-  async selectDateTime({
+  async selectDate({
     // date in format `YYYY-MM-DD`
-    // time in format 'HH:mm'
-    dateTime,
+    date,
   }: {
-    dateTime: string;
+    date: string;
   }) {
-    await this.rootPage.locator(`td[title="${dateTime}"]`).click();
+    await this.rootPage.locator(`td[title="${date}"]`).click();
+  }
+
+  async selectTime({
+    // hour: 0 - 23
+    // minute: 0 - 59
+    // second: 0 - 59
+    hour,
+    minute,
+    second,
+  }: {
+    hour: string;
+    minute: string;
+    second?: string;
+  }) {
+    await this.rootPage
+      .locator(`.ant-picker-time-panel-column:nth-child(1) > ant-picker-time-panel-cell:nth-child(${hour})`)
+      .click();
+    await this.rootPage
+      .locator(`.ant-picker-time-panel-column:nth-child(2) > ant-picker-time-panel-cell:nth-child(${minute})`)
+      .click();
+    if (second != null) {
+      await this.rootPage
+        .locator(`.ant-picker-time-panel-column:nth-child(3) > ant-picker-time-panel-cell:nth-child(${second})`)
+        .click();
+    }
   }
 
   async close() {

From a290876657dd66421f162d6c83d92b9aef20266b Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Sat, 3 Dec 2022 20:09:00 +0800
Subject: [PATCH 09/29] feat(playwright): add tests for datetime

---
 .../pages/Dashboard/Grid/Column/index.ts      | 24 +++++++
 tests/playwright/tests/columnDateTime.spec.ts | 69 +++++++++++++++++++
 2 files changed, 93 insertions(+)
 create mode 100644 tests/playwright/tests/columnDateTime.spec.ts

diff --git a/tests/playwright/pages/Dashboard/Grid/Column/index.ts b/tests/playwright/pages/Dashboard/Grid/Column/index.ts
index 48107c7800..1a35a7655a 100644
--- a/tests/playwright/pages/Dashboard/Grid/Column/index.ts
+++ b/tests/playwright/pages/Dashboard/Grid/Column/index.ts
@@ -35,6 +35,8 @@ export class ColumnPageObject extends BasePage {
     relationType = '',
     rollupType = '',
     format = '',
+    dateFormat = '',
+    timeFormat = '',
     insertAfterColumnTitle,
     insertBeforeColumnTitle,
   }: {
@@ -47,6 +49,8 @@ export class ColumnPageObject extends BasePage {
     relationType?: string;
     rollupType?: string;
     format?: string;
+    dateFormat?: string;
+    timeFormat?: string;
     insertBeforeColumnTitle?: string;
     insertAfterColumnTitle?: string;
   }) {
@@ -88,6 +92,14 @@ export class ColumnPageObject extends BasePage {
           })
           .click();
         break;
+      case 'DateTime':
+        // Date Format
+        await this.get().locator('.nc-date-select').click();
+        await this.rootPage.locator('.ant-select-item').locator(`text="${dateFormat}"`).click();
+        // Time Format
+        await this.get().locator('.nc-time-select').click();
+        await this.rootPage.locator('.ant-select-item').locator(`text="${timeFormat}"`).click();
+        break;
       case 'Formula':
         await this.get().locator('.nc-formula-input').fill(formula);
         break;
@@ -220,11 +232,15 @@ export class ColumnPageObject extends BasePage {
     type = 'SingleLineText',
     formula = '',
     format,
+    dateFormat = '',
+    timeFormat = '',
   }: {
     title: string;
     type?: string;
     formula?: string;
     format?: string;
+    dateFormat?: string;
+    timeFormat?: string;
   }) {
     await this.getColumnHeader(title).locator('.nc-ui-dt-dropdown').click();
     await this.rootPage.locator('li[role="menuitem"]:has-text("Edit")').click();
@@ -243,6 +259,14 @@ export class ColumnPageObject extends BasePage {
           })
           .click();
         break;
+      case 'DateTime':
+        // Date Format
+        await this.get().locator('.nc-date-select').click();
+        await this.rootPage.locator('.ant-select-item').locator(`text="${dateFormat}"`).click();
+        // Time Format
+        await this.get().locator('.nc-time-select').click();
+        await this.rootPage.locator('.ant-select-item').locator(`text="${timeFormat}"`).click();
+        break;
       default:
         break;
     }
diff --git a/tests/playwright/tests/columnDateTime.spec.ts b/tests/playwright/tests/columnDateTime.spec.ts
new file mode 100644
index 0000000000..faf81b627d
--- /dev/null
+++ b/tests/playwright/tests/columnDateTime.spec.ts
@@ -0,0 +1,69 @@
+import { test } from '@playwright/test';
+import { DashboardPage } from '../pages/Dashboard';
+import setup from '../setup';
+
+// Storing one additional dummy value "10" at end of every input array
+// this will trigger update to previously committed data
+const dateTimeData = [
+  {
+    dateFormat: 'YYYY-MM-DD',
+    timeFormat: 'HH:mm',
+    date: '2022-12-12',
+    hour: '10',
+    minute: '20',
+  },
+  {
+    dateFormat: 'YYYY-MM-DD',
+    timeFormat: 'HH:mm:ss',
+    date: '2022-12-12',
+    hour: '10',
+    minute: '20',
+    second: '30',
+  },
+];
+
+test.describe('DateTime Column', () => {
+  let dashboard: DashboardPage;
+  let context: any;
+
+  test.beforeEach(async ({ page }) => {
+    context = await setup({ page });
+    dashboard = new DashboardPage(page, context.project);
+  });
+
+  test.only('Create DateTime Column', async () => {
+    await dashboard.treeView.createTable({ title: 'test_datetime' });
+    // Create DateTime column
+    await dashboard.grid.column.create({
+      title: 'NC_DATETIME_0',
+      type: 'DateTime',
+      dateFormat: dateTimeData[0].dateFormat,
+      timeFormat: dateTimeData[0].timeFormat,
+    });
+
+    await dashboard.grid.cell.dateTime.open({
+      index: 0,
+      columnHeader: 'NC_DATETIME_0',
+    });
+
+    await dashboard.grid.cell.dateTime.selectDate({
+      date: dateTimeData[0],
+    });
+    await dashboard.grid.cell.dateTime.selectTime({
+      hour: dateTimeData[0].hour,
+      minute: dateTimeData[0].minute,
+    });
+    await dashboard.grid.cell.dateTime.close();
+
+    for (let i = 0; i < dateTimeData.length; i++) {
+      // Edit DateTime column
+      await dashboard.grid.column.openEdit({
+        title: 'NC_DATETIME_0',
+        type: 'DateTime',
+        dateFormat: dateTimeData[i].dateFormat,
+        timeFormat: dateTimeData[i].timeFormat,
+      });
+      // TODO: ...
+    }
+  });
+});

From a5331b9cecb9c908facfb25c9194fdbbd8052eab Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Sat, 3 Dec 2022 20:20:37 +0800
Subject: [PATCH 10/29] wip(playwright): DateTime tests

---
 tests/playwright/tests/columnDateTime.spec.ts | 73 +++++++++++++++----
 1 file changed, 57 insertions(+), 16 deletions(-)

diff --git a/tests/playwright/tests/columnDateTime.spec.ts b/tests/playwright/tests/columnDateTime.spec.ts
index faf81b627d..bb6990be6b 100644
--- a/tests/playwright/tests/columnDateTime.spec.ts
+++ b/tests/playwright/tests/columnDateTime.spec.ts
@@ -11,14 +11,50 @@ const dateTimeData = [
     date: '2022-12-12',
     hour: '10',
     minute: '20',
+    output: '2022-12-12 10:20',
   },
   {
     dateFormat: 'YYYY-MM-DD',
     timeFormat: 'HH:mm:ss',
     date: '2022-12-12',
+    hour: '20',
+    minute: '30',
+    second: '40',
+    output: '2022-12-12 20:30:40',
+  },
+  {
+    dateFormat: 'YYYY/MM/DD',
+    timeFormat: 'HH:mm',
+    date: '2022/12/12',
     hour: '10',
     minute: '20',
-    second: '30',
+    output: '2022/12/12 10:20',
+  },
+  {
+    dateFormat: 'YYYY/MM/DD',
+    timeFormat: 'HH:mm:ss',
+    date: '2022/12/12',
+    hour: '5',
+    minute: '30',
+    second: '40',
+    output: '2022/12/12 05:30:40',
+  },
+  {
+    dateFormat: 'DD-MM-YYYY',
+    timeFormat: 'HH:mm',
+    date: '25-11-2022',
+    hour: '3',
+    minute: '20',
+    output: '12-12-2022 03:20',
+  },
+  {
+    dateFormat: 'DD-MM-YYYY',
+    timeFormat: 'HH:mm:ss',
+    date: '25-11-2022',
+    hour: '2',
+    minute: '30',
+    second: '40',
+    output: '25-11-2022 02:30:40',
   },
 ];
 
@@ -41,20 +77,6 @@ test.describe('DateTime Column', () => {
       timeFormat: dateTimeData[0].timeFormat,
     });
 
-    await dashboard.grid.cell.dateTime.open({
-      index: 0,
-      columnHeader: 'NC_DATETIME_0',
-    });
-
-    await dashboard.grid.cell.dateTime.selectDate({
-      date: dateTimeData[0],
-    });
-    await dashboard.grid.cell.dateTime.selectTime({
-      hour: dateTimeData[0].hour,
-      minute: dateTimeData[0].minute,
-    });
-    await dashboard.grid.cell.dateTime.close();
-
     for (let i = 0; i < dateTimeData.length; i++) {
       // Edit DateTime column
       await dashboard.grid.column.openEdit({
@@ -63,7 +85,26 @@ test.describe('DateTime Column', () => {
         dateFormat: dateTimeData[i].dateFormat,
         timeFormat: dateTimeData[i].timeFormat,
       });
-      // TODO: ...
+
+      await dashboard.grid.cell.dateTime.open({
+        index: 0,
+        columnHeader: 'NC_DATETIME_0',
+      });
+
+      await dashboard.grid.cell.dateTime.selectDate({
+        date: dateTimeData[i].date,
+      });
+      await dashboard.grid.cell.dateTime.selectTime({
+        hour: dateTimeData[i].hour,
+        minute: dateTimeData[i].minute,
+      });
+      await dashboard.grid.cell.dateTime.close();
+
+      await dashboard.grid.cell.verify({
+        index: 0,
+        columnHeader: 'NC_DATETIME_0',
+        value: dateTimeData[i].output,
+      });
     }
   });
 });

From eab412504a8cbb43cc15398590082f6de25669fe Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 5 Dec 2022 13:22:25 +0800
Subject: [PATCH 11/29] feat(playwright): add verifyDateCell

---
 .../pages/Dashboard/common/Cell/index.ts         | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/tests/playwright/pages/Dashboard/common/Cell/index.ts b/tests/playwright/pages/Dashboard/common/Cell/index.ts
index 92fdf7a2f2..bb32f48fa7 100644
--- a/tests/playwright/pages/Dashboard/common/Cell/index.ts
+++ b/tests/playwright/pages/Dashboard/common/Cell/index.ts
@@ -101,6 +101,22 @@ export class CellPageObject extends BasePage {
     }
   }
 
+  async verifyDateCell({ index, columnHeader, value }: { index: number; columnHeader: string; value: string }) {
+    const _verify = async expectedValue => {
+      await expect
+        .poll(async () => {
+          const cell = await this.get({
+            index,
+            columnHeader,
+          }).locator('input');
+          return await cell.getAttribute('title');
+        })
+        .toEqual(expectedValue);
+    };
+
+    await _verify(value);
+  }
+
   async verifyQrCodeCell({
     index,
     columnHeader,

From 5291dc6c201fa93e8d4bb0a402f1e4df32031b89 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 5 Dec 2022 13:23:13 +0800
Subject: [PATCH 12/29] fix(nc-gui): use YYYY-MM-DD HH:mm:ss instead

---
 packages/nc-gui/components/cell/DateTimePicker.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/cell/DateTimePicker.vue b/packages/nc-gui/components/cell/DateTimePicker.vue
index ffd88acc0c..200943245c 100644
--- a/packages/nc-gui/components/cell/DateTimePicker.vue
+++ b/packages/nc-gui/components/cell/DateTimePicker.vue
@@ -61,7 +61,7 @@ let localState = $computed({
     }
 
     if (val.isValid()) {
-      emit('update:modelValue', val?.format(dateTimeFormat))
+      emit('update:modelValue', val?.format('YYYY-MM-DD HH:mm:ss'))
     }
   },
 })

From 34ffcd5215e92c26cd2ea7ae9fb3b89992befdbd Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 5 Dec 2022 13:23:56 +0800
Subject: [PATCH 13/29] feat(playwright): datetime tests

---
 .../Dashboard/common/Cell/DateTimeCell.ts     | 21 ++++---
 tests/playwright/tests/columnDateTime.spec.ts | 61 ++++++++++---------
 2 files changed, 46 insertions(+), 36 deletions(-)

diff --git a/tests/playwright/pages/Dashboard/common/Cell/DateTimeCell.ts b/tests/playwright/pages/Dashboard/common/Cell/DateTimeCell.ts
index 0445b7fa60..50b762b618 100644
--- a/tests/playwright/pages/Dashboard/common/Cell/DateTimeCell.ts
+++ b/tests/playwright/pages/Dashboard/common/Cell/DateTimeCell.ts
@@ -14,18 +14,25 @@ export class DateTimeCellPageObject extends BasePage {
   }
 
   async open({ index, columnHeader }: { index: number; columnHeader: string }) {
+    await this.rootPage.locator('.nc-grid-add-new-cell').click();
+
     await this.cell.dblclick({
       index,
       columnHeader,
     });
   }
 
+  async save() {
+    await this.rootPage.locator('button:has-text("Ok")').click();
+  }
+
   async selectDate({
-    // date in format `YYYY-MM-DD`
+    // date formats in `YYYY-MM-DD`
     date,
   }: {
     date: string;
   }) {
+    // title date format needs to be YYYY-MM-DD
     await this.rootPage.locator(`td[title="${date}"]`).click();
   }
 
@@ -37,19 +44,19 @@ export class DateTimeCellPageObject extends BasePage {
     minute,
     second,
   }: {
-    hour: string;
-    minute: string;
-    second?: string;
+    hour: number;
+    minute: number;
+    second?: number | null;
   }) {
     await this.rootPage
-      .locator(`.ant-picker-time-panel-column:nth-child(1) > ant-picker-time-panel-cell:nth-child(${hour})`)
+      .locator(`.ant-picker-time-panel-column:nth-child(1) > .ant-picker-time-panel-cell:nth-child(${hour + 1})`)
       .click();
     await this.rootPage
-      .locator(`.ant-picker-time-panel-column:nth-child(2) > ant-picker-time-panel-cell:nth-child(${minute})`)
+      .locator(`.ant-picker-time-panel-column:nth-child(2) > .ant-picker-time-panel-cell:nth-child(${minute + 1})`)
       .click();
     if (second != null) {
       await this.rootPage
-        .locator(`.ant-picker-time-panel-column:nth-child(3) > ant-picker-time-panel-cell:nth-child(${second})`)
+        .locator(`.ant-picker-time-panel-column:nth-child(3) > .ant-picker-time-panel-cell:nth-child(${second + 1})`)
         .click();
     }
   }
diff --git a/tests/playwright/tests/columnDateTime.spec.ts b/tests/playwright/tests/columnDateTime.spec.ts
index bb6990be6b..e30e4837d1 100644
--- a/tests/playwright/tests/columnDateTime.spec.ts
+++ b/tests/playwright/tests/columnDateTime.spec.ts
@@ -2,59 +2,57 @@ import { test } from '@playwright/test';
 import { DashboardPage } from '../pages/Dashboard';
 import setup from '../setup';
 
-// Storing one additional dummy value "10" at end of every input array
-// this will trigger update to previously committed data
 const dateTimeData = [
   {
     dateFormat: 'YYYY-MM-DD',
     timeFormat: 'HH:mm',
     date: '2022-12-12',
-    hour: '10',
-    minute: '20',
+    hour: 10,
+    minute: 20,
     output: '2022-12-12 10:20',
   },
   {
     dateFormat: 'YYYY-MM-DD',
     timeFormat: 'HH:mm:ss',
-    date: '2022-12-12',
-    hour: '20',
-    minute: '30',
-    second: '40',
-    output: '2022-12-12 20:30:40',
+    date: '2022-12-11',
+    hour: 20,
+    minute: 30,
+    second: 40,
+    output: '2022-12-11 20:30:40',
   },
   {
     dateFormat: 'YYYY/MM/DD',
     timeFormat: 'HH:mm',
-    date: '2022/12/12',
-    hour: '10',
-    minute: '20',
-    output: '2022/12/12 10:20',
+    date: '2022-12-13',
+    hour: 10,
+    minute: 20,
+    output: '2022/12/13 10:20',
   },
   {
     dateFormat: 'YYYY/MM/DD',
     timeFormat: 'HH:mm:ss',
-    date: '2022/12/12',
-    hour: '5',
-    minute: '30',
-    second: '40',
-    output: '2022/12/12 05:30:40',
+    date: '2022-12-14',
+    hour: 5,
+    minute: 30,
+    second: 40,
+    output: '2022/12/14 05:30:40',
   },
   {
     dateFormat: 'DD-MM-YYYY',
     timeFormat: 'HH:mm',
-    date: '25-11-2022',
-    hour: '3',
-    minute: '20',
-    output: '12-12-2022 03:20',
+    date: '2022-12-10',
+    hour: 4,
+    minute: 30,
+    output: '10-12-2022 04:30',
   },
   {
     dateFormat: 'DD-MM-YYYY',
     timeFormat: 'HH:mm:ss',
-    date: '25-11-2022',
-    hour: '2',
-    minute: '30',
-    second: '40',
-    output: '25-11-2022 02:30:40',
+    date: '2022-12-26',
+    hour: 2,
+    minute: 30,
+    second: 40,
+    output: '26-12-2022 02:30:40',
   },
 ];
 
@@ -86,6 +84,8 @@ test.describe('DateTime Column', () => {
         timeFormat: dateTimeData[i].timeFormat,
       });
 
+      await dashboard.grid.column.save({ isUpdated: true });
+
       await dashboard.grid.cell.dateTime.open({
         index: 0,
         columnHeader: 'NC_DATETIME_0',
@@ -94,13 +94,16 @@ test.describe('DateTime Column', () => {
       await dashboard.grid.cell.dateTime.selectDate({
         date: dateTimeData[i].date,
       });
+
       await dashboard.grid.cell.dateTime.selectTime({
         hour: dateTimeData[i].hour,
         minute: dateTimeData[i].minute,
+        second: dateTimeData[i].second,
       });
-      await dashboard.grid.cell.dateTime.close();
 
-      await dashboard.grid.cell.verify({
+      await dashboard.grid.cell.dateTime.save();
+
+      await dashboard.grid.cell.verifyDateCell({
         index: 0,
         columnHeader: 'NC_DATETIME_0',
         value: dateTimeData[i].output,

From b425adea9a6dc45334949b599f3db796f4ca53ff Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 5 Dec 2022 14:07:59 +0800
Subject: [PATCH 14/29] chore(playwright): remove `.only` for date time test

---
 tests/playwright/tests/columnDateTime.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/playwright/tests/columnDateTime.spec.ts b/tests/playwright/tests/columnDateTime.spec.ts
index e30e4837d1..c5349a9a98 100644
--- a/tests/playwright/tests/columnDateTime.spec.ts
+++ b/tests/playwright/tests/columnDateTime.spec.ts
@@ -65,7 +65,7 @@ test.describe('DateTime Column', () => {
     dashboard = new DashboardPage(page, context.project);
   });
 
-  test.only('Create DateTime Column', async () => {
+  test('Create DateTime Column', async () => {
     await dashboard.treeView.createTable({ title: 'test_datetime' });
     // Create DateTime column
     await dashboard.grid.column.create({

From 6b259fa87b1d197395351ae4b010cea752ecf1ab Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 7 Dec 2022 18:40:51 +0800
Subject: [PATCH 15/29] feat(nc-gui): add DATETIME_DIFF validation

---
 .../smartsheet/column/FormulaOptions.vue      | 57 +++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/packages/nc-gui/components/smartsheet/column/FormulaOptions.vue b/packages/nc-gui/components/smartsheet/column/FormulaOptions.vue
index c55bc8ec85..2721028f22 100644
--- a/packages/nc-gui/components/smartsheet/column/FormulaOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/FormulaOptions.vue
@@ -235,6 +235,63 @@ function validateAgainstMeta(parsedTree: any, errors = new Set(), typeErrors = n
             },
             typeErrors,
           )
+        } else if (parsedTree.callee.name === 'DATETIME_DIFF') {
+          // parsedTree.arguments[0] = date
+          validateAgainstType(
+            parsedTree.arguments[0],
+            formulaTypes.DATE,
+            (v: any) => {
+              if (!validateDateWithUnknownFormat(v)) {
+                typeErrors.add('The first parameter of DATETIME_DIFF() should have date value')
+              }
+            },
+            typeErrors,
+          )
+          // parsedTree.arguments[1] = date
+          validateAgainstType(
+            parsedTree.arguments[1],
+            formulaTypes.DATE,
+            (v: any) => {
+              if (!validateDateWithUnknownFormat(v)) {
+                typeErrors.add('The second parameter of DATETIME_DIFF() should have date value')
+              }
+            },
+            typeErrors,
+          )
+          // parsedTree.arguments[2] = ["milliseconds" | "ms" | "seconds" | "s" | "minutes" | "m" | "hours" | "h" | "days" | "d" | "weeks" | "w" | "months" | "M" | "quarters" | "Q" | "years" | "y"]
+          validateAgainstType(
+            parsedTree.arguments[2],
+            formulaTypes.STRING,
+            (v: any) => {
+              if (
+                ![
+                  'milliseconds',
+                  'ms',
+                  'seconds',
+                  's',
+                  'minutes',
+                  'm',
+                  'hours',
+                  'h',
+                  'days',
+                  'd',
+                  'weeks',
+                  'w',
+                  'months',
+                  'M',
+                  'quarters',
+                  'Q',
+                  'years',
+                  'y',
+                ].includes(v)
+              ) {
+                typeErrors.add(
+                  'The third parameter of DATETIME_DIFF() should have value either "milliseconds", "ms", "seconds", "s", "minutes", "m", "hours", "h", "days", "d", "weeks", "w", "months", "M", "quarters", "Q", "years", or "y"',
+                )
+              }
+            },
+            typeErrors,
+          )
         }
       }
     }

From 5f64da2f3713a93f207473759c1ad6ad39aee778 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 7 Dec 2022 18:41:14 +0800
Subject: [PATCH 16/29] feat(nc-gui): add DATETIME_DIFF hint

---
 packages/nc-gui/utils/formulaUtils.ts | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/packages/nc-gui/utils/formulaUtils.ts b/packages/nc-gui/utils/formulaUtils.ts
index e49655338f..5c1cdf99be 100644
--- a/packages/nc-gui/utils/formulaUtils.ts
+++ b/packages/nc-gui/utils/formulaUtils.ts
@@ -51,6 +51,29 @@ const formulas: Record<string, any> = {
       'DATEADD({column1}, -2, "year")',
     ],
   },
+  DATETIME_DIFF: {
+    type: formulaTypes.DATE,
+    validation: {
+      args: {
+        min: 2,
+        max: 3,
+      },
+    },
+    description: 'Calculate the difference of two given date / datetime in specified units.',
+    syntax:
+      'DATETIME_DIFF(date | datetime, date | datetime, ["milliseconds" | "ms" | "seconds" | "s" | "minutes" | "m" | "hours" | "h" | "days" | "d" | "weeks" | "w" | "months" | "M" | "quarters" | "Q" | "years" | "y"])',
+    examples: [
+      'DATEDIFF({column1}, {column2})',
+      'DATEDIFF({column1}, {column2}, "seconds")',
+      'DATEDIFF({column1}, {column2}, "s")',
+      'DATEDIFF({column1}, {column2}, "years")',
+      'DATEDIFF({column1}, {column2}, "y")',
+      'DATEDIFF({column1}, {column2}, "minutes")',
+      'DATEDIFF({column1}, {column2}, "m")',
+      'DATEDIFF({column1}, {column2}, "days")',
+      'DATEDIFF({column1}, {column2}, "d")',
+    ],
+  },
   AND: {
     type: formulaTypes.COND_EXP,
     validation: {

From f10cf40ee224aec34970dec39694e2e44a51c79a Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 7 Dec 2022 18:41:42 +0800
Subject: [PATCH 17/29] feat(nocodb-sdk): add DATETIME_DIFF to formula list

---
 packages/nocodb-sdk/src/lib/formulaHelpers.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nocodb-sdk/src/lib/formulaHelpers.ts b/packages/nocodb-sdk/src/lib/formulaHelpers.ts
index 94f22b79b5..ffa7964488 100644
--- a/packages/nocodb-sdk/src/lib/formulaHelpers.ts
+++ b/packages/nocodb-sdk/src/lib/formulaHelpers.ts
@@ -132,6 +132,7 @@ export function jsepTreeToFormula(node) {
       'AVG',
       'ADD',
       'DATEADD',
+      'DATETIME_DIFF',
       'WEEKDAY',
       'AND',
       'OR',

From 7fbacb6023c7a05136cab44a3200c59506566e25 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 7 Dec 2022 18:41:58 +0800
Subject: [PATCH 18/29] feat(docs): add DATETIME_DIFF usage

---
 packages/noco-docs/content/en/setup-and-usages/formulas.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/noco-docs/content/en/setup-and-usages/formulas.md b/packages/noco-docs/content/en/setup-and-usages/formulas.md
index 6d39cb250d..5a1d7c3a1c 100644
--- a/packages/noco-docs/content/en/setup-and-usages/formulas.md
+++ b/packages/noco-docs/content/en/setup-and-usages/formulas.md
@@ -97,6 +97,8 @@ Example: ({Column1} + ({Column2} * {Column3}) / (3 - $Column4$ ))
 |  |  | `DATEADD(date, 1, 'year')` | Supposing {DATE_COL} is 2022-03-14 03:14. The result is 2023-03-14 03:14. | DateTime columns and negative values are supported. Example: `DATEADD(DATE_TIME_COL, -1, 'year')` |
 |  |  | `IF(NOW() < DATEADD(date,10,'day'), "true", "false")` | If the current date is less than {DATE_COL} plus 10 days, it returns true. Otherwise, it returns false. | DateTime columns and negative values are supported. |
 |  |  | `IF(NOW() < DATEADD(date,10,'day'), "true", "false")` | If the current date is less than {DATE_COL} plus 10 days, it returns true. Otherwise, it returns false. | DateTime columns and negative values are supported. |
+| **DATETIME_DIFF** | `DATETIME_DIFF(date, date, ["milliseconds" \| "ms" \| "seconds" \| "s" \| "minutes" \| "m" \| "hours" \| "h" \| "days" \| "d" \| "weeks" \| "w" \| "months" \| "M" \| "quarters" \| "Q" \| "years" \| "y"])` | `DATETIME_DIFF("2022/10/14", "2022/10/15", "second")` | Supposing {DATE_COL_1} is 2017-08-25 and {DATE_COL_2} is 2011-08-25. The result is 86400. | Compares two dates and returns the difference in the unit specified. Positive integers indicate the second date being in the past compared to the first and vice versa for negative ones. |
+|  |  | `WEEKDAY(NOW(), "sunday")` | If today is Monday, it returns 1 | Get the week day of NOW() with the first day set as sunday |
 | **WEEKDAY** | `WEEKDAY(date, [startDayOfWeek])` | `WEEKDAY(NOW())` | If today is Monday, it returns 0 | Returns the day of the week as an integer between 0 and 6 inclusive starting from Monday by default. You can optionally change the start day of the week by specifying in the second argument |
 |  |  | `WEEKDAY(NOW(), "sunday")` | If today is Monday, it returns 1 | Get the week day of NOW() with the first day set as sunday |
 

From 961247f4e5038b5f492971e8800ddb96e8f610ca Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 7 Dec 2022 19:48:58 +0800
Subject: [PATCH 19/29] feat(nocodb): covertUnits

---
 .../lib/sql/helpers/convertUnits.ts           | 155 ++++++++++++++++++
 1 file changed, 155 insertions(+)
 create mode 100644 packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/helpers/convertUnits.ts

diff --git a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/helpers/convertUnits.ts b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/helpers/convertUnits.ts
new file mode 100644
index 0000000000..22daefe71c
--- /dev/null
+++ b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/helpers/convertUnits.ts
@@ -0,0 +1,155 @@
+export function convertUnits(
+  unit: string,
+  type: 'mysql' | 'mssql' | 'pg' | 'sqlite'
+) {
+  switch (unit) {
+    case 'milliseconds':
+    case 'ms': {
+      if (type === 'mssql') {
+        return 'millisecond';
+      }
+
+      if (type === 'mysql') {
+        // MySQL doesn't support millisecond
+        // hence change from MICROSECOND to millisecond manually
+        return 'MICROSECOND';
+      }
+
+      if (type === 'pg' || type === 'sqlite') {
+        return 'milliseconds';
+      }
+
+      return unit;
+    }
+    case 'seconds':
+    case 's': {
+      if (type === 'mssql' || type === 'pg') {
+        return 'second';
+      }
+
+      if (type === 'mysql') {
+        return 'SECOND';
+      }
+
+      if (type === 'sqlite') {
+        return 'seconds';
+      }
+
+      return unit;
+    }
+    case 'minutes':
+    case 'm': {
+      if (type === 'mssql' || type === 'pg') {
+        return 'minute';
+      }
+
+      if (type === 'mysql') {
+        return 'MINUTE';
+      }
+
+      if (type === 'sqlite') {
+        return 'minutes';
+      }
+
+      return unit;
+    }
+    case 'hours':
+    case 'h': {
+      if (type === 'mssql' || type === 'pg') {
+        return 'hour';
+      }
+
+      if (type === 'mysql') {
+        return 'HOUR';
+      }
+
+      if (type === 'sqlite') {
+        return 'hours';
+      }
+
+      return unit;
+    }
+    case 'days':
+    case 'd': {
+      if (type === 'mssql' || type === 'pg') {
+        return 'day';
+      }
+
+      if (type === 'mysql') {
+        return 'DAY';
+      }
+
+      if (type === 'sqlite') {
+        return 'days';
+      }
+
+      return unit;
+    }
+    case 'weeks':
+    case 'w': {
+      if (type === 'mssql' || type === 'pg') {
+        return 'week';
+      }
+
+      if (type === 'mysql') {
+        return 'WEEK';
+      }
+
+      if (type === 'sqlite') {
+        return 'weeks';
+      }
+
+      return unit;
+    }
+    case 'months':
+    case 'M': {
+      if (type === 'mssql' || type === 'pg') {
+        return 'month';
+      }
+
+      if (type === 'mysql') {
+        return 'MONTH';
+      }
+
+      if (type === 'sqlite') {
+        return 'months';
+      }
+
+      return unit;
+    }
+    case 'quarters':
+    case 'Q': {
+      if (type === 'mssql' || type === 'pg') {
+        return 'quarter';
+      }
+
+      if (type === 'mysql') {
+        return 'QUARTER';
+      }
+
+      if (type === 'sqlite') {
+        return 'quarters';
+      }
+
+      return unit;
+    }
+    case 'years':
+    case 'y': {
+      if (type === 'mssql' || type === 'pg') {
+        return 'year';
+      }
+
+      if (type === 'mysql') {
+        return 'YEAR';
+      }
+
+      if (type === 'sqlite') {
+        return 'years';
+      }
+
+      return unit;
+    }
+    default:
+      return unit;
+  }
+}

From 9d104016bdda3f1f1905b133293d1ca5e7307632 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 7 Dec 2022 19:56:36 +0800
Subject: [PATCH 20/29] feat(nocodb): add DATETIME_DIFF logic for mysql

---
 .../lib/sql/functionMappings/mysql.ts         | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

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 ab1acb763b..2512437c17 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
@@ -1,6 +1,7 @@
 import dayjs from 'dayjs';
 import { MapFnArgs } from '../mapFunctionName';
 import commonFns from './commonFns';
+import { convertUnits } from '../helpers/convertUnits';
 import { getWeekdayByText } from '../helpers/formulaFnHelper';
 
 const mysql2 = {
@@ -61,6 +62,26 @@ const mysql2 = {
       END${colAlias}`
     );
   },
+  DATETIME_DIFF: ({ fn, knex, pt, colAlias }: MapFnArgs) => {
+    const datetime_expr1 = fn(pt.arguments[0]);
+    const datetime_expr2 = fn(pt.arguments[1]);
+
+    const unit = convertUnits(
+      pt.arguments[2] ? fn(pt.arguments[2]).bindings[0] : 'seconds',
+      'mysql'
+    );
+
+    if (unit === 'MICROSECOND') {
+      // MySQL doesn't support millisecond
+      // hence change from MICROSECOND to millisecond manually
+      return knex.raw(
+        `TIMESTAMPDIFF(${unit}, ${datetime_expr2}, ${datetime_expr1}) div 1000 ${colAlias}`
+      );
+    }
+    return knex.raw(
+      `TIMESTAMPDIFF(${unit}, ${datetime_expr2}, ${datetime_expr1}) ${colAlias}`
+    );
+  },
   WEEKDAY: ({ fn, knex, pt, colAlias }: MapFnArgs) => {
     // WEEKDAY() returns an index from 0 to 6 for Monday to Sunday
     return knex.raw(

From 5ad979b66b974f6079e13ab688a547f4e264aaa6 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 8 Dec 2022 16:37:26 +0800
Subject: [PATCH 21/29] feat(nocodb): add DATETIME_DIFF logic for pg

---
 .../lib/sql/functionMappings/pg.ts            | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/pg.ts b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/pg.ts
index f24ec33598..60c0e122c4 100644
--- a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/pg.ts
+++ b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/pg.ts
@@ -1,6 +1,7 @@
 import dayjs from 'dayjs';
 import { MapFnArgs } from '../mapFunctionName';
 import commonFns from './commonFns';
+import { convertUnits } from '../helpers/convertUnits';
 import { getWeekdayByText } from '../helpers/formulaFnHelper';
 
 const pg = {
@@ -50,6 +51,53 @@ const pg = {
       )}')::interval${colAlias}`
     );
   },
+  DATETIME_DIFF: ({ fn, knex, pt, colAlias }: MapFnArgs) => {
+    const datetime_expr1 = fn(pt.arguments[0]);
+    const datetime_expr2 = fn(pt.arguments[1]);
+    const rawUnit = pt.arguments[2]
+      ? fn(pt.arguments[2]).bindings[0]
+      : 'seconds';
+    let sql;
+    const unit = convertUnits(rawUnit, 'pg');
+    switch (unit) {
+      case 'second':
+        sql = `EXTRACT(EPOCH from (${datetime_expr1}::TIMESTAMP - ${datetime_expr2}::TIMESTAMP))::INTEGER`;
+        break;
+      case 'minute':
+        sql = `EXTRACT(EPOCH from (${datetime_expr1}::TIMESTAMP - ${datetime_expr2}::TIMESTAMP))::INTEGER / 60`;
+        break;
+      case 'milliseconds':
+        sql = `EXTRACT(EPOCH from (${datetime_expr1}::TIMESTAMP - ${datetime_expr2}::TIMESTAMP))::INTEGER / 3600`;
+        break;
+      case 'week':
+        sql = `TRUNC(DATE_PART('day', ${datetime_expr1}::TIMESTAMP - ${datetime_expr2}::TIMESTAMP) / 7)`;
+        break;
+      case 'month':
+        sql = `(
+                DATE_PART('year', ${datetime_expr1}::TIMESTAMP) - 
+                DATE_PART('year', ${datetime_expr2}::TIMESTAMP)
+               ) * 12 + (
+                DATE_PART('month', ${datetime_expr1}::TIMESTAMP) - 
+                DATE_PART('month', ${datetime_expr2}::TIMESTAMP)
+               )`;
+        break;
+      case 'quarter':
+        sql = `((EXTRACT(QUARTER FROM ${datetime_expr1}::TIMESTAMP) + 
+                    DATE_PART('year', AGE(${datetime_expr1},'1900/01/01')) * 4) - 1) - 
+                ((EXTRACT(QUARTER FROM ${datetime_expr2}::TIMESTAMP) + 
+                    DATE_PART('year', AGE(${datetime_expr2},'1900/01/01')) * 4) - 1)`;
+        break;
+      case 'year':
+        sql = `DATE_PART('year', ${datetime_expr1}::TIMESTAMP) - DATE_PART('year', ${datetime_expr2}::TIMESTAMP)`;
+        break;
+      case 'day':
+        sql = `DATE_PART('day', ${datetime_expr1}::TIMESTAMP - ${datetime_expr2}::TIMESTAMP)`;
+        break;
+      default:
+        sql = '';
+    }
+    return knex.raw(`${sql} ${colAlias}`);
+  },
   WEEKDAY: ({ fn, knex, pt, colAlias }: MapFnArgs) => {
     // isodow: the day of the week as Monday (1) to Sunday (7)
     // WEEKDAY() returns an index from 0 to 6 for Monday to Sunday

From b5b7ce0ef9a6ff45fc5a06fb763360cfeca7281c Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 8 Dec 2022 18:31:49 +0800
Subject: [PATCH 22/29] feat(nocodb): add dateTimeUtils

---
 .../nocodb/src/lib/utils/dateTimeUtils.ts     | 75 +++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 packages/nocodb/src/lib/utils/dateTimeUtils.ts

diff --git a/packages/nocodb/src/lib/utils/dateTimeUtils.ts b/packages/nocodb/src/lib/utils/dateTimeUtils.ts
new file mode 100644
index 0000000000..19c058df34
--- /dev/null
+++ b/packages/nocodb/src/lib/utils/dateTimeUtils.ts
@@ -0,0 +1,75 @@
+import dayjs from 'dayjs';
+
+export const dateFormats = [
+  'DD-MM-YYYY',
+  'MM-DD-YYYY',
+  'YYYY-MM-DD',
+  'DD/MM/YYYY',
+  'MM/DD/YYYY',
+  'YYYY/MM/DD',
+  'DD MM YYYY',
+  'MM DD YYYY',
+  'YYYY MM DD',
+];
+
+export function validateDateFormat(v: string) {
+  return dateFormats.includes(v);
+}
+
+export function validateDateWithUnknownFormat(v: string) {
+  for (const format of dateFormats) {
+    if (dayjs(v, format, true).isValid() as any) {
+      return true;
+    }
+    for (const timeFormat of ['HH:mm', 'HH:mm:ss', 'HH:mm:ss.SSS']) {
+      if (dayjs(v, `${format} ${timeFormat}`, true).isValid() as any) {
+        return true;
+      }
+    }
+  }
+  return false;
+}
+
+export function getDateFormat(v: string) {
+  for (const format of dateFormats) {
+    if (dayjs(v, format, true).isValid()) {
+      return format;
+    }
+  }
+  return 'YYYY/MM/DD';
+}
+
+export function getDateTimeFormat(v: string) {
+  for (const format of dateFormats) {
+    for (const timeFormat of ['HH:mm', 'HH:mm:ss', 'HH:mm:ss.SSS']) {
+      const dateTimeFormat = `${format} ${timeFormat}`;
+      if (dayjs(v, dateTimeFormat, true).isValid() as any) {
+        return dateTimeFormat;
+      }
+    }
+  }
+  return 'YYYY/MM/DD';
+}
+
+export function parseStringDate(v: string, dateFormat: string) {
+  const dayjsObj = dayjs(v);
+  if (dayjsObj.isValid()) {
+    v = dayjsObj.format('YYYY-MM-DD');
+  } else {
+    v = dayjs(v, dateFormat).format('YYYY-MM-DD');
+  }
+  return v;
+}
+
+export function convertToTargetFormat(
+  v: string,
+  oldDataFormat,
+  newDateFormat: string
+) {
+  if (
+    !dateFormats.includes(oldDataFormat) ||
+    !dateFormats.includes(newDateFormat)
+  )
+    return v;
+  return dayjs(v, oldDataFormat).format(newDateFormat);
+}

From 82462d2085d93520a7a5aaa675922a768a46995d Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 8 Dec 2022 18:32:18 +0800
Subject: [PATCH 23/29] feat(nocodb): add DATETIME_DIFF logic for sqlite

---
 .../lib/sql/functionMappings/sqlite.ts        | 63 ++++++++++++++++++-
 1 file changed, 62 insertions(+), 1 deletion(-)

diff --git a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/sqlite.ts b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/sqlite.ts
index be33bb7606..94817b79ce 100644
--- a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/sqlite.ts
+++ b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/sqlite.ts
@@ -1,7 +1,12 @@
 import dayjs from 'dayjs';
 import { MapFnArgs } from '../mapFunctionName';
 import commonFns from './commonFns';
+import { convertUnits } from '../helpers/convertUnits';
 import { getWeekdayByText } from '../helpers/formulaFnHelper';
+import {
+  convertToTargetFormat,
+  getDateFormat,
+} from '../../../../../utils/dateTimeUtils';
 
 const sqlite3 = {
   ...commonFns,
@@ -77,7 +82,63 @@ const sqlite3 = {
       END${colAlias}`
     );
   },
-
+  DATETIME_DIFF: ({ fn, knex, pt, colAlias }: MapFnArgs) => {
+    let datetime_expr1 = fn(pt.arguments[0]);
+    let datetime_expr2 = fn(pt.arguments[1]);
+    // JULIANDAY takes YYYY-MM-DD
+    datetime_expr1 = convertToTargetFormat(
+      datetime_expr1,
+      getDateFormat(datetime_expr1),
+      'YYYY-MM-DD'
+    );
+    datetime_expr2 = convertToTargetFormat(
+      datetime_expr2,
+      getDateFormat(datetime_expr2),
+      'YYYY-MM-DD'
+    );
+    const rawUnit = pt.arguments[2]
+      ? fn(pt.arguments[2]).bindings[0]
+      : 'seconds';
+    let sql;
+    const unit = convertUnits(rawUnit, 'sqlite');
+    switch (unit) {
+      case 'seconds':
+        sql = `ROUND((JULIANDAY('${datetime_expr1}') - JULIANDAY('${datetime_expr2}')) * 86400)`;
+        break;
+      case 'minutes':
+        sql = `ROUND((JULIANDAY('${datetime_expr1}') - JULIANDAY('${datetime_expr2}')) * 1440)`;
+        break;
+      case 'hours':
+        sql = `ROUND((JULIANDAY('${datetime_expr1}') - JULIANDAY('${datetime_expr2}')) * 24)`;
+        break;
+      case 'milliseconds':
+        sql = `ROUND((JULIANDAY('${datetime_expr1}') - JULIANDAY('${datetime_expr2}')) * 86400000)`;
+        break;
+      case 'weeks':
+        sql = `ROUND((JULIANDAY('${datetime_expr1}') - JULIANDAY('${datetime_expr2}')) / 7)`;
+        break;
+      case 'months':
+        sql = `(ROUND((JULIANDAY('${datetime_expr1}') - JULIANDAY('${datetime_expr2}')) / 365))
+        * 12 + (ROUND((JULIANDAY('${datetime_expr1}') - JULIANDAY('${datetime_expr2}')) / 365 / 12))`;
+        break;
+      case 'quarters':
+        sql = `
+            ROUND((JULIANDAY('${datetime_expr1}')) / 365 / 4) -
+            ROUND((JULIANDAY('${datetime_expr2}')) / 365 / 4) +
+            (ROUND((JULIANDAY('${datetime_expr1}') - JULIANDAY('${datetime_expr2}')) / 365)) * 4
+        `;
+        break;
+      case 'years':
+        sql = `ROUND((JULIANDAY('${datetime_expr1}') - JULIANDAY('${datetime_expr2}')) / 365)`;
+        break;
+      case 'days':
+        sql = `JULIANDAY('${datetime_expr1}') - JULIANDAY('${datetime_expr2}')`;
+        break;
+      default:
+        sql = '';
+    }
+    return knex.raw(`${sql} ${colAlias}`);
+  },
   WEEKDAY: ({ fn, knex, pt, colAlias }: MapFnArgs) => {
     // strftime('%w', date) - day of week 0 - 6 with Sunday == 0
     // WEEKDAY() returns an index from 0 to 6 for Monday to Sunday

From ac0c78b78365f572f61a855d73ee9f888a961015 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 8 Dec 2022 18:36:50 +0800
Subject: [PATCH 24/29] feat(nocodb): add missing hour logic and correct
 milliseconds sql

---
 .../lib/db/sql-data-mapper/lib/sql/functionMappings/pg.ts  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/pg.ts b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/pg.ts
index 60c0e122c4..72ee49bcfa 100644
--- a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/pg.ts
+++ b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/pg.ts
@@ -67,6 +67,9 @@ const pg = {
         sql = `EXTRACT(EPOCH from (${datetime_expr1}::TIMESTAMP - ${datetime_expr2}::TIMESTAMP))::INTEGER / 60`;
         break;
       case 'milliseconds':
+        sql = `EXTRACT(EPOCH from (${datetime_expr1}::TIMESTAMP - ${datetime_expr2}::TIMESTAMP))::INTEGER * 1000`;
+        break;
+      case 'hour':
         sql = `EXTRACT(EPOCH from (${datetime_expr1}::TIMESTAMP - ${datetime_expr2}::TIMESTAMP))::INTEGER / 3600`;
         break;
       case 'week':
@@ -83,9 +86,9 @@ const pg = {
         break;
       case 'quarter':
         sql = `((EXTRACT(QUARTER FROM ${datetime_expr1}::TIMESTAMP) + 
-                    DATE_PART('year', AGE(${datetime_expr1},'1900/01/01')) * 4) - 1) - 
+                    DATE_PART('year', AGE(${datetime_expr1}, '1900/01/01')) * 4) - 1) - 
                 ((EXTRACT(QUARTER FROM ${datetime_expr2}::TIMESTAMP) + 
-                    DATE_PART('year', AGE(${datetime_expr2},'1900/01/01')) * 4) - 1)`;
+                    DATE_PART('year', AGE(${datetime_expr2}, '1900/01/01')) * 4) - 1)`;
         break;
       case 'year':
         sql = `DATE_PART('year', ${datetime_expr1}::TIMESTAMP) - DATE_PART('year', ${datetime_expr2}::TIMESTAMP)`;

From c758cd16c20da128026f40245ca6371836ec3c44 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 9 Dec 2022 14:08:13 +0800
Subject: [PATCH 25/29] feat(nocodb): feat(nocodb): add DATETIME_DIFF logic for
 mssql

---
 .../lib/sql/functionMappings/mssql.ts                | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/mssql.ts b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/mssql.ts
index 1358a87411..b666957176 100644
--- a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/mssql.ts
+++ b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/mssql.ts
@@ -1,6 +1,7 @@
 import dayjs from 'dayjs';
 import { MapFnArgs } from '../mapFunctionName';
 import commonFns from './commonFns';
+import { convertUnits } from '../helpers/convertUnits';
 import { getWeekdayByText } from '../helpers/formulaFnHelper';
 
 const mssql = {
@@ -110,6 +111,17 @@ const mssql = {
       END${colAlias}`
     );
   },
+  DATETIME_DIFF: ({ fn, knex, pt, colAlias }: MapFnArgs) => {
+    const datetime_expr1 = fn(pt.arguments[0]);
+    const datetime_expr2 = fn(pt.arguments[1]);
+    const rawUnit = pt.arguments[2]
+      ? fn(pt.arguments[2]).bindings[0]
+      : 'seconds';
+    const unit = convertUnits(rawUnit, 'mssql');
+    return knex.raw(
+      `DATEDIFF(${unit}, ${datetime_expr2}, ${datetime_expr1}) ${colAlias}`
+    );
+  },
   WEEKDAY: ({ fn, knex, pt, colAlias }: MapFnArgs) => {
     // DATEPART(WEEKDAY, DATE): sunday = 1, monday = 2, ..., saturday = 7
     // WEEKDAY() returns an index from 0 to 6 for Monday to Sunday

From 40c2aada155f1c4302ac26034443acea82760f29 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 9 Dec 2022 14:15:55 +0800
Subject: [PATCH 26/29] feat(playwright): formula DATETIME_DIFF tests

---
 tests/playwright/tests/columnFormula.spec.ts | 40 ++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/tests/playwright/tests/columnFormula.spec.ts b/tests/playwright/tests/columnFormula.spec.ts
index d9a1ed5763..b8c5fdcc8a 100644
--- a/tests/playwright/tests/columnFormula.spec.ts
+++ b/tests/playwright/tests/columnFormula.spec.ts
@@ -30,6 +30,46 @@ const formulaDataByDbType = (context: NcContext) => [
     formula: `WEEKDAY("2022-07-19", "sunday")`,
     result: ['2', '2', '2', '2', '2'],
   },
+  {
+    formula: `DATETIME_DIFF("2022/10/14", "2022/10/15")`,
+    result: ['-86400', '-86400', '-86400', '-86400', '-86400'],
+  },
+  {
+    formula: `DATETIME_DIFF("2022/10/14", "2022/10/15", "minutes")`,
+    result: ['-1440', '-1440', '-1440', '-1440', '-1440'],
+  },
+  {
+    formula: `DATETIME_DIFF("2022/10/14", "2022/10/15", "seconds")`,
+    result: ['-86400', '-86400', '-86400', '-86400', '-86400'],
+  },
+  {
+    formula: `DATETIME_DIFF("2022/10/14", "2022/10/15", "milliseconds")`,
+    result: ['-86400000', '-86400000', '-86400000', '-86400000', '-86400000'],
+  },
+  {
+    formula: `DATETIME_DIFF("2022/10/14", "2022/10/15", "hours")`,
+    result: ['-24', '-24', '-24', '-24', '-24'],
+  },
+  {
+    formula: `DATETIME_DIFF("2022/10/14", "2022/10/15", "weeks")`,
+    result: ['-52', '-52', '-52', '-52', '-52'],
+  },
+  {
+    formula: `DATETIME_DIFF("2022/10/14", "2022/10/15", "months")`,
+    result: ['-12', '-12', '-12', '-12', '-12'],
+  },
+  {
+    formula: `DATETIME_DIFF("2022/10/14", "2022/10/15", "Q")`,
+    result: ['-4', '-4', '-4', '-4', '-4'],
+  },
+  {
+    formula: `DATETIME_DIFF("2022/10/14", "2022/10/15", "y")`,
+    result: ['-1', '-1', '-1', '-1', '-1'],
+  },
+  {
+    formula: `DATETIME_DIFF("2022/10/14", "2022/10/15", "d")`,
+    result: ['-365', '-365', '-365', '-365', '-365'],
+  },
   {
     formula: `CONCAT(UPPER({City}), LOWER({City}), TRIM('    trimmed    '))`,
     result: [

From 94b607c3b2f5f85c54f2b9d97c5c8bb2fcd7e6b1 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Sat, 10 Dec 2022 00:24:39 +0800
Subject: [PATCH 27/29] fix(playwright): incorrect formula

---
 tests/playwright/tests/columnFormula.spec.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/playwright/tests/columnFormula.spec.ts b/tests/playwright/tests/columnFormula.spec.ts
index b8c5fdcc8a..bc08da00ba 100644
--- a/tests/playwright/tests/columnFormula.spec.ts
+++ b/tests/playwright/tests/columnFormula.spec.ts
@@ -51,23 +51,23 @@ const formulaDataByDbType = (context: NcContext) => [
     result: ['-24', '-24', '-24', '-24', '-24'],
   },
   {
-    formula: `DATETIME_DIFF("2022/10/14", "2022/10/15", "weeks")`,
+    formula: `DATETIME_DIFF("2022/10/14", "2023/10/14", "w")`,
     result: ['-52', '-52', '-52', '-52', '-52'],
   },
   {
-    formula: `DATETIME_DIFF("2022/10/14", "2022/10/15", "months")`,
+    formula: `DATETIME_DIFF("2022/10/14", "2023/10/14", "M")`,
     result: ['-12', '-12', '-12', '-12', '-12'],
   },
   {
-    formula: `DATETIME_DIFF("2022/10/14", "2022/10/15", "Q")`,
+    formula: `DATETIME_DIFF("2022/10/14", "2023/10/14", "Q")`,
     result: ['-4', '-4', '-4', '-4', '-4'],
   },
   {
-    formula: `DATETIME_DIFF("2022/10/14", "2022/10/15", "y")`,
+    formula: `DATETIME_DIFF("2022/10/14", "2023/10/14", "y")`,
     result: ['-1', '-1', '-1', '-1', '-1'],
   },
   {
-    formula: `DATETIME_DIFF("2022/10/14", "2022/10/15", "d")`,
+    formula: `DATETIME_DIFF("2022/10/14", "2023/10/14", "d")`,
     result: ['-365', '-365', '-365', '-365', '-365'],
   },
   {

From 7c0e24ad85dbc823ee98064286f0c526f6700bf0 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Sat, 10 Dec 2022 15:19:49 +0800
Subject: [PATCH 28/29] fix(nocodb): add missing bindings

---
 .../lib/db/sql-data-mapper/lib/sql/functionMappings/sqlite.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/sqlite.ts b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/sqlite.ts
index 94817b79ce..ad384aeedf 100644
--- a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/sqlite.ts
+++ b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/sqlite.ts
@@ -83,8 +83,8 @@ const sqlite3 = {
     );
   },
   DATETIME_DIFF: ({ fn, knex, pt, colAlias }: MapFnArgs) => {
-    let datetime_expr1 = fn(pt.arguments[0]);
-    let datetime_expr2 = fn(pt.arguments[1]);
+    let datetime_expr1 = fn(pt.arguments[0]).bindings[0];
+    let datetime_expr2 = fn(pt.arguments[1]).bindings[0];
     // JULIANDAY takes YYYY-MM-DD
     datetime_expr1 = convertToTargetFormat(
       datetime_expr1,

From 9105cd8cd910ed703f98642f20dbe6b1e4b26c0f Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 21 Dec 2022 21:51:08 +0800
Subject: [PATCH 29/29] refactor(nocodb): move the logic to switch

---
 .../lib/sql/helpers/convertUnits.ts           | 202 ++++++++----------
 1 file changed, 92 insertions(+), 110 deletions(-)

diff --git a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/helpers/convertUnits.ts b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/helpers/convertUnits.ts
index 22daefe71c..961a9d26d3 100644
--- a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/helpers/convertUnits.ts
+++ b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/helpers/convertUnits.ts
@@ -5,149 +5,131 @@ export function convertUnits(
   switch (unit) {
     case 'milliseconds':
     case 'ms': {
-      if (type === 'mssql') {
-        return 'millisecond';
+      switch (type) {
+        case 'mssql':
+          return 'millisecond';
+        case 'mysql':
+          // MySQL doesn't support millisecond
+          // hence change from MICROSECOND to millisecond manually
+          return 'MICROSECOND';
+        case 'pg':
+        case 'sqlite':
+          return 'milliseconds';
+        default:
+          return unit;
       }
-
-      if (type === 'mysql') {
-        // MySQL doesn't support millisecond
-        // hence change from MICROSECOND to millisecond manually
-        return 'MICROSECOND';
-      }
-
-      if (type === 'pg' || type === 'sqlite') {
-        return 'milliseconds';
-      }
-
-      return unit;
     }
     case 'seconds':
     case 's': {
-      if (type === 'mssql' || type === 'pg') {
-        return 'second';
-      }
-
-      if (type === 'mysql') {
-        return 'SECOND';
+      switch (type) {
+        case 'mssql':
+        case 'pg':
+          return 'second';
+        case 'mysql':
+          return 'SECOND';
+        case 'sqlite':
+          return 'seconds';
+        default:
+          return unit;
       }
-
-      if (type === 'sqlite') {
-        return 'seconds';
-      }
-
-      return unit;
     }
     case 'minutes':
     case 'm': {
-      if (type === 'mssql' || type === 'pg') {
-        return 'minute';
-      }
-
-      if (type === 'mysql') {
-        return 'MINUTE';
+      switch (type) {
+        case 'mssql':
+        case 'pg':
+          return 'minute';
+        case 'mysql':
+          return 'MINUTE';
+        case 'sqlite':
+          return 'minutes';
+        default:
+          return unit;
       }
-
-      if (type === 'sqlite') {
-        return 'minutes';
-      }
-
-      return unit;
     }
     case 'hours':
     case 'h': {
-      if (type === 'mssql' || type === 'pg') {
-        return 'hour';
-      }
-
-      if (type === 'mysql') {
-        return 'HOUR';
-      }
-
-      if (type === 'sqlite') {
-        return 'hours';
+      switch (type) {
+        case 'mssql':
+        case 'pg':
+          return 'hour';
+        case 'mysql':
+          return 'HOUR';
+        case 'sqlite':
+          return 'hours';
+        default:
+          return unit;
       }
-
-      return unit;
     }
     case 'days':
     case 'd': {
-      if (type === 'mssql' || type === 'pg') {
-        return 'day';
-      }
-
-      if (type === 'mysql') {
-        return 'DAY';
-      }
-
-      if (type === 'sqlite') {
-        return 'days';
+      switch (type) {
+        case 'mssql':
+        case 'pg':
+          return 'day';
+        case 'mysql':
+          return 'DAY';
+        case 'sqlite':
+          return 'days';
+        default:
+          return unit;
       }
-
-      return unit;
     }
     case 'weeks':
     case 'w': {
-      if (type === 'mssql' || type === 'pg') {
-        return 'week';
-      }
-
-      if (type === 'mysql') {
-        return 'WEEK';
+      switch (type) {
+        case 'mssql':
+        case 'pg':
+          return 'week';
+        case 'mysql':
+          return 'WEEK';
+        case 'sqlite':
+          return 'weeks';
+        default:
+          return unit;
       }
-
-      if (type === 'sqlite') {
-        return 'weeks';
-      }
-
-      return unit;
     }
     case 'months':
     case 'M': {
-      if (type === 'mssql' || type === 'pg') {
-        return 'month';
+      switch (type) {
+        case 'mssql':
+        case 'pg':
+          return 'month';
+        case 'mysql':
+          return 'MONTH';
+        case 'sqlite':
+          return 'months';
+        default:
+          return unit;
       }
-
-      if (type === 'mysql') {
-        return 'MONTH';
-      }
-
-      if (type === 'sqlite') {
-        return 'months';
-      }
-
-      return unit;
     }
     case 'quarters':
     case 'Q': {
-      if (type === 'mssql' || type === 'pg') {
-        return 'quarter';
+      switch (type) {
+        case 'mssql':
+        case 'pg':
+          return 'quarter';
+        case 'mysql':
+          return 'QUARTER';
+        case 'sqlite':
+          return 'quarters';
+        default:
+          return unit;
       }
-
-      if (type === 'mysql') {
-        return 'QUARTER';
-      }
-
-      if (type === 'sqlite') {
-        return 'quarters';
-      }
-
-      return unit;
     }
     case 'years':
     case 'y': {
-      if (type === 'mssql' || type === 'pg') {
-        return 'year';
+      switch (type) {
+        case 'mssql':
+        case 'pg':
+          return 'year';
+        case 'mysql':
+          return 'YEAR';
+        case 'sqlite':
+          return 'years';
+        default:
+          return unit;
       }
-
-      if (type === 'mysql') {
-        return 'YEAR';
-      }
-
-      if (type === 'sqlite') {
-        return 'years';
-      }
-
-      return unit;
     }
     default:
       return unit;