From e9590f07cc5eaeed1c0d931c6909df15133c00ba Mon Sep 17 00:00:00 2001 From: hayden Date: Wed, 29 Nov 2023 15:15:17 +0800 Subject: [PATCH 1/2] feat: upgrade dt-sql-parser to v4.0.0-beta.4.8 --- package.json | 2 +- pnpm-lock.yaml | 8 ++++---- yarn.lock | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 1f6f9a0..fc01605 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ } }, "dependencies": { - "dt-sql-parser": "4.0.0-beta.4.7" + "dt-sql-parser": "4.0.0-beta.4.8" }, "peerDependencies": { "monaco-editor": "0.31.0" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 397764b..17e6f1c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -3,7 +3,7 @@ lockfileVersion: 5.3 specifiers: '@types/mocha': ^9.1.0 '@types/node': ^20.4.0 - dt-sql-parser: 4.0.0-beta.4.7 + dt-sql-parser: 4.0.0-beta.4.8 eslint: ^7.1.0 eslint-config-google: ^0.14.0 eslint-config-prettier: ^6.15.0 @@ -24,7 +24,7 @@ specifiers: typescript: ^5.0.4 dependencies: - dt-sql-parser: 4.0.0-beta.4.7 + dt-sql-parser: 4.0.0-beta.4.8 devDependencies: '@types/mocha': 9.1.1 @@ -988,8 +988,8 @@ packages: minimatch: 3.1.2 dev: true - /dt-sql-parser/4.0.0-beta.4.7: - resolution: {integrity: sha512-blXFMBtCqbyWdIsC1pJJuig6w8HQnjjzJE0KMv2DueLZWXLY5QkTP94F8U9E9mYB4S9yiNP8gv1191XwwwPYGQ==} + /dt-sql-parser/4.0.0-beta.4.8: + resolution: {integrity: sha512-Y4sHNysax7UuB7ZhZObm6hmmJyy3WG4YQVjAMvsFiSRjRQ5aXnS1H4EdJ4OpLveEbmM1s6J20hGodvKQq20bcA==} dependencies: antlr4-c3: 3.1.1 antlr4ts: 0.5.0-alpha.4 diff --git a/yarn.lock b/yarn.lock index 34d1890..9d42d5d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -985,10 +985,10 @@ dotgitignore@^2.1.0: find-up "^3.0.0" minimatch "^3.0.4" -dt-sql-parser@4.0.0-beta.4.7: - version "4.0.0-beta.4.7" - resolved "https://registry.npmmirror.com/dt-sql-parser/-/dt-sql-parser-4.0.0-beta.4.7.tgz#6dea13b49529d882bc01df7f9d13c6457cee5e87" - integrity sha512-blXFMBtCqbyWdIsC1pJJuig6w8HQnjjzJE0KMv2DueLZWXLY5QkTP94F8U9E9mYB4S9yiNP8gv1191XwwwPYGQ== +dt-sql-parser@4.0.0-beta.4.8: + version "4.0.0-beta.4.8" + resolved "https://registry.npmmirror.com/dt-sql-parser/-/dt-sql-parser-4.0.0-beta.4.8.tgz#46fafdfb6fa8f841e232dcb899db8fb8064541b5" + integrity sha512-Y4sHNysax7UuB7ZhZObm6hmmJyy3WG4YQVjAMvsFiSRjRQ5aXnS1H4EdJ4OpLveEbmM1s6J20hGodvKQq20bcA== dependencies: antlr4-c3 "3.1.1" antlr4ts "0.5.0-alpha.4" From 26cbf066eca8b5ab8bd6722b42859a2f734ba3e0 Mon Sep 17 00:00:00 2001 From: hayden Date: Wed, 29 Nov 2023 15:20:03 +0800 Subject: [PATCH 2/2] feat: replace GenericSQL with MySQL --- src/flinksql/flinkSQLWorker.ts | 4 +--- src/flinksql/flinksql.worker.ts | 3 ++- src/mysql/mySQLWorker.ts | 2 +- src/sql/sqlWorker.ts | 6 +++--- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/flinksql/flinkSQLWorker.ts b/src/flinksql/flinkSQLWorker.ts index fcfd9f0..1605423 100644 --- a/src/flinksql/flinkSQLWorker.ts +++ b/src/flinksql/flinkSQLWorker.ts @@ -1,10 +1,8 @@ import { worker } from '../fillers/monaco-editor-core'; import FlinkSQL from 'dt-sql-parser/dist/parser/flinksql'; import { BaseSQLWorker } from '../baseSQLWorker'; +import { ICreateData } from '../_.contribution'; -export interface ICreateData { - languageId: string; -} export class FLinkSQLWorker extends BaseSQLWorker { protected _ctx: worker.IWorkerContext; protected parser: FlinkSQL; diff --git a/src/flinksql/flinksql.worker.ts b/src/flinksql/flinksql.worker.ts index 997e080..cdf061a 100644 --- a/src/flinksql/flinksql.worker.ts +++ b/src/flinksql/flinksql.worker.ts @@ -1,6 +1,7 @@ import { worker } from '../fillers/monaco-editor-core'; import * as EditorWorker from 'monaco-editor/esm/vs/editor/editor.worker.js'; -import { FLinkSQLWorker, ICreateData } from './flinkSQLWorker'; +import { FLinkSQLWorker } from './flinkSQLWorker'; +import { ICreateData } from '../_.contribution'; self.onmessage = (e: any) => { EditorWorker.initialize((ctx: worker.IWorkerContext, createData: ICreateData) => { diff --git a/src/mysql/mySQLWorker.ts b/src/mysql/mySQLWorker.ts index ffa604d..2d5906b 100644 --- a/src/mysql/mySQLWorker.ts +++ b/src/mysql/mySQLWorker.ts @@ -1,5 +1,5 @@ import { worker } from '../fillers/monaco-editor-core'; -import MySQL from 'dt-sql-parser/dist/parser/generic'; +import MySQL from 'dt-sql-parser/dist/parser/mysql'; import { ICreateData } from '../_.contribution'; import { BaseSQLWorker } from '../baseSQLWorker'; diff --git a/src/sql/sqlWorker.ts b/src/sql/sqlWorker.ts index a25441e..20a6ef3 100644 --- a/src/sql/sqlWorker.ts +++ b/src/sql/sqlWorker.ts @@ -1,15 +1,15 @@ import { worker } from '../fillers/monaco-editor-core'; -import MySQL from 'dt-sql-parser/dist/parser/generic'; +import GenericSQL from 'dt-sql-parser/dist/parser/mysql'; import { ICreateData } from '../_.contribution'; import { BaseSQLWorker } from '../baseSQLWorker'; export class SQLWorker extends BaseSQLWorker { protected _ctx: worker.IWorkerContext; - protected parser: MySQL; + protected parser: GenericSQL; constructor(ctx: worker.IWorkerContext, createData: ICreateData) { super(); this._ctx = ctx; - this.parser = new MySQL(); + this.parser = new GenericSQL(); } }