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

fixed evaluated filters

Browse Source
This commit is contained in:
Jan Prochazka
2022-03-31 15:15:15 +02:00
parent 25380ee0a8
commit 5aac142e4c
12 changed files with 90 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
packages/filterparser/src/parseFilter.ts
View File

@@ -254,10 +254,10 @@ const createParser = (filterType: FilterType) => {
eq: r => word('=').then(r.value).map(binaryCondition('=')),
ne: r => word('!=').then(r.value).map(binaryCondition('<>')),
ne2: r => word('<>').then(r.value).map(binaryCondition('<>')),
lt: r => word('<').then(r.value).map(binaryCondition('<')),
gt: r => word('>').then(r.value).map(binaryCondition('>')),
le: r => word('<=').then(r.value).map(binaryCondition('<=')),
ge: r => word('>=').then(r.value).map(binaryCondition('>=')),
lt: r => word('<').then(r.value).map(binaryCondition('<')),
gt: r => word('>').then(r.value).map(binaryCondition('>')),
startsWith: r => word('^').then(r.value).map(likeCondition('like', '#VALUE#%')),
endsWith: r => word('$').then(r.value).map(likeCondition('like', '%#VALUE#')),
contains: r => word('+').then(r.value).map(likeCondition('like', '%#VALUE#%')),
@@ -271,24 +271,30 @@ const createParser = (filterType: FilterType) => {
};
const allowedValues = []; // 'string1', 'string2', 'number', 'noQuotedString'];
if (filterType == 'string') allowedValues.push('string1', 'string2', 'noQuotedString');
if (filterType == 'number') allowedValues.push('string1Num', 'string2Num', 'number');
if (filterType == 'string' || filterType == 'eval') {
allowedValues.push('string1', 'string2', 'noQuotedString');
}
if (filterType == 'number') {
allowedValues.push('string1Num', 'string2Num', 'number');
}
const allowedElements = ['null', 'notNull', 'eq', 'ne', 'ne2'];
if (filterType == 'number' || filterType == 'datetime') allowedElements.push('lt', 'gt', 'le', 'ge');
if (filterType == 'string')
allowedElements.push(
'empty',
'notEmpty',
'startsWith',
'endsWith',
'contains',
'startsWithNot',
'endsWithNot',
'containsNot'
);
if (filterType == 'logical') allowedElements.push('true', 'false', 'trueNum', 'falseNum');
if (filterType == 'datetime')
if (filterType == 'number' || filterType == 'datetime' || filterType == 'eval') {
allowedElements.push('le', 'ge', 'lt', 'gt');
}
if (filterType == 'string') {
allowedElements.push('empty', 'notEmpty');
}
if (filterType == 'eval' || filterType == 'string') {
allowedElements.push('startsWith', 'endsWith', 'contains', 'startsWithNot', 'endsWithNot', 'containsNot');
}
if (filterType == 'logical') {
allowedElements.push('true', 'false', 'trueNum', 'falseNum');
}
if (filterType == 'eval') {
allowedElements.push('true', 'false');
}
if (filterType == 'datetime') {
allowedElements.push(
'yearMonthDaySecond',
'yearMonthDayMinute',
@@ -308,10 +314,13 @@ const createParser = (filterType: FilterType) => {
'thisYear',
'nextYear'
);
}
// must be last
if (filterType == 'string') allowedElements.push('valueTestStr');
else allowedElements.push('valueTestEq');
if (filterType == 'string' || filterType == 'eval') {
allowedElements.push('valueTestStr');
} else {
allowedElements.push('valueTestEq');
}
return P.createLanguage(langDef);
};
@@ -321,6 +330,7 @@ const parsers = {
string: createParser('string'),
datetime: createParser('datetime'),
logical: createParser('logical'),
eval: createParser('eval'),
mongo: mongoParser,
};

2
packages/filterparser/src/types.ts
View File

@@ -1,3 +1,3 @@
// import types from 'dbgate-types';
export type FilterType = 'number' | 'string' | 'datetime' | 'logical' | 'mongo';
export type FilterType = 'number' | 'string' | 'datetime' | 'logical' | 'eval' | 'mongo';