mirror of
https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git
synced 2025-12-17 18:12:04 +00:00
fix(Supabase Node): Allow for filtering on the same field multiple times (#12429)
This commit is contained in:
@@ -293,8 +293,8 @@ export class Supabase implements INodeType {
|
|||||||
|
|
||||||
if (keys.length !== 0) {
|
if (keys.length !== 0) {
|
||||||
if (matchType === 'allFilters') {
|
if (matchType === 'allFilters') {
|
||||||
const data = keys.reduce((obj, value) => buildQuery(obj, value), {});
|
const data = keys.map((key) => buildOrQuery(key));
|
||||||
Object.assign(qs, data);
|
Object.assign(qs, { and: `(${data.join(',')})` });
|
||||||
}
|
}
|
||||||
if (matchType === 'anyFilter') {
|
if (matchType === 'anyFilter') {
|
||||||
const data = keys.map((key) => buildOrQuery(key));
|
const data = keys.map((key) => buildOrQuery(key));
|
||||||
|
|||||||
@@ -0,0 +1,99 @@
|
|||||||
|
import { mock } from 'jest-mock-extended';
|
||||||
|
import { get } from 'lodash';
|
||||||
|
import {
|
||||||
|
type IDataObject,
|
||||||
|
type IExecuteFunctions,
|
||||||
|
type IGetNodeParameterOptions,
|
||||||
|
type INodeExecutionData,
|
||||||
|
type IPairedItemData,
|
||||||
|
NodeOperationError,
|
||||||
|
} from 'n8n-workflow';
|
||||||
|
|
||||||
|
import * as utils from '../GenericFunctions';
|
||||||
|
import { Supabase } from '../Supabase.node';
|
||||||
|
|
||||||
|
describe('Test Supabase Node', () => {
|
||||||
|
const node = new Supabase();
|
||||||
|
|
||||||
|
const input = [{ json: {} }];
|
||||||
|
|
||||||
|
const createMockExecuteFunction = (
|
||||||
|
nodeParameters: IDataObject,
|
||||||
|
continueOnFail: boolean = false,
|
||||||
|
) => {
|
||||||
|
const fakeExecuteFunction = {
|
||||||
|
getNodeParameter(
|
||||||
|
parameterName: string,
|
||||||
|
itemIndex: number,
|
||||||
|
fallbackValue?: IDataObject | undefined,
|
||||||
|
options?: IGetNodeParameterOptions | undefined,
|
||||||
|
) {
|
||||||
|
const parameter = options?.extractValue ? `${parameterName}.value` : parameterName;
|
||||||
|
|
||||||
|
const parameterValue = get(nodeParameters, parameter, fallbackValue);
|
||||||
|
|
||||||
|
if ((parameterValue as IDataObject)?.nodeOperationError) {
|
||||||
|
throw new NodeOperationError(mock(), 'Get Options Error', { itemIndex });
|
||||||
|
}
|
||||||
|
|
||||||
|
return parameterValue;
|
||||||
|
},
|
||||||
|
getNode() {
|
||||||
|
return node;
|
||||||
|
},
|
||||||
|
continueOnFail: () => continueOnFail,
|
||||||
|
getInputData: () => input,
|
||||||
|
helpers: {
|
||||||
|
constructExecutionMetaData: (
|
||||||
|
_inputData: INodeExecutionData[],
|
||||||
|
_options: { itemData: IPairedItemData | IPairedItemData[] },
|
||||||
|
) => [],
|
||||||
|
returnJsonArray: (_jsonData: IDataObject | IDataObject[]) => [],
|
||||||
|
},
|
||||||
|
} as unknown as IExecuteFunctions;
|
||||||
|
return fakeExecuteFunction;
|
||||||
|
};
|
||||||
|
|
||||||
|
it('should allow filtering on the same field multiple times', async () => {
|
||||||
|
const supabaseApiRequest = jest
|
||||||
|
.spyOn(utils, 'supabaseApiRequest')
|
||||||
|
.mockImplementation(async () => {
|
||||||
|
return [];
|
||||||
|
});
|
||||||
|
|
||||||
|
const fakeExecuteFunction = createMockExecuteFunction({
|
||||||
|
resource: 'row',
|
||||||
|
operation: 'getAll',
|
||||||
|
returnAll: true,
|
||||||
|
filterType: 'manual',
|
||||||
|
matchType: 'allFilters',
|
||||||
|
tableId: 'my_table',
|
||||||
|
filters: {
|
||||||
|
conditions: [
|
||||||
|
{
|
||||||
|
condition: 'gt',
|
||||||
|
keyName: 'created_at',
|
||||||
|
keyValue: '2025-01-02 08:03:43.952051+00',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
condition: 'lt',
|
||||||
|
keyName: 'created_at',
|
||||||
|
keyValue: '2025-01-02 08:07:36.102231+00',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
await node.execute.call(fakeExecuteFunction);
|
||||||
|
|
||||||
|
expect(supabaseApiRequest).toHaveBeenCalledWith(
|
||||||
|
'GET',
|
||||||
|
'/my_table',
|
||||||
|
{},
|
||||||
|
{
|
||||||
|
and: '(created_at.gt.2025-01-02 08:03:43.952051+00,created_at.lt.2025-01-02 08:07:36.102231+00)',
|
||||||
|
offset: 0,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
});
|
||||||
|
});
|
||||||
Reference in New Issue
Block a user