diff --git a/apps/desktop/src/components/sidebar/TreeItem.vue b/apps/desktop/src/components/sidebar/TreeItem.vue index 427378e227..14c10c5871 100644 --- a/apps/desktop/src/components/sidebar/TreeItem.vue +++ b/apps/desktop/src/components/sidebar/TreeItem.vue @@ -967,6 +967,7 @@ async function newQuery() { } } +// SQL template helpers have been extracted to @/lib/tableSqlTemplates.ts // ---- Template actions ---- async function loadTemplateContext(allowView = false) { @@ -989,7 +990,19 @@ async function loadTemplateContext(allowView = false) { console.warn("[DBX][tableSqlTemplate:getColumns:error]", e); } - return { node, dbType, tableSchema, columns }; + let tableType = node.tableType; + if (dbType === "tdengine") { + try { + const querySchema = connectionObjectTreeQuerySchema(config, node.database, tableSchema); + const tables = await api.listTables(node.connectionId, node.database, querySchema, node.label, 200); + const matched = tables.find((table) => table.name.toLowerCase() === node.label.toLowerCase()); + if (matched?.table_type) tableType = matched.table_type; + } catch (e) { + console.warn("[DBX][tableSqlTemplate:listTables:error]", e); + } + } + + return { node, dbType, tableSchema, columns, tableType }; } function openSqlTemplateTab(connectionId: string, database: string, schema: string | undefined, sql: string, title?: string) { @@ -1022,6 +1035,7 @@ async function newInsertTemplate() { schema: context.tableSchema, tableName: context.node.label, columns: context.columns, + tableType: context.tableType, }); openSqlTemplateTab(context.node.connectionId!, context.node.database!, context.node.schema, sql); } catch (e: any) { diff --git a/apps/desktop/src/lib/tableSqlTemplates.ts b/apps/desktop/src/lib/tableSqlTemplates.ts index a5d79054af..0b5bf42b9d 100644 --- a/apps/desktop/src/lib/tableSqlTemplates.ts +++ b/apps/desktop/src/lib/tableSqlTemplates.ts @@ -6,6 +6,7 @@ export interface TableSqlTemplateOptions { schema?: string; tableName: string; columns?: ColumnInfo[]; + tableType?: string; } export function buildTableSelectTemplate(options: TableSqlTemplateOptions): string { @@ -19,9 +20,25 @@ export function buildTableSelectTemplate(options: TableSqlTemplateOptions): stri } export function buildTableInsertTemplate(options: TableSqlTemplateOptions): string { + const strategy = options.databaseType ? insertTemplateStrategies[options.databaseType] : undefined; + return (strategy ?? buildDefaultInsertTemplate)(options); +} + +type InsertTemplateStrategy = (options: TableSqlTemplateOptions) => string; + +function buildDefaultInsertTemplate(options: TableSqlTemplateOptions): string { const tableName = templateTableName(options); const columns = (options.columns ?? []).filter((column) => !isAutoGeneratedColumn(column)); + // TDengine does not support INSERT INTO t(col1, col2) VALUES(...) syntax + if (options.databaseType === "tdengine") { + const values = columns.map((column) => columnPlaceholderValue(column, options.databaseType)); + if (!values.length) { + return `INSERT INTO ${tableName}\nVALUES (/* TODO: add values */);`; + } + return `INSERT INTO ${tableName}\nVALUES (${values.join(", ")});`; + } + if (!columns.length) { return `INSERT INTO ${tableName}\n/* TODO: add column values */\nVALUES ();`; } @@ -31,6 +48,34 @@ export function buildTableInsertTemplate(options: TableSqlTemplateOptions): stri return `INSERT INTO ${tableName} (${columnNames.join(", ")})\nVALUES (${values.join(", ")});`; } +function buildTdengineInsertTemplate(options: TableSqlTemplateOptions): string { + const columns = options.columns ?? []; + const isTagColumn = (column: ColumnInfo) => (column.comment ?? "").toUpperCase() === "TAG" || (column.extra ?? "").toUpperCase().includes("TAG"); + const tagColumns = columns.filter((column) => isTagColumn(column)); + const normalizedTableType = (options.tableType ?? "").toUpperCase(); + const shouldUseStableTemplate = normalizedTableType === "STABLE" || (!normalizedTableType && tagColumns.length > 0); + + if (!shouldUseStableTemplate) { + return buildDefaultInsertTemplate(options); + } + + const valueColumns = columns.filter((column) => !isTagColumn(column)).filter((column) => !isAutoGeneratedColumn(column)); + const tagPlaceholders = tagColumns.map((column) => columnPlaceholderValue(column, options.databaseType)); + const tagsSql = tagPlaceholders.length > 0 ? `TAGS (${tagPlaceholders.join(", ")})` : "TAGS (/* TODO: add tag values */)"; + const stableNameForUsing = templateTableName(options).replace(/^`|`$/g, ""); + const valuePlaceholders = valueColumns.map((column) => columnPlaceholderValue(column, options.databaseType)); + + if (!valueColumns.length) { + return `INSERT INTO /* child_table_name */ USING ${stableNameForUsing}\n${tagsSql}\nVALUES (/* TODO: add values */);`; + } + + return `INSERT INTO /* child_table_name */ USING ${stableNameForUsing}\n${tagsSql}\nVALUES (${valuePlaceholders.join(", ")});`; +} + +const insertTemplateStrategies: Partial> = { + tdengine: buildTdengineInsertTemplate, +}; + export function buildTableUpdateTemplate(options: TableSqlTemplateOptions): string { const tableName = templateTableName(options); const columns = options.columns ?? []; @@ -87,7 +132,7 @@ function columnPlaceholderValue(column: ColumnInfo, databaseType?: DatabaseType) if (typeLooksBoolean(dataType)) return databaseType === "mysql" || databaseType === "sqlite" || databaseType === "rqlite" ? "1" : "TRUE"; if (typeLooksDateOnly(dataType)) return "'2024-01-01'"; if (typeLooksTimeOnly(dataType)) return "'12:00:00'"; - if (typeLooksTimestamp(dataType)) return "CURRENT_TIMESTAMP"; + if (typeLooksTimestamp(dataType)) return databaseType === "tdengine" ? "NOW" : "CURRENT_TIMESTAMP"; if (typeLooksJson(dataType)) return databaseType === "postgres" || databaseType === "redshift" ? "'{}'::jsonb" : "'{}'"; if (typeLooksBinary(dataType)) return "''"; if (typeLooksUuid(dataType)) return databaseType === "postgres" || databaseType === "redshift" ? "'00000000-0000-0000-0000-000000000000'::uuid" : "'00000000-0000-0000-0000-000000000000'"; diff --git a/apps/desktop/src/lib/tableTree.ts b/apps/desktop/src/lib/tableTree.ts index 2d4aed2c1d..15ddb13170 100644 --- a/apps/desktop/src/lib/tableTree.ts +++ b/apps/desktop/src/lib/tableTree.ts @@ -22,6 +22,7 @@ export function buildTableTreeNodes({ nodeId, connectionId, database, schema, ta includeSchemaInId: false, name, objectType, + tableType: table.table_type, comment: table.comment, parentSchema: table.parent_schema, parentName: table.parent_name, @@ -49,6 +50,7 @@ function makeTableTreeEntry({ includeSchemaInId, name, objectType, + tableType, comment, parentSchema, parentName, @@ -60,6 +62,7 @@ function makeTableTreeEntry({ includeSchemaInId?: boolean; name: string; objectType: DatabaseObjectTreeKind; + tableType?: string; comment?: string | null; parentSchema?: string | null; parentName?: string | null; @@ -71,6 +74,7 @@ function makeTableTreeEntry({ id: `${nodeId}:${nodeIdSchemaSuffix}${name}`, label: name, type: objectType === "VIEW" ? ("view" as const) : objectType === "MATERIALIZED_VIEW" ? ("materialized_view" as const) : ("table" as const), + tableType, comment, connectionId, database, @@ -235,7 +239,9 @@ export function mergeTableInfosIntoObjects(objects: readonly ObjectInfo[], table seen.add(key); merged.push({ name, - object_type: objectType, + // Keep original driver-reported type (e.g. TDengine STABLE) so + // downstream template strategies can distinguish special table kinds. + object_type: table.table_type, schema: tableSchema, comment: table.comment, created_at: undefined, @@ -414,6 +420,7 @@ function buildObjectTreeEntries({ nodeId, connectionId, database, schema, object schema: childSchema, name, objectType, + tableType: obj.object_type, comment: obj.comment, parentSchema: obj.parent_schema, parentName: obj.parent_name, @@ -450,6 +457,7 @@ export function buildSimpleObjectTreeNodes({ nodeId, connectionId, database, sch schema: childSchema, name, objectType, + tableType: obj.object_type, comment: obj.comment, parentSchema: obj.parent_schema, parentName: obj.parent_name, diff --git a/apps/desktop/src/stores/connectionStore.ts b/apps/desktop/src/stores/connectionStore.ts index 715ff706c6..c37de32c1d 100644 --- a/apps/desktop/src/stores/connectionStore.ts +++ b/apps/desktop/src/stores/connectionStore.ts @@ -458,7 +458,7 @@ export const useConnectionStore = defineStore("connection", () => { } function objectGroupCacheKey(node: TreeNode): string { - return schemaCacheKey(node.connectionId || "", node.database || "", node.schema || "", node.type, "objects-v2"); + return schemaCacheKey(node.connectionId || "", node.database || "", node.schema || "", node.type, "objects-v3"); } function buildLoadMoreNode(parent: TreeNode, offset: number, pageSize: number): TreeNode { @@ -1329,7 +1329,7 @@ export const useConnectionStore = defineStore("connection", () => { await ensureConnected(connectionId); if (useCachedChildren(node, options)) return; const simpleObjectDisplay = useSettingsStore().editorSettings.sidebarObjectDisplay === "simple"; - const cacheKey = schemaCacheKey(connectionId, database, simpleObjectDisplay ? "sqlserver-objects-simple-v2" : "sqlserver-objects-grouped-v2"); + const cacheKey = schemaCacheKey(connectionId, database, simpleObjectDisplay ? "sqlserver-objects-simple-v3" : "sqlserver-objects-grouped-v3"); if (!options?.force) { const cached = await loadPersistedTreeChildren(node, cacheKey); if (cached.hit) { @@ -1475,7 +1475,7 @@ export const useConnectionStore = defineStore("connection", () => { await ensureConnected(connectionId); if (useCachedChildren(node, options)) return; const simpleObjectDisplay = useSettingsStore().editorSettings.sidebarObjectDisplay === "simple"; - const cacheKey = schemaCacheKey(connectionId, database, schema || "", simpleObjectDisplay ? "objects-simple-v2" : "objects-grouped-v2"); + const cacheKey = schemaCacheKey(connectionId, database, schema || "", simpleObjectDisplay ? "objects-simple-v3" : "objects-grouped-v3"); if (!options?.force) { const cached = await loadPersistedTreeChildren(node, cacheKey); if (cached.hit) { diff --git a/apps/desktop/src/types/database.ts b/apps/desktop/src/types/database.ts index 7659dbddf5..c585065fdc 100644 --- a/apps/desktop/src/types/database.ts +++ b/apps/desktop/src/types/database.ts @@ -479,6 +479,7 @@ export interface TreeNode { mqTenant?: string; schema?: string; tableName?: string; + tableType?: string; comment?: string | null; objectCount?: number; loadedKeyCount?: number;