feat: Support CREATE TABLE with ENGINE syntax for ClickHouse
#78
Conversation
| @@ -52,7 +52,7 @@ TableDefinitionRightPart_EDIT | |||
| keywords.push({ value: 'LIKE', weight: 1 }); | |||
| } else { | |||
| if (!$2) { | |||
| keywords.push({ value: 'PARTITIONED BY', weight: 12 }); | |||
| keywords.push({ value: 'PARTITION BY', weight: 12 }); | |||
There was a problem hiding this comment.
Previously we had wrong suggestion value actually, because PARTITIONED BY token not exists and this suggestion break syntax
| @@ -1298,6 +1298,48 @@ export const extendParser = function (parser) { | |||
| parser.yy.result.suggestTemplates = true; | |||
| } | |||
|
|
|||
| parser.suggestEngines = function() { | |||
There was a problem hiding this comment.
Actually we need to make revision of suggested engines, currently I included all engines which DataGrip supports, except PostgreSQL. Task #79
It's not easy actually, because some engine types haven's use cases and some other need to expand syntax
src/parsing/index.ts
Outdated
| @@ -136,3 +141,15 @@ export function parsePostgreSqlWithoutCursor(query: string): ParseResult { | |||
| // In order to truly complete a finished query, we need to add space to it like so "SELECT * FROM |". | |||
| return parsePostgreSql(query + ' ', ''); | |||
| } | |||
|
|
|||
|
|
|||
There was a problem hiding this comment.
We should remove this useless empty newline.
src/parsing/index.ts
Outdated
| @@ -136,3 +141,15 @@ export function parsePostgreSqlWithoutCursor(query: string): ParseResult { | |||
| // In order to truly complete a finished query, we need to add space to it like so "SELECT * FROM |". | |||
| return parsePostgreSql(query + ' ', ''); | |||
| } | |||
|
|
|||
|
|
|||
| export function parseClickhouse(queryBeforeCursor: string, queryAfterCursor: string): ParseResult { | |||
There was a problem hiding this comment.
In our websql we are writing databases in camel case ClickHouse. See the function above PostgreSql, not Postgresql. Let's make it consistent here also.
This should be fixed everywhere in this file.
src/parsing/index.ts
Outdated
| export function parseClickhouseWithoutCursor(query: string): ParseResult { | ||
| // If our finished query is "SELECT * FROM|" and we try to parse it, parser thinks that we still haven't finished writing it and doesn't show some errors. | ||
| // In order to truly complete a finished query, we need to add space to it like so "SELECT * FROM |". | ||
| return parseClickhouse(query + ' ', ''); |
There was a problem hiding this comment.
Let's move query + ' ' to a separate function. We're copypasting it and it's comment in 3 places
Closes #75