mirror of
https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git
synced 2025-12-17 01:56:46 +00:00
feat(editor): SQL editor overhaul (#6282)
* Draft setup * ⚡ Implemented expression evaluation in Postgres node, minor SQL editor UI improvements, minor refacring * ⚡ Added initial version of expression preview for SQL editor * ⚡ Linking npm package for codemirror sql grammar instead of a local file * ⚡ Moving expression editor wrapper elements to the component * ⚡ Using expression preview in SQL editor * Use SQL parser skipping whitespace * ✨ Added support for custom skipped segments specification * ✨ Fixing highlight problems with dots and expressions that resolve to zero * 👕 Fixing linting error * ✨ Added current item support * ⚡ Added expression support to more nodes with sql editor * ✨ Added expression support for other nodes * ✨ Implemented different SQL dialect support * 🐛 Fixing hard-coded parameter names for editors * ✨ Fixing preview for nested queries, updating query when input data changes, adding keyboard shortcut to toggle comments * ✨ Adding a custom automcomplete notice for different editors * ⚡ Updating SQL autocomplete notice * ✅ Added unit tests for SQL editor * ⚡ Using latest grammar * 🐛 Fixing code node editor rendering * 💄 SQL preview dropdown matches editor width. Removing unnecessary css * ⚡ Addressing PR review feedback * 👌 Addressing PR review feedback pt2 * 👌 Added path alias for utils in nodes-base package * 👌 Addressing more PR review feedback * ✅ Adding tests for `getResolvables` utility function * ⚡Fixing lodash imports * 👌 Better focus handling, adding more plugins to the editor, other minor imrovements * ⚡ Not showing SQL autocomplete suggestions inside expressions * ⚡ Using npm package for sql grammar * ⚡ Removing autocomplete notice, adding line highlight on syntax error * 👌 Addressing code review feedback --------- Co-authored-by: Milorad Filipovic <milorad@n8n.io>
This commit is contained in:
@@ -8,7 +8,7 @@ import { NodeOperationError } from 'n8n-workflow';
|
||||
|
||||
import pgPromise from 'pg-promise';
|
||||
|
||||
import { pgInsert, pgQuery } from '../Postgres/v1/genericFunctions';
|
||||
import { pgInsert, pgQueryV2 } from '../Postgres/v1/genericFunctions';
|
||||
|
||||
export class QuestDb implements INodeType {
|
||||
description: INodeTypeDescription = {
|
||||
@@ -60,9 +60,10 @@ export class QuestDb implements INodeType {
|
||||
displayName: 'Query',
|
||||
name: 'query',
|
||||
type: 'string',
|
||||
noDataExpression: true,
|
||||
typeOptions: {
|
||||
editor: 'sqlEditor',
|
||||
sqlDialect: 'postgres',
|
||||
sqlDialect: 'PostgreSQL',
|
||||
},
|
||||
displayOptions: {
|
||||
show: {
|
||||
@@ -225,14 +226,10 @@ export class QuestDb implements INodeType {
|
||||
const additionalFields = this.getNodeParameter('additionalFields', 0);
|
||||
const mode = (additionalFields.mode || 'independently') as string;
|
||||
|
||||
const queryResult = await pgQuery(
|
||||
this.getNodeParameter,
|
||||
pgp,
|
||||
db,
|
||||
items,
|
||||
this.continueOnFail(),
|
||||
mode,
|
||||
);
|
||||
const queryResult = await pgQueryV2.call(this, pgp, db, items, this.continueOnFail(), {
|
||||
overrideMode: mode,
|
||||
resolveExpression: true,
|
||||
});
|
||||
|
||||
returnItems = this.helpers.returnJsonArray(queryResult);
|
||||
} else if (operation === 'insert') {
|
||||
|
||||
Reference in New Issue
Block a user