fix: parse table name with prefix and quote (#606)

* fix: parse table name with prefix and quote

* refactor: simple

Author: sunchanglong

src/api/interceptor.ts

@@ -21,19 +21,22 @@ export interface Auth {
 }
 
 // todo: can we use env and proxy at the same time?
-export const TableNameReg = /(?<=from|FROM)\s+([^\s;]+)/
-export function parseTable(sql: string) {
+export const TableNameReg = /(?<=from|FROM)\s+([^\s;]+)/i
+/**
+ * Parse table reference from SQL after FROM. Returns the raw table reference as-is (e.g. "temp_data"."cpu_metrics"), no conversion.
+ */
+function parseTableFromSql(sql: string): string {
   try {
     sql = decodeURIComponent(sql)
     const result = sql.match(TableNameReg)
-    if (result && result.length) {
-      const arr = result[1].trim().split('.')
-      return arr[arr.length - 1]
-    }
-  } catch (e) {
+    if (!result?.[1]) return ''
+    return result[1].trim()
+  } catch {
     return ''
   }
-  return ''
+}
+export function parseTable(sql: string) {
+  return parseTableFromSql(sql)
 }
 
 axios.interceptors.request.use(

src/components/count-chart/index.vue

@@ -14,7 +14,7 @@ VCharts(
   import * as echarts from 'echarts'
   import editorAPI from '@/api/editor'
   import type { QueryState } from '@/types/query'
-  import { replaceTimePlaceholders } from '@/utils/sql'
+  import { replaceTimePlaceholders, getTableRefForSql } from '@/utils/sql'
   import { convertTimestampToMilliseconds } from '@/utils/date-time'
   import { useDateTimeFormat } from '@/hooks'
 
@@ -170,8 +170,7 @@ VCharts(
 
     const whereClause = whereMatch ? `WHERE ${whereMatch[1]}` : ''
 
-    // Build table name with database prefix if available
-    const tableName = database ? `"${database}"."${table}"` : `"${table}"`
+    const tableName = getTableRefForSql({ table, database })
 
     return `SELECT
             date_bin('${intervalSeconds.value} seconds', "${tsColumn.name}") AS time_bucket,

src/hooks/use-query-execution.ts

@@ -1,5 +1,5 @@
 import { ref, reactive, computed, watch, shallowRef } from 'vue'
-import { replaceTimePlaceholders } from '@/utils/sql'
+import { replaceTimePlaceholders, getTableRefForSql } from '@/utils/sql'
 import type { ColumnType, QueryState } from '@/types/query'
 
 const useQueryExecution = (builder, textEditor, timeRange) => {
@@ -53,8 +53,7 @@ const useQueryExecution = (builder, textEditor, timeRange) => {
       const whereMatch = currentSql.match(/WHERE\s+([\s\S]+?)(?:\s+ORDER\s+BY|\s+LIMIT\s+|\s*$)/i)
       const whereClause = whereMatch ? `WHERE ${whereMatch[1]}` : ''
 
-      // Build COUNT query with database prefix if available
-      const tableName = queryState.database ? `"${queryState.database}"."${queryState.table}"` : `"${queryState.table}"`
+      const tableName = getTableRefForSql(queryState)
       const countSql = `SELECT COUNT(*) FROM ${tableName} ${whereClause}`
 
       const { default: editorAPI } = await import('@/api/editor')

src/hooks/use-text-editor-state.ts

@@ -1,4 +1,4 @@
-import { ref, type Ref } from 'vue'
+import { reactive } from 'vue'
 import { TextEditorFormState } from '@/types/query'
 import { replaceTimePlaceholders } from '@/utils/sql'
 

src/utils/sql.ts

@@ -201,3 +201,29 @@ export function replaceTimePlaceholders(sql: string, timeRanges: any[]): string
 
   return result
 }
+
+/**
+ * Table reference for use in SQL (e.g. in FROM clause).
+ * - When database is provided (builder mode), both database and table are quoted safely.
+ * - When only table is provided, it may already contain schema prefix (e.g. "temp_data"."cpu_metrics")
+ *   or be unqualified (e.g. my_schema.my_table). In the latter case each part is safely quoted.
+ */
+export function getTableRefForSql(state: { table: string; database?: string }): string {
+  const quote = (id: string) => `"${id.replace(/"/g, '""')}"`
+  const { table, database } = state
+
+  if (database) {
+    return `${quote(database)}.${quote(table)}`
+  }
+
+  // Text / free-sql mode: respect fully quoted references
+  if (/^["'`]/.test(table)) {
+    return table
+  }
+
+  // Quote each identifier segment (schema.table or just table)
+  return table
+    .split('.')
+    .map((part) => quote(part))
+    .join('.')
+}

src/views/dashboard/logs/query/FunnelChart.vue

@@ -14,7 +14,7 @@ VCharts(
   import { watchOnce } from '@vueuse/core'
   import editorAPI from '@/api/editor'
   import type { QueryState } from '@/types/query'
-  import { replaceTimePlaceholders } from '@/utils/sql'
+  import { replaceTimePlaceholders, getTableRefForSql } from '@/utils/sql'
   import { getWhereClause } from './until'
 
   interface Props {
@@ -84,10 +84,7 @@ VCharts(
     const currentSql = replaceTimePlaceholders(props.queryState.sql, [startTs, endTs])
     const whereClause = getWhereClause(currentSql)
     const condition = whereClause ? `WHERE ${whereClause}` : ''
-    // Build table name with database prefix if available
-    const tableName = props.queryState.database
-      ? `"${props.queryState.database}"."${props.queryState.table}"`
-      : `"${props.queryState.table}"`
+    const tableName = getTableRefForSql(props.queryState)
     return `SELECT ${props.column} ,count(*) AS c FROM ${tableName} ${condition} GROUP BY ${props.column} ORDER BY c DESC`
   })
 

src/views/dashboard/logs/query/until.ts

@@ -1,6 +1,7 @@
 import dayjs from 'dayjs'
 import type { SchemaType } from '@/store/modules/code-run/types'
 import type { TSColumn } from '@/types/query'
+import { getTableRefForSql } from '@/utils/sql'
 
 function findWhereClausePosition(sql: string) {
   // Normalize case for easier comparison
@@ -93,17 +94,20 @@ export function addTsCondition(sql: string, column: string, start: number | stri
   return `${sql.slice(0, whereIndex - 1)} WHERE ${column} >= ${start} and ${column} < ${end} ${sql.slice(whereIndex)}`
 }
 
-export const TableNameReg = /(?<=from|FROM)\s+([^\s;]+)/
+export const TableNameReg = /(?<=from|FROM)\s+([^\s;]+)/i
+
+/**
+ * Parse table reference after FROM and normalize it to a safe, quoted identifier:
+ * - "db"."table" → "db"."table"
+ * - db.table     → "db"."table"
+ * - table        → "table"
+ */
 export function parseTable(sql: string) {
   const result = sql.match(TableNameReg)
-  if (result && result.length) {
-    const tableName = result[1].trim()
-    // Remove quotes if they exist
-    const cleanTableName = tableName.replace(/^["'`]|["'`]$/g, '')
-    const arr = cleanTableName.split('.')
-    return arr[arr.length - 1]
-  }
-  return ''
+  if (!result?.[1]) return ''
+  const raw = result[1].trim()
+  // Let SQL utils handle proper quoting / escaping for identifiers
+  return getTableRefForSql({ table: raw })
 }
 
 export function parseTimeRange(sql: string, tsColumn: string, multiple: number): string[] | number {