github
/
nocodb
mirror of https://github.com/nocodb/nocodb
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Merge pull request #1415 from mertmit/date-arithmetic 

feat: DATEADD formula for date arithmetics
pull/1437/head
աɨռɢӄաօռɢ 2 years ago committed by GitHub
parent
502d39fe7c 99d2c77c5e
commit
cf0a239523
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 113 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      packages/nc-gui/components/project/spreadsheet/components/editableCell/dateTimePickerCell.vue
  2. 1
      packages/nc-gui/helpers/formulaList.js
  3. 9
      packages/nocodb/src/lib/dataMapper/lib/sql/formulaQueryBuilderFromString.ts
  4. 24
      packages/nocodb/src/lib/dataMapper/lib/sql/functionMappings/mssql.ts
  5. 26
      packages/nocodb/src/lib/dataMapper/lib/sql/functionMappings/mysql.ts
  6. 24
      packages/nocodb/src/lib/dataMapper/lib/sql/functionMappings/pg.ts
  7. 24
      packages/nocodb/src/lib/dataMapper/lib/sql/functionMappings/sqlite.ts

6
packages/nc-gui/components/project/spreadsheet/components/editableCell/dateTimePickerCell.vue
Unescape View File

@ -42,7 +42,11 @@ export default {
.format('YYYY-MM-DD HH:mm')
},
set(val) {
this.$emit('input', val && dayjs(val).format('YYYY-MM-DD HH:mm:ssZ'))
if(this.$parent.sqlUi.name == 'MysqlUi') {
this.$emit('input', val && dayjs(val).format('YYYY-MM-DD HH:mm:ss'))
} else {
this.$emit('input', val && dayjs(val).format('YYYY-MM-DD HH:mm:ssZ'))
}
}
},
parentListeners() {

1
packages/nc-gui/helpers/formulaList.js
Unescape View File

@ -55,6 +55,7 @@ const validations = {
IF: { validation: { args: { min: 2, max: 3 } } },
SWITCH: { validation: { args: { min: 3 } } },
URL: { validation: { args: { rqd: 1 } } },
DATEADD: { validation: { args: { rqd: 3 } } },
};
export default Object.keys(validations);

9
packages/nocodb/src/lib/dataMapper/lib/sql/formulaQueryBuilderFromString.ts
Unescape View File

@ -90,6 +90,15 @@ export default function formulaQueryBuilder(
prevBinaryOp
);
break;
case 'DATEADD':
if(pt.arguments[1].value) {
pt.callee.name = "DATE_ADD";
return fn(pt, a, prevBinaryOp);
} else if(pt.arguments[1].operator == '-') {
pt.callee.name = "DATE_SUB";
return fn(pt, a, prevBinaryOp);
}
break;
default:
{
const res = mapFunctionName({

24
packages/nocodb/src/lib/dataMapper/lib/sql/functionMappings/mssql.ts
Unescape View File

@ -88,6 +88,30 @@ const mssql = {
return args.knex
.raw(`CAST(${args.fn(args.pt.arguments[0])} as FLOAT)${args.colAlias}`)
.wrap('(', ')');
},
DATE_ADD: (args: MapFnArgs) => {
return args.knex.raw(
`CASE
WHEN ${args.fn(args.pt.arguments[0])} LIKE '%:%' THEN
FORMAT(DATEADD(${String(args.fn(args.pt.arguments[2])).replace(/["']/g, "")},
+${args.fn(args.pt.arguments[1])}, ${args.fn(args.pt.arguments[0])}), 'yyyy-MM-dd HH:mm')
ELSE
FORMAT(DATEADD(${String(args.fn(args.pt.arguments[2])).replace(/["']/g, "")},
+${args.fn(args.pt.arguments[1])}, ${args.fn(args.pt.arguments[0])}), 'yyyy-MM-dd')
END${args.colAlias}`
);
},
DATE_SUB: (args: MapFnArgs) => {
return args.knex.raw(
`CASE
WHEN ${args.fn(args.pt.arguments[0])} LIKE '%:%' THEN
FORMAT(DATEADD(${String(args.fn(args.pt.arguments[2])).replace(/["']/g, "")},
-${args.fn(args.pt.arguments[1])}.argument.value, ${args.fn(args.pt.arguments[0])}), 'yyyy-MM-dd HH:mm')
ELSE
FORMAT(DATEADD(${String(args.fn(args.pt.arguments[2])).replace(/["']/g, "")},
-${args.fn(args.pt.arguments[1])}.argument.value, ${args.fn(args.pt.arguments[0])}), 'yyyy-MM-dd')
END${args.colAlias}`
);
}
};

26
packages/nocodb/src/lib/dataMapper/lib/sql/functionMappings/mysql.ts
Unescape View File

@ -36,6 +36,32 @@ const mysql2 = {
return args.knex
.raw(`CAST(${args.fn(args.pt.arguments[0])} as DOUBLE)${args.colAlias}`)
.wrap('(', ')');
},
DATE_ADD: (args: MapFnArgs) => {
return args.knex.raw(
`CASE
WHEN ${args.fn(args.pt.arguments[0])} LIKE '%:%' THEN
DATE_FORMAT(DATE_ADD(${args.fn(args.pt.arguments[0])}, INTERVAL
${args.fn(args.pt.arguments[1])} ${String(args.fn(args.pt.arguments[2])).replace(/["']/g, "")}), '%Y-%m-%d %H:%i')
ELSE
DATE(DATE_ADD(${args.fn(args.pt.arguments[0])}, INTERVAL
${args.fn(args.pt.arguments[1])} ${String(args.fn(args.pt.arguments[2])).replace(/["']/g, "")}))
END${args.colAlias}`
);
},
DATE_SUB: (args: MapFnArgs) => {
return args.knex.raw(
`CASE
WHEN ${args.fn(args.pt.arguments[0])} LIKE '%:%' THEN
DATE_FORMAT(DATE_ADD(${args.fn(args.pt.arguments[0])}, INTERVAL
${args.fn(args.pt.arguments[1])}.argument.value
${String(args.fn(args.pt.arguments[2])).replace(/["']/g, "")}), '%Y-%m-%d %H:%i')
ELSE
DATE(DATE_ADD(${args.fn(args.pt.arguments[0])}, INTERVAL
${args.fn(args.pt.arguments[1])}.argument.value
${String(args.fn(args.pt.arguments[2])).replace(/["']/g, "")}))
END${args.colAlias}`
);
}
};

24
packages/nocodb/src/lib/dataMapper/lib/sql/functionMappings/pg.ts
Unescape View File

@ -36,6 +36,30 @@ const pg = {
}`
)
.wrap('(', ')');
},
DATE_ADD: (args: MapFnArgs) => {
return args.knex.raw(
`CASE
WHEN CAST(${args.fn(args.pt.arguments[0])} AS text) LIKE '%:%' THEN
to_char(${args.fn(args.pt.arguments[0])} + INTERVAL '${args.fn(args.pt.arguments[1])}
${String(args.fn(args.pt.arguments[2])).replace(/["']/g, "")}', 'YYYY-MM-DD HH24:MI')
ELSE
to_char(${args.fn(args.pt.arguments[0])} + INTERVAL '${args.fn(args.pt.arguments[1])}
${String(args.fn(args.pt.arguments[2])).replace(/["']/g, "")}', 'YYYY-MM-DD')
END${args.colAlias}`
);
},
DATE_SUB: (args: MapFnArgs) => {
return args.knex.raw(
`CASE
WHEN CAST(${args.fn(args.pt.arguments[0])} AS text) LIKE '%:%' THEN
to_char(${args.fn(args.pt.arguments[0])} - INTERVAL '${args.fn(args.pt.arguments[1]).argument.value}
${String(args.fn(args.pt.arguments[2])).replace(/["']/g, "")}', 'YYYY-MM-DD HH24:MI')
ELSE
to_char(${args.fn(args.pt.arguments[0])} - INTERVAL '${args.fn(args.pt.arguments[1]).argument.value}
${String(args.fn(args.pt.arguments[2])).replace(/["']/g, "")}', 'YYYY-MM-DD')
END${args.colAlias}`
);
}
};

24
packages/nocodb/src/lib/dataMapper/lib/sql/functionMappings/sqlite.ts
Unescape View File

@ -55,6 +55,30 @@ const sqlite3 = {
return args.knex
.raw(`CAST(${args.fn(args.pt.arguments[0])} as FLOAT)${args.colAlias}`)
.wrap('(', ')');
},
DATE_ADD: (args: MapFnArgs) => {
return args.knex.raw(
`CASE
WHEN ${args.fn(args.pt.arguments[0])} LIKE '%:%' THEN
STRFTIME('%Y-%m-%d %H:%M', DATETIME(DATETIME(${args.fn(args.pt.arguments[0])}, 'localtime'),
'+${args.fn(args.pt.arguments[1])} ${String(args.fn(args.pt.arguments[2])).replace(/["']/g, "")}'))
ELSE
DATE(DATETIME(${args.fn(args.pt.arguments[0])}, 'localtime'),
'+${args.fn(args.pt.arguments[1])} ${String(args.fn(args.pt.arguments[2])).replace(/["']/g, "")}')
END${args.colAlias}`
);
},
DATE_SUB: (args: MapFnArgs) => {
return args.knex.raw(
`CASE
WHEN ${args.fn(args.pt.arguments[0])} LIKE '%:%' THEN
STRFTIME('%Y-%m-%d %H:%M', DATETIME(DATETIME(${args.fn(args.pt.arguments[0])}, 'localtime'),
'-${args.fn(args.pt.arguments[1]).argument.value} ${String(args.fn(args.pt.arguments[2])).replace(/["']/g, "")}'))
ELSE
DATE(DATETIME(${args.fn(args.pt.arguments[0])}, 'localtime'),
'-${args.fn(args.pt.arguments[1]).argument.value} ${String(args.fn(args.pt.arguments[2])).replace(/["']/g, "")}')
END${args.colAlias}`
);
}
};

Write Preview
Loading…
Cancel
Save