mirror of
https://github.com/fleetdm/fleet
synced 2026-04-21 13:37:30 +00:00
183d0d8150
For #26366 # Checklist for submitter - [X] Changes file added for user-visible changes in `changes/`, `orbit/changes/` or `ee/fleetd-chrome/changes`. See [Changes files](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/Committing-Changes.md#changes-files) for more information. # Details This PR fixes an issue where the SQL parser in the UI doesn't recognize window functions like `OVER()` and marks the SQL as having syntax errors. The fix here is to update to a more modern parsing library. This involved updating some AST-parsing code we have for determining which tables are used in a query, for the purposes of feeding autocomplete and determining query compatibility. # Testing I tested this with the query mentioned in #26366 in Chrome, Firefox and Safari on MacOS. I also added new unit tests for our SQL helper functions. # Notes During testing I discovered that we were bundling two versions of the ACE editor into our frontend package. By upgrading one version by a couple of patches to make the two dependencies equal, we chop out ~300k from our bundle.
71 lines
2.5 KiB
TypeScript
71 lines
2.5 KiB
TypeScript
import { checkTable } from "./sql_tools";
|
|
|
|
describe("checkTable", () => {
|
|
// from https://github.com/fleetdm/fleet/issues/26366
|
|
const SQL = `
|
|
WITH extension_safety_hub_menu_notifications AS (
|
|
SELECT
|
|
parse_json.key,
|
|
parse_json.fullkey,
|
|
parse_json.path,
|
|
parse_json.value
|
|
FROM (
|
|
SELECT file.filename, file.path, file.btime FROM file WHERE path LIKE "/Users/%/Library/Application Support/Google/Chrome/%/Preferences" ORDER BY file.btime DESC limit 20
|
|
) as chrome_preferences
|
|
JOIN parse_json ON chrome_preferences.path = parse_json.path
|
|
WHERE parse_json.path LIKE "/Users/%/Library/Application Support/Google/Chrome/%/Preferences" AND (
|
|
fullkey IN ("profile/name", "profile/safety_hub_menu_notifications/extensions/isCurrentlyActive", "profile/safety_hub_menu_notifications/extensions/result/timestamp")
|
|
OR fullkey Like "profile/safety_hub_menu_notifications/extensions/result/triggeringExtensions%"
|
|
)
|
|
),
|
|
extension_details AS (
|
|
SELECT path,
|
|
CASE WHEN key = 'name' THEN value END AS profile_name,
|
|
CASE WHEN key = 'isCurrentlyActive' THEN value END AS notification_active,
|
|
CASE WHEN key GLOB '*[0-9]' THEN value END AS triggering_extension,
|
|
CASE WHEN key = 'timestamp' THEN value END AS timestamp
|
|
FROM extension_safety_hub_menu_notifications
|
|
GROUP BY path, profile_name, notification_active, triggering_extension, timestamp
|
|
),
|
|
problematic_extensions AS (
|
|
SELECT
|
|
path,
|
|
MAX(profile_name) OVER (PARTITION by path) AS profile_name,
|
|
MAX(notification_active) AS notification_active,
|
|
MAX(timestamp) AS timestamp,
|
|
triggering_extension
|
|
FROM extension_details
|
|
)
|
|
SELECT path,
|
|
profile_name,
|
|
notification_active,
|
|
timestamp,
|
|
triggering_extension
|
|
FROM problematic_extensions
|
|
WHERE triggering_extension IS NOT NULL;
|
|
`;
|
|
it("should return only real tables by default", () => {
|
|
const { tables, error } = checkTable(SQL);
|
|
expect(error).toBeNull();
|
|
expect(tables).toEqual(["file", "parse_json"]);
|
|
});
|
|
|
|
it("should return all tables if 'includeVirtualTables' is set", () => {
|
|
const { tables, error } = checkTable(SQL, true);
|
|
expect(error).toBeNull();
|
|
// Note that json_each is _not_ returned here, as it is a function table.
|
|
expect(tables).toEqual([
|
|
"file",
|
|
"parse_json",
|
|
"chrome_preferences",
|
|
"extension_safety_hub_menu_notifications",
|
|
"extension_details",
|
|
"problematic_extensions",
|
|
]);
|
|
});
|
|
|
|
it("should return an error if SQL is in valid", () => {
|
|
const result = checkTable("SELECTx * FROM users");
|
|
expect(result.error).not.toBeNull();
|
|
});
|
|
});
|