Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-23 08:58:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Add the equal check with null after resolver

Browse source 
- Add not equal comparision with null also
This commit is contained in:
Vik 2023-04-27 13:41:05 +05:30
parent 3aa6e16286
commit ae0e3756e1
2 changed files with 31 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/operations.js
View file

@ -9,18 +9,6 @@ export const tooljetDbOperations = {
};
async function perform(queryOptions, organizationId, currentState) {
const hasNullWithEqual = hasEqualWithNull(queryOptions);
// SQL does not support equal operation with null value, so let's handle it here.
if (hasNullWithEqual) {
return {
status: 'failed',
statusText: 'failed',
message: 'Query can not run, because app can not perform equal operation with null value',
description: 'Please use IS operator with the null value comparision.',
data: {},
};
}
switch (queryOptions.operation) {
case 'list_rows':
return listRows(queryOptions, organizationId, currentState);
@ -68,6 +56,16 @@ function buildPostgrestQuery(filters) {
async function listRows(queryOptions, organizationId, currentState) {
let query = [];
const resolvedOptions = resolveReferences(queryOptions, currentState);
console.log('resolvedOptions', resolvedOptions);
if (hasEqualWithNull(resolvedOptions, 'list_rows')) {
return {
status: 'failed',
statusText: 'failed',
message: 'Null value comparison not allowed with equal/not equal operator, Please use IS operator instead.',
description: 'Is operator should be used with null value comparision.',
data: {},
};
}
const { table_name: tableName, list_rows: listRows } = resolvedOptions;
if (!isEmpty(listRows)) {
@ -104,6 +102,15 @@ async function createRow(queryOptions, organizationId, currentState) {
async function updateRows(queryOptions, organizationId, currentState) {
const resolvedOptions = resolveReferences(queryOptions, currentState);
if (hasEqualWithNull(resolvedOptions, 'update_rows')) {
return {
status: 'failed',
statusText: 'failed',
message: 'Null value comparison not allowed with equal/not equal operator, Please use IS operator instead.',
description: 'Is operator should be used with null value comparision.',
data: {},
};
}
const { table_name: tableName, update_rows: updateRows } = resolvedOptions;
const { where_filters: whereFilters, columns } = updateRows;
@ -121,6 +128,15 @@ async function updateRows(queryOptions, organizationId, currentState) {
async function deleteRows(queryOptions, organizationId, currentState) {
const resolvedOptions = resolveReferences(queryOptions, currentState);
if (hasEqualWithNull(resolvedOptions, 'delete_rows')) {
return {
status: 'failed',
statusText: 'failed',
message: 'Null value comparison not allowed with equal/not equal operator, Please use IS operator instead.',
description: 'Is operator should be used with null value comparision.',
data: {},
};
}
const { table_name: tableName, delete_rows: deleteRows = { whereFilters: {} } } = resolvedOptions;
const { where_filters: whereFilters, limit = 1 } = deleteRows;

6
frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/util.js
View file

@ -21,13 +21,13 @@ import { get } from 'lodash';
*
* const result = hasEqualWithNull(queryOptions); // true
*/
export const hasEqualWithNull = (queryOptions) => {
const filters = get(queryOptions, 'list_rows.where_filters');
export const hasEqualWithNull = (queryOptions, operation) => {
const filters = get(queryOptions, `${operation}.where_filters`);
if (filters) {
const filterKeys = Object.keys(filters);
for (let i = 0; i < filterKeys.length; i++) {
const filter = filters[filterKeys[i]];
if (filter.operator === 'eq' && filter.value === '{{null}}') {
if ((filter.operator === 'eq' || filter.operator === 'neq') && filter.value === null) {
return true;
}
}