dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-21 15:16:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed datetime null condition #356

Browse Source
This commit is contained in:
Jan Prochazka
2022-09-04 08:47:58 +02:00
parent c9a9c7d0f7
commit 5b8d70747f
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/filterparser/src/datetimeParser.ts
View File

@@ -181,10 +181,23 @@ const binaryCondition = operator => value => ({
}, },
}); });
const unaryCondition = conditionType => () => {
return {
conditionType,
expr: {
exprType: 'placeholder',
},
};
};
const createParser = () => { const createParser = () => {
const langDef = { const langDef = {
comma: () => word(','), comma: () => word(','),
not: () => word('NOT'),
notNull: r => r.not.then(r.null).map(unaryCondition('isNotNull')),
null: () => word('NULL').map(unaryCondition('isNull')),
yearNum: () => P.regexp(/\d\d\d\d/).map(yearCondition()), yearNum: () => P.regexp(/\d\d\d\d/).map(yearCondition()),
yearMonthNum: () => P.regexp(/\d\d\d\d-\d\d?/).map(yearMonthCondition()), yearMonthNum: () => P.regexp(/\d\d\d\d-\d\d?/).map(yearMonthCondition()),
yearMonthDayNum: () => P.regexp(/\d\d\d\d-\d\d?-\d\d?/).map(yearMonthDayCondition()), yearMonthDayNum: () => P.regexp(/\d\d\d\d-\d\d?-\d\d?/).map(yearMonthDayCondition()),
@@ -264,6 +277,8 @@ const createParser = () => {
r.lastYear, r.lastYear,
r.thisYear, r.thisYear,
r.nextYear, r.nextYear,
r.null,
r.notNull,
r.le, r.le,
r.lt, r.lt,
r.ge, r.ge,