clean up

Author: mmkal

packages/admin/package.json

@@ -78,7 +78,6 @@
     "next-themes": "^0.3.0",
     "p-memoize": "^7.1.1",
     "pg-query-emscripten": "^5.1.0",
-    "pgsql-ast-parser": "^12.0.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-hook-form": "^7.51.3",
@@ -100,6 +99,7 @@
     "autoprefixer": "^10.4.19",
     "eslint": "^8.57.0",
     "eslint-plugin-tailwindcss": "3.15.1",
+    "pgsql-ast-parser": "^12.0.1",
     "postcss": "^8.4.38",
     "shadcn-ui": "0.8.0",
     "sql-autocomplete": "^1.1.1",

packages/admin/src/client/sql-codemirror.tsx

@@ -14,7 +14,7 @@ export interface SqlCodeMirrorProps {
   code?: string
   onChange?: (query: string) => void
   onExecute?: (sql: string) => void
-  errors?: Array<{position: number; message: string}>
+  errors?: Array<{position: number; message: string | string[]}>
   height: string
   readonly?: boolean
   wrapText?: boolean
@@ -79,7 +79,7 @@ export const SqlCodeMirror = ({code, onChange, onExecute, errors, height, ...pro
         return {
           from,
           to,
-          message: e.message.split('\n')[0] || unknownErrorMessage,
+          message: [e.message].flat().join('\n').split('\n')[0] || unknownErrorMessage,
           severity: 'error',
         }
       })

packages/admin/src/client/views/Querier.tsx

@@ -29,13 +29,13 @@ export const Querier = () => {
     onSuccess: data => {
       const newErrors = data.results.flatMap(r => {
         if (r.error && typeof r.position === 'number') {
-          return [{message: r.error.message, position: r.position + 1}]
+          return [{message: r.error.message, position: r.position}]
         }
 
         const parsed = PGErrorWrapper.safeParse(r.error?.cause)
         if (parsed.success) {
           const pgError = parsed.data.error
-          return [{message: r.error?.message || pgError.code, position: Number(pgError.position) - 1}]
+          return [{message: r.error?.message || pgError.code, position: Number(pgError.position)}]
         }
 
         return []
@@ -76,7 +76,7 @@ export const Querier = () => {
         <div className="flex gap-1">
           <Button
             title="AI"
-            disabled={aiMutation.isLoading}
+            disabled={aiMutation.isPending}
             onClick={() => {
               const aiPrompt = prompt('Enter a prompt', aiMutation.variables?.prompt || '')
               if (!aiPrompt) return
@@ -94,7 +94,7 @@ export const Querier = () => {
           </Button>
         </div>
       </div>
-      {aiMutation.isLoading && <FakeProgress value={aiMutation.isSuccess ? 100 : null} estimate={3000} />}
+      {aiMutation.isPending && <FakeProgress value={aiMutation.isSuccess ? 100 : null} estimate={3000} />}
       <div className="flex flex-col gap-4 h-[90%] relative">
         <div ref={ref} className="h-1/2 border rounded-lg overflow-scroll relative bg-gray-800">
           <SqlCodeMirror

packages/admin/src/server/query.ts

@@ -1,17 +1,8 @@
 import {FieldInfo, Queryable, nameQuery, sql} from '@pgkit/client'
-import PGQueryEmscripten, {PgQueryEmscriptenParseResult} from 'pg-query-emscripten'
+import PGQueryEmscripten from 'pg-query-emscripten'
 import {type ServerContext} from './context.js'
 
-export type PgsqlParserParseResult = {
-  RawStmt?: {
-    stmt?: {}
-    stmt_len?: number
-    stmt_location?: number
-  }
-}
-
 export const runQuery = async (query: string, {connection}: ServerContext): Promise<QueryResult[]> => {
-  console.log('query', query)
   if (query.startsWith('--split-semicolons\n')) {
     const queries = query.split(/;\s*\n/)
     const results = []
@@ -26,52 +17,32 @@ export const runQuery = async (query: string, {connection}: ServerContext): Prom
 
   const results = [] as QueryResult[]
 
-  let nativeParsed: PgQueryEmscriptenParseResult
-  try {
-    const pgsqlParser = await new PGQueryEmscripten()
-    nativeParsed = pgsqlParser.parse(query)
-    if (nativeParsed.error) {
-      const message = [
-        nativeParsed.error.message,
-        '',
-        `If you think the query is actually valid, it's possible the parsing library has a bug.`,
-        `Try adding --no-parse at the top of your query to disable statement-level query parsing and send it to the DB as-is.`,
-      ].join('\n')
-      const err = new Error(message, {cause: nativeParsed.error})
-      makeJsonable(err)
-      // if (Math.random()) throw new Error(nativeParsed.error.message, {cause: nativeParsed.error})
-      return [
-        {
-          query: nameQuery([query]),
-          original: query,
-          error: err,
-          result: null,
-          fields: null,
-          position: nativeParsed.error.cursorpos - 1,
-        },
-      ]
-    }
-  } catch (err) {
-    makeJsonable(err)
-    err.message = [
-      err.message,
+  const [parseError, nativeParsed] = await Promise.resolve()
+    .then(() => new PGQueryEmscripten())
+    .then(parser => [null, parser.parse(query)] as const)
+    .catch((error: Error) => [error, null] as const)
+
+  if (parseError || nativeParsed.error) {
+    const error = parseError || new Error(nativeParsed.error!.message, {cause: nativeParsed.error})
+    error.message = [
+      error.message,
       '',
       `If you think the query is actually valid, it's possible the parsing library has a bug.`,
       `Try adding --no-parse at the top of your query to disable statement-level query parsing and send it to the DB as-is.`,
     ].join('\n')
+    makeJsonable(error)
     return [
       {
         query: nameQuery([query]),
         original: query,
-        error: err,
+        error,
         result: null,
         fields: null,
-        position: (err as {cursorPosition?: number})?.cursorPosition,
+        position: nativeParsed?.error?.cursorpos,
       },
     ]
   }
 
-  console.dir({nativeParsed}, {depth: null})
   const slices = nativeParsed.parse_tree.stmts.map(s => {
     // if (typeof s?.stmt_location !== 'number') return undefined