From b6a816fe52fa8ac7d5f73ec31ba397c88e16b27c Mon Sep 17 00:00:00 2001 From: gillespi314 <73313222+gillespi314@users.noreply.github.com> Date: Fri, 24 Jun 2022 10:19:06 -0500 Subject: [PATCH] Remove `last` keyword from UI SQL parser config (#6362) --- changes/issue-6289-fix-table-name-collision-UI | 1 + frontend/components/FleetAce/mode.ts | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 changes/issue-6289-fix-table-name-collision-UI diff --git a/changes/issue-6289-fix-table-name-collision-UI b/changes/issue-6289-fix-table-name-collision-UI new file mode 100644 index 0000000000..b2718e8c8a --- /dev/null +++ b/changes/issue-6289-fix-table-name-collision-UI @@ -0,0 +1 @@ +- Update UI SQL syntax highlighting to display `last` as an osquery table rather than keyword diff --git a/frontend/components/FleetAce/mode.ts b/frontend/components/FleetAce/mode.ts index a2c590f14d..c103c0ad87 100644 --- a/frontend/components/FleetAce/mode.ts +++ b/frontend/components/FleetAce/mode.ts @@ -25,8 +25,10 @@ ace.define( var builtinConstants = "true|false"; + // Note: `last` was removed from the list of built-in functions because it collides with the + // `last` table available in osquery var builtinFunctions = - "avg|count|first|last|max|min|sum|ucase|lcase|mid|len|round|rank|now|format|" + + "avg|count|first|max|min|sum|ucase|lcase|mid|len|round|rank|now|format|" + "coalesce|ifnull|isnull|nvl"; var dataTypes =