github/directus
1
0
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-01-31 03:37:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Finish date retrieval abstraction for all vendors

Browse Source
This commit is contained in:
rijkvanzanten
2021-06-16 18:22:24 -04:00
parent 7ea10b2e21
commit 16d26bce0c
9 changed files with 215 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
api/src/database/functions/base.ts
View File

@@ -1,12 +0,0 @@
import { Knex } from 'knex';
export interface HelperFn {
year(table: string, column: string, alias?: string): Knex.Raw;
month(table: string, column: string, alias?: string): Knex.Raw;
week(table: string, column: string, alias?: string): Knex.Raw;
day(table: string, column: string, alias?: string): Knex.Raw;
weekday(table: string, column: string, alias?: string): Knex.Raw;
hour(table: string, column: string, alias?: string): Knex.Raw;
minute(table: string, column: string, alias?: string): Knex.Raw;
second(table: string, column: string, alias?: string): Knex.Raw;
}

42
api/src/database/functions/dialects/mssql.ts Normal file
View File

@@ -0,0 +1,42 @@
import { Knex } from 'knex';
import { HelperFn } from '../types';
export class HelperMSSQL implements HelperFn {
private knex: Knex;
constructor(knex: Knex) {
this.knex = knex;
}
year(table: string, column: string): Knex.Raw {
return this.knex.raw('DATEPART(year, ??.??)', [table, column]);
}
month(table: string, column: string): Knex.Raw {
return this.knex.raw('DATEPART(month, ??.??)', [table, column]);
}
week(table: string, column: string): Knex.Raw {
return this.knex.raw('DATEPART(week, ??.??)', [table, column]);
}
day(table: string, column: string): Knex.Raw {
return this.knex.raw('DATEPART(day, ??.??)', [table, column]);
}
weekday(table: string, column: string): Knex.Raw {
return this.knex.raw('DATEPART(weekday, ??.??)', [table, column]);
}
hour(table: string, column: string): Knex.Raw {
return this.knex.raw('DATEPART(hour, ??.??)', [table, column]);
}
minute(table: string, column: string): Knex.Raw {
return this.knex.raw('DATEPART(minute, ??.??)', [table, column]);
}
second(table: string, column: string): Knex.Raw {
return this.knex.raw('DATEPART(second, ??.??)', [table, column]);
}
}

42
api/src/database/functions/dialects/mysql.ts Normal file
View File

@@ -0,0 +1,42 @@
import { Knex } from 'knex';
import { HelperFn } from '../types';
export class HelperMySQL implements HelperFn {
private knex: Knex;
constructor(knex: Knex) {
this.knex = knex;
}
year(table: string, column: string): Knex.Raw {
return this.knex.raw('YEAR(??.??)', [table, column]);
}
month(table: string, column: string): Knex.Raw {
return this.knex.raw('MONTH(??.??)', [table, column]);
}
week(table: string, column: string): Knex.Raw {
return this.knex.raw('WEEK(??.??)', [table, column]);
}
day(table: string, column: string): Knex.Raw {
return this.knex.raw('DAYOFMONTH(??.??)', [table, column]);
}
weekday(table: string, column: string): Knex.Raw {
return this.knex.raw('DAYOFWEEK??.??)', [table, column]);
}
hour(table: string, column: string): Knex.Raw {
return this.knex.raw('HOUR(??.??)', [table, column]);
}
minute(table: string, column: string): Knex.Raw {
return this.knex.raw('MINUTE(??.??)', [table, column]);
}
second(table: string, column: string): Knex.Raw {
return this.knex.raw('SECOND(??.??)', [table, column]);
}
}

42
api/src/database/functions/dialects/oracle.ts Normal file
View File

@@ -0,0 +1,42 @@
import { Knex } from 'knex';
import { HelperFn } from '../types';
export class HelperOracle implements HelperFn {
private knex: Knex;
constructor(knex: Knex) {
this.knex = knex;
}
year(table: string, column: string): Knex.Raw {
return this.knex.raw("TO_CHAR(??.??, 'IYYY')", [table, column]);
}
month(table: string, column: string): Knex.Raw {
return this.knex.raw("TO_CHAR(??.??, 'MM')", [table, column]);
}
week(table: string, column: string): Knex.Raw {
return this.knex.raw("TO_CHAR(??.??, 'IW')", [table, column]);
}
day(table: string, column: string): Knex.Raw {
return this.knex.raw("TO_CHAR(??.??, 'DD')", [table, column]);
}
weekday(table: string, column: string): Knex.Raw {
return this.knex.raw("TO_CHAR(??.??, 'D')", [table, column]);
}
hour(table: string, column: string): Knex.Raw {
return this.knex.raw("TO_CHAR(??.??, 'HH24')", [table, column]);
}
minute(table: string, column: string): Knex.Raw {
return this.knex.raw("TO_CHAR(??.??, 'MI')", [table, column]);
}
second(table: string, column: string): Knex.Raw {
return this.knex.raw("TO_CHAR(??.??, 'SS')", [table, column]);
}
}

50
api/src/database/functions/dialects/postgres.ts
View File

@@ -1,5 +1,5 @@
import { Knex } from 'knex';
import { HelperFn } from '../base';
import { HelperFn } from '../types';
export class HelperPostgres implements HelperFn {
private knex: Knex;
@@ -8,67 +8,35 @@ export class HelperPostgres implements HelperFn {
this.knex = knex;
}
year(table: string, column: string, alias?: string): Knex.Raw {
if (alias) {
return this.knex.raw('EXTRACT(YEAR FROM ??.??) as ??', [table, column, alias]);
}
year(table: string, column: string): Knex.Raw {
return this.knex.raw('EXTRACT(YEAR FROM ??.??)', [table, column]);
}
month(table: string, column: string, alias?: string): Knex.Raw {
if (alias) {
return this.knex.raw('EXTRACT(MONTH FROM ??.??) as ??', [table, column, alias]);
}
month(table: string, column: string): Knex.Raw {
return this.knex.raw('EXTRACT(MONTH FROM ??.??)', [table, column]);
}
week(table: string, column: string, alias?: string): Knex.Raw {
if (alias) {
return this.knex.raw('EXTRACT(WEEK FROM ??.??) as ??', [table, column, alias]);
}
week(table: string, column: string): Knex.Raw {
return this.knex.raw('EXTRACT(WEEK FROM ??.??)', [table, column]);
}
day(table: string, column: string, alias?: string): Knex.Raw {
if (alias) {
return this.knex.raw('EXTRACT(DAY FROM ??.??) as ??', [table, column, alias]);
}
day(table: string, column: string): Knex.Raw {
return this.knex.raw('EXTRACT(DAY FROM ??.??)', [table, column]);
}
weekday(table: string, column: string, alias?: string): Knex.Raw {
if (alias) {
return this.knex.raw('EXTRACT(DOW FROM ??.??) as ??', [table, column, alias]);
}
weekday(table: string, column: string): Knex.Raw {
return this.knex.raw('EXTRACT(DOW FROM ??.??)', [table, column]);
}
hour(table: string, column: string, alias?: string): Knex.Raw {
if (alias) {
return this.knex.raw('EXTRACT(HOUR FROM ??.??) as ??', [table, column, alias]);
}
hour(table: string, column: string): Knex.Raw {
return this.knex.raw('EXTRACT(HOUR FROM ??.??)', [table, column]);
}
minute(table: string, column: string, alias?: string): Knex.Raw {
if (alias) {
return this.knex.raw('EXTRACT(MINUTE FROM ??.??) as ??', [table, column, alias]);
}
minute(table: string, column: string): Knex.Raw {
return this.knex.raw('EXTRACT(MINUTE FROM ??.??)', [table, column]);
}
second(table: string, column: string, alias?: string): Knex.Raw {
if (alias) {
return this.knex.raw('EXTRACT(SECOND FROM ??.??) as ??', [table, column, alias]);
}
second(table: string, column: string): Knex.Raw {
return this.knex.raw('EXTRACT(SECOND FROM ??.??)', [table, column]);
}
}

42
api/src/database/functions/dialects/sqlite.ts Normal file
View File

@@ -0,0 +1,42 @@
import { Knex } from 'knex';
import { HelperFn } from '../types';
export class HelperSQLite implements HelperFn {
private knex: Knex;
constructor(knex: Knex) {
this.knex = knex;
}
year(table: string, column: string): Knex.Raw {
return this.knex.raw("strftime('%Y', ??.??)", [table, column]);
}
month(table: string, column: string): Knex.Raw {
return this.knex.raw("strftime('%m', ??.??)", [table, column]);
}
week(table: string, column: string): Knex.Raw {
return this.knex.raw("strftime('%W', ??.??)", [table, column]);
}
day(table: string, column: string): Knex.Raw {
return this.knex.raw("strftime('%d', ??.??)", [table, column]);
}
weekday(table: string, column: string): Knex.Raw {
return this.knex.raw("strftime('%w', ??.??)", [table, column]);
}
hour(table: string, column: string): Knex.Raw {
return this.knex.raw("strftime('%H', ??.??)", [table, column]);
}
minute(table: string, column: string): Knex.Raw {
return this.knex.raw("strftime('%M', ??.??)", [table, column]);
}
second(table: string, column: string): Knex.Raw {
return this.knex.raw("strftime('%S', ??.??)", [table, column]);
}
}

27
api/src/database/functions/index.ts
View File

@@ -1,25 +1,24 @@
import { Knex } from 'knex';
import { HelperPostgres } from './dialects/postgres';
import { HelperMySQL } from './dialects/mysql';
import { HelperMSSQL } from './dialects/mssql';
import { HelperSQLite } from './dialects/sqlite';
import { HelperOracle } from './dialects/oracle';
export function FunctionsHelper(knex: Knex) {
switch (knex.client.constructor.name) {
// case 'Client_MySQL':
// constructor = require('./dialects/mysql').default;
// break;
case 'Client_MySQL':
return new HelperMySQL(knex);
case 'Client_PG':
return new HelperPostgres(knex);
// case 'Client_SQLite3':
// constructor = require('./dialects/sqlite').default;
// break;
// case 'Client_Oracledb':
// case 'Client_Oracle':
// constructor = require('./dialects/oracledb').default;
// break;
// case 'Client_MSSQL':
// constructor = require('./dialects/mssql').default;
// break;
case 'Client_SQLite3':
return new HelperSQLite(knex);
case 'Client_Oracledb':
case 'Client_Oracle':
return new HelperOracle(knex);
case 'Client_MSSQL':
return new HelperMSSQL(knex);
default:
throw Error('Unsupported driver used: ' + knex.client.constructor.name);
}

12
api/src/database/functions/types.ts Normal file
View File

@@ -0,0 +1,12 @@
import { Knex } from 'knex';
export interface HelperFn {
year(table: string, column: string): Knex.Raw;
month(table: string, column: string): Knex.Raw;
week(table: string, column: string): Knex.Raw;
day(table: string, column: string): Knex.Raw;
weekday(table: string, column: string): Knex.Raw;
hour(table: string, column: string): Knex.Raw;
minute(table: string, column: string): Knex.Raw;
second(table: string, column: string): Knex.Raw;
}

19
api/src/utils/get-column.ts
View File

@@ -13,7 +13,12 @@ import { applyFunctionToColumnName } from './apply-function-to-column-name';
* @param alias Whether or not to add a SQL AS statement
* @returns Knex raw instance
*/
export function getColumn(knex: Knex, table: string, column: string, alias = true): Knex.Raw {
export function getColumn(
knex: Knex,
table: string,
column: string,
alias = applyFunctionToColumnName(column)
): Knex.Raw {
const fn = FunctionsHelper(knex);
if (column.includes('(') && column.includes(')')) {
@@ -21,11 +26,13 @@ export function getColumn(knex: Knex, table: string, column: string, alias = tru
const columnName = column.match(REGEX_BETWEEN_PARENS)![1];
if (functionName in fn) {
return fn[functionName as keyof typeof fn](
table,
columnName,
alias ? applyFunctionToColumnName(column) : undefined
);
const result = fn[functionName as keyof typeof fn](table, columnName);
if (alias) {
return knex.raw(result + ' AS ??', [alias]);
}
return result;
} else {
throw new Error(`Invalid function specified "${functionName}"`);
}