Merge pull request #124 from influxdata/fix/builder-view-populate

fix: remove table quotes to do table lookup
influxdata · Apr 3, 2023 · 25bb55f · 25bb55f
2 parents b8bfba5 + f38f06a
commit 25bb55f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "flightsql-datasource",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "",
   "scripts": {
     "build": "webpack -c ./.config/webpack/webpack.config.ts --env production",

diff --git a/src/components/BuilderView.tsx b/src/components/BuilderView.tsx
@@ -16,6 +16,7 @@ import {
   formatWheres,
   formatCreateLabel,
   prefixDB,
+  removeQuotes,
 } from './utils'
 import {SelectColumn} from './SelectColumn'
 import {WhereExp} from './WhereExp'
@@ -114,10 +115,11 @@ export function BuilderView({query, datasource, onChange, fromRawSql}: any) {
 
   useEffect(() => {
     if (!fromRawSql && tables) {
-      const tableExists = tables?.find((t: any) => t.label === query.table)
+      const unquotedTable = removeQuotes(query?.table)
+      const tableExists = tables?.find((t: any) => t.label === unquotedTable)
       if (tableExists) {
         if (query.table) {
-          setTable({value: query.table, label: query.table})
+          setTable({value: unquotedTable, label: unquotedTable})
         }
         if (query.columns) {
           setColumnValues(query.columns)

diff --git a/src/components/utils.ts b/src/components/utils.ts
@@ -234,3 +234,7 @@ export const onResetPassword = (options: any, onOptionsChange: any) => {
     },
   })
 }
+
+export const removeQuotes = (str: string) => {
+  return str?.replace(/['"]+/g, '')
+}
-Original file line number
+Diff line change
@@ Expand Up @@
         },
       })
     }
+    export const removeQuotes = (str: string) => {
+      return str?.replace(/['"]+/g, '')
+    }