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

fix: datetime group by - ignore seconds part and group

pull/9013/head
Pranav C 4 months ago
parent
25e648cb9c
commit
14c69ffcc6
2 changed files with 129 additions and 15 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. 77
      packages/nocodb/src/db/BaseModelSqlv2.ts
  2. 63
      packages/nocodb/src/db/conditionV2.ts

77
packages/nocodb/src/db/BaseModelSqlv2.ts
Unescape View File

@ -1163,9 +1163,46 @@ class BaseModelSqlv2 {
column,
columns,
);
// ignore seconds part in datetime and group
if (this.dbDriver.clientType() === 'pg') {
selectors.push(
this.dbDriver.raw('??::date as ??', [columnName, column.id]),
this.dbDriver.raw(
"date_trunc('minute', ??) + interval '0 seconds' as ??",
[columnName, column.id],
),
);
} else if (
this.dbDriver.clientType() === 'mysql' ||
this.dbDriver.clientType() === 'mysql2'
) {
selectors.push(
// this.dbDriver.raw('??::date as ??', [columnName, column.id]),
this.dbDriver.raw(
"DATE_SUB(CONVERT_TZ(??, @@GLOBAL.time_zone, '+00:00'), INTERVAL SECOND(??) SECOND) as ??",
[columnName, columnName, column.id],
),
);
} else if (this.dbDriver.clientType() === 'sqlite3') {
selectors.push(
this.dbDriver.raw(
`strftime ('%Y-%m-%d %H:%M:00',:column:) ||
(
CASE WHEN substr(:column:, 20, 1) = '+' THEN
printf ('+%s:',
substr(:column:, 21, 2)) || printf ('%s',
substr(:column:, 24, 2))
WHEN substr(:column:, 20, 1) = '-' THEN
printf ('-%s:',
substr(:column:, 21, 2)) || printf ('%s',
substr(:column:, 24, 2))
ELSE
'+00:00'
END) AS :id:`,
{
column: columnName,
id: column.id,
},
),
);
} else {
selectors.push(
@ -1426,9 +1463,45 @@ class BaseModelSqlv2 {
column,
columns,
);
// ignore seconds part in datetime and group
if (this.dbDriver.clientType() === 'pg') {
selectors.push(
this.dbDriver.raw('??::date as ??', [columnName, column.id]),
this.dbDriver.raw(
"date_trunc('minute', ??) + interval '0 seconds' as ??",
[columnName, column.id],
),
);
} else if (
this.dbDriver.clientType() === 'mysql' ||
this.dbDriver.clientType() === 'mysql2'
) {
selectors.push(
this.dbDriver.raw(
"CONVERT_TZ(DATE_SUB(??, INTERVAL SECOND(??) SECOND), @@GLOBAL.time_zone, '+00:00') as ??",
[columnName, columnName, column.id],
),
);
} else if (this.dbDriver.clientType() === 'sqlite3') {
selectors.push(
this.dbDriver.raw(
`strftime ('%Y-%m-%d %H:%M:00',:column:) ||
(
CASE WHEN substr(:column:, 20, 1) = '+' THEN
printf ('+%s:',
substr(:column:, 21, 2)) || printf ('%s',
substr(:column:, 24, 2))
WHEN substr(:column:, 20, 1) = '-' THEN
printf ('-%s:',
substr(:column:, 21, 2)) || printf ('%s',
substr(:column:, 24, 2))
ELSE
'+00:00'
END) as :id:`,
{
column: columnName,
id: column.id,
},
),
);
} else {
selectors.push(

63
packages/nocodb/src/db/conditionV2.ts
Unescape View File

@ -539,7 +539,7 @@ const parseConditionV2 = async (
(val + '').startsWith('%') || (val + '').endsWith('%')
? val
: `%${val}%`;
if (qb?.client?.config?.client === 'pg') {
if (knex.clientType() === 'pg') {
qb = qb.where(knex.raw(`(${finalStatement}) ilike ?`, [val]));
} else {
qb = qb.where(knex.raw(`(${finalStatement}) like ?`, [val]));
@ -553,7 +553,7 @@ const parseConditionV2 = async (
val = val.startsWith('%') || val.endsWith('%') ? val : `%${val}%`;
qb.where((nestedQb) => {
if (qb?.client?.config?.client === 'pg') {
if (knex.clientType() === 'pg') {
nestedQb.whereNot(
knex.raw(`(${finalStatement}) ilike ?`, [val]),
);
@ -599,7 +599,7 @@ const parseConditionV2 = async (
// todo: refactor this to use a better approach to make it more readable and clean
let genVal = customWhereClause ? field : val;
const dateFormat =
qb?.client?.config?.client === 'mysql2'
knex.clientType() === 'mysql2'
? 'YYYY-MM-DD HH:mm:ss'
: 'YYYY-MM-DD HH:mm:ssZ';
@ -713,8 +713,8 @@ const parseConditionV2 = async (
switch (filter.comparison_op) {
case 'eq':
if (
qb?.client?.config?.client === 'mysql2' ||
qb?.client?.config?.client === 'mysql'
knex.clientType() === 'mysql2' ||
knex.clientType() === 'mysql'
) {
if (
[
@ -737,6 +737,16 @@ const parseConditionV2 = async (
column.ct === 'date' ||
column.ct === 'datetime'
) {
// ignore seconds part in datetime and filter when using it for group by
if (filter.groupby && column.ct !== 'date') {
const valWithoutTz = val.replace(/[+-]\d+:\d+$/, '');
qb = qb.where(
knex.raw(
"CONVERT_TZ(DATE_SUB(??, INTERVAL SECOND(??) SECOND), @@GLOBAL.time_zone, '+00:00') = DATE_SUB(?, INTERVAL SECOND(?) SECOND)",
[field, field, valWithoutTz, valWithoutTz],
),
);
} else
qb = qb.where(knex.raw('DATE(??) = DATE(?)', [field, val]));
} else {
// mysql is case-insensitive for strings, turn to case-sensitive
@ -754,8 +764,39 @@ const parseConditionV2 = async (
].includes(column.uidt)
) {
if (qb.client.config.client === 'pg') {
qb = qb.where(knex.raw('??::date = ?', [field, val]));
// ignore seconds part in datetime and filter when using it for group by
if (filter.groupby)
qb = qb.where(
knex.raw(
"date_trunc('minute', ??) + interval '0 seconds' = ?",
[field, val],
),
);
else qb = qb.where(knex.raw('??::date = ?', [field, val]));
} else {
// ignore seconds part in datetime and filter when using it for group by
if (filter.groupby) {
if (knex.clientType() === 'sqlite3')
qb = qb.where(
knex.raw(
`Datetime(strftime ('%Y-%m-%d %H:%M:00',:column:) ||
(
CASE WHEN substr(:column:, 20, 1) = '+' THEN
printf ('+%s:',
substr(:column:, 21, 2)) || printf ('%s',
substr(:column:, 24, 2))
WHEN substr(:column:, 20, 1) = '-' THEN
printf ('-%s:',
substr(:column:, 21, 2)) || printf ('%s',
substr(:column:, 24, 2))
ELSE
'+00:00'
END)) = Datetime(:val)`,
{ column: field, val },
),
);
else qb = qb.where(knex.raw('?? = ?', [field, val]));
} else
qb = qb.where(knex.raw('DATE(??) = DATE(?)', [field, val]));
}
} else {
@ -769,7 +810,7 @@ const parseConditionV2 = async (
break;
case 'neq':
case 'not':
if (qb?.client?.config?.client === 'mysql2') {
if (knex.clientType() === 'mysql2') {
if (
[
UITypes.Duration,
@ -834,7 +875,7 @@ const parseConditionV2 = async (
? val
: `%${val}%`;
}
if (qb?.client?.config?.client === 'pg') {
if (knex.clientType() === 'pg') {
qb = qb.where(knex.raw('??::text ilike ?', [field, val]));
} else {
qb = qb.where(field, 'like', val);
@ -861,7 +902,7 @@ const parseConditionV2 = async (
val.startsWith('%') || val.endsWith('%') ? val : `%${val}%`;
}
qb.where((nestedQb) => {
if (qb?.client?.config?.client === 'pg') {
if (knex.clientType() === 'pg') {
nestedQb.where(
knex.raw('??::text not ilike ?', [field, val]),
);
@ -890,9 +931,9 @@ const parseConditionV2 = async (
for (let i = 0; i < items?.length; i++) {
let sql;
const bindings = [field, `%,${items[i]},%`];
if (qb?.client?.config?.client === 'pg') {
if (knex.clientType() === 'pg') {
sql = "(',' || ??::text || ',') ilike ?";
} else if (qb?.client?.config?.client === 'sqlite3') {
} else if (knex.clientType() === 'sqlite3') {
sql = "(',' || ?? || ',') like ?";
} else {
sql = "CONCAT(',', ??, ',') like ?";

Write Preview
Loading…
Cancel
Save