Skip to content

Commit aea1a60

Browse files
authored
feat(perf): Add Relay placeholder parsing support to SQL parser (#58944)
As of getsentry/relay#2552 Relay sometimes injects `{%s}` into the query. I didn't notice at the time that this causes a SQL parse failure. Closes JAVASCRIPT-2NQW.
1 parent 7d54320 commit aea1a60

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

static/app/views/starfish/utils/sqlish/SQLishParser.spec.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ describe('SQLishParser', function () {
2828
'flags | %s)', // Bitwise OR
2929
'flags ^ %s)', // Bitwise XOR
3030
'flags ~ %s)', // Bitwise NOT
31+
'FROM temp{%s}', // Relay integer stripping
3132
'+ %s as count', // Arithmetic I
3233
'- %s as count', // Arithmetic II
3334
"ILIKE '\\_')", // Backslash

static/app/views/starfish/utils/sqlish/sqlish.pegjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@ Whitespace
3636
= Whitespace:[\n\t ]+ { return { type: 'Whitespace', content: Whitespace.join("") } }
3737

3838
GenericToken
39-
= GenericToken:[a-zA-Z0-9"'`_\-.=><:,*;!\[\]?$%|/\\@#&~^+]+ { return { type: 'GenericToken', content: GenericToken.join('') } }
39+
= GenericToken:[a-zA-Z0-9"'`_\-.=><:,*;!\[\]?$%|/\\@#&~^+{}]+ { return { type: 'GenericToken', content: GenericToken.join('') } }

0 commit comments

Comments
 (0)