Merge pull request #31 from questdb/package_fix

bziobrowski · web-flow · commit 8e877655e53c · 2024-03-01T14:36:37.000+01:00
Fix ast parser dependency
diff --git a/package.json b/package.json
@@ -70,7 +70,7 @@
     "@grafana/runtime": "9.4.3",
     "@grafana/ui": "10.1.0",
     "@questdb/sql-grammar": "1.0.15",
-    "questdb-sql-ast-parser": "1.0.3",
+    "@questdb/sql-ast-parser": "0.1.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-router-dom": "^5.2.0",
diff --git a/src/components/queryBuilder/utils.ts b/src/components/queryBuilder/utils.ts
@@ -10,7 +10,7 @@ import {
   ExprUnary,
   FromTable, IAstVisitor,
   SelectedColumn,
-} from 'questdb-sql-ast-parser';
+} from '@questdb/sql-ast-parser';
 import {
   BooleanFilter,
   BuilderMetricField,
diff --git a/src/data/ast.test.ts b/src/data/ast.test.ts
@@ -1,5 +1,5 @@
 import { getFields, sqlToStatement } from './ast';
-import { toSql } from 'questdb-sql-ast-parser'
+import { toSql } from '@questdb/sql-ast-parser'
 
 describe('ast', () => {
   describe('getFields', () => {
diff --git a/src/data/ast.ts b/src/data/ast.ts
@@ -1,4 +1,4 @@
-import { parseFirst, Statement, SelectFromStatement, astMapper, toSql, ExprRef } from 'questdb-sql-ast-parser';
+import { parseFirst, Statement, SelectFromStatement, astMapper, toSql, ExprRef } from '@questdb/sql-ast-parser';
 
 export function sqlToStatement(sql: string): Statement {
   const replaceFuncs: Array<{
diff --git a/yarn.lock b/yarn.lock
@@ -2464,6 +2464,14 @@
   resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.8.tgz#6b79032e760a0899cd4204710beede972a3a185f"
   integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==
 
+"@questdb/sql-ast-parser@0.1.1":
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/@questdb/sql-ast-parser/-/sql-ast-parser-0.1.1.tgz#c6e7db4b9f71d988dc47119df1e09ae72cf5436c"
+  integrity sha512-4JnrBeeucBcUa00JIb0wZx7KhhZ1O9Z066ZEVeEiX9S3OcRMXGt0wxBxITs5zCgsWnWk8tVpLD5Lkn5GvCm50A==
+  dependencies:
+    moo "^0.5.1"
+    nearley "^2.19.5"
+
 "@questdb/sql-grammar@1.0.15":
   version "1.0.15"
   resolved "https://registry.yarnpkg.com/@questdb/sql-grammar/-/sql-grammar-1.0.15.tgz#a4b7ba0b8a100e29aeb33535b884b6186e17c8f2"
@@ -8962,14 +8970,6 @@ querystringify@^2.1.1:
   resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
   integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
 
-questdb-sql-ast-parser@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/questdb-sql-ast-parser/-/questdb-sql-ast-parser-1.0.3.tgz#59fe0fae0dbfdeec739baabb09b557441153775c"
-  integrity sha512-aNg2arBXh/N6WJOH3BR0vbD3gSGz204T83r2ouSWEF25+JpJemHL2WvZg8ZzzFCzPCqrvyFtS1lmc0E5GErTdg==
-  dependencies:
-    moo "^0.5.1"
-    nearley "^2.19.5"
-
 queue-microtask@^1.2.2:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { parseFirst, Statement, SelectFromStatement, astMapper, toSql, ExprRef } from 'questdb-sql-ast-parser';`
	`1`	`+import { parseFirst, Statement, SelectFromStatement, astMapper, toSql, ExprRef } from '@questdb/sql-ast-parser';`
`2`	`2`
`3`	`3`	`export function sqlToStatement(sql: string): Statement {`
`4`	`4`	`const replaceFuncs: Array<{`