@sqlrooms/duckdb 0.29.0-rc.1 → 0.29.0-rc.2

package/dist/DuckDbSlice.d.ts

@@ -1,11 +1,12 @@
 import { DataTable, DbSchemaNode, DuckDbConnector, QualifiedTableName, QueryHandle } from '@sqlrooms/duckdb-core';
+import { LoadTableSchemasFilter, LoadTableSchemasFilterFunction } from './loadTableSchemas';
 import { BaseRoomStoreState } from '@sqlrooms/room-store';
 import * as arrow from 'apache-arrow';
 import { StateCreator } from 'zustand';
-export type SchemaAndDatabase = {
-    schema?: string;
-    database?: string;
-};
+/**
+ * Default filter to exclude internal SQLRooms tables, schemas, and databases
+ */
+export declare const createDefaultLoadTableSchemasFilter: (table: QualifiedTableName) => boolean;
 /**
  * State and actions for the DuckDB slice
  */
@@ -69,9 +70,7 @@ export type DuckDbSliceState = {
         /**
          * Load the schemas of the tables in the database.
          */
-        loadTableSchemas(filter?: SchemaAndDatabase & {
-            table?: string;
-        }): Promise<DataTable[]>;
+        loadTableSchemas(filter?: LoadTableSchemasFilter): Promise<DataTable[]>;
         /**
          * @deprecated Use findTableByName instead
          */
@@ -128,7 +127,12 @@ export type DuckDbSliceState = {
          */
         checkTableExists: (tableName: string | QualifiedTableName) => Promise<boolean>;
         /**
-         * Delete a table with optional schema and database
+         * Delete a table or view with optional schema and database.
+         * @param tableName - The name of the relation to delete (qualified or plain)
+         */
+        dropRelation: (tableName: string | QualifiedTableName) => Promise<void>;
+        /**
+         * Delete a table with optional schema and database.
          * @param tableName - The name of the table to delete (qualified or plain)
          */
         dropTable: (tableName: string | QualifiedTableName) => Promise<void>;
@@ -178,11 +182,18 @@ export type DuckDbSliceState = {
 };
 export type CreateDuckDbSliceProps = {
     connector?: DuckDbConnector;
+    /**
+     * Optional filter function to control which tables are included when loading schemas.
+     * By default, filters out tables/schemas/databases starting with '__sqlrooms_'.
+     * @param table - The qualified table name to evaluate
+     * @returns true to include the table, false to exclude it
+     */
+    loadTableSchemasFilter?: LoadTableSchemasFilterFunction | null;
 };
 /**
  * Create a DuckDB slice for managing the connector
  */
-export declare function createDuckDbSlice({ connector, }?: CreateDuckDbSliceProps): StateCreator<DuckDbSliceState>;
+export declare function createDuckDbSlice({ connector, loadTableSchemasFilter, }?: CreateDuckDbSliceProps): StateCreator<DuckDbSliceState>;
 /**
  * @internal
  * Select values from the room store that includes the DuckDB slice.

package/dist/DuckDbSlice.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DuckDbSlice.d.ts","sourceRoot":"","sources":["../src/DuckDbSlice.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,SAAS,EACT,YAAY,EACZ,eAAe,EAMf,kBAAkB,EAClB,WAAW,EAGZ,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,kBAAkB,EAMnB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AAItC,OAAO,EAAC,YAAY,EAAC,MAAM,SAAS,CAAC;AA4CrC,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,EAAE,EAAE;QACF;;WAEG;QACH,SAAS,EAAE,eAAe,CAAC;QAC3B;;WAEG;QACH,MAAM,EAAE,MAAM,CAAC;QAEf,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;QAClC,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;QAEpC;;WAEG;QACH,MAAM,EAAE,SAAS,EAAE,CAAC;QACpB;;WAEG;QACH,cAAc,EAAE;YAAC,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAAA;SAAC,CAAC;QAC9C;;WAEG;QACH,WAAW,CAAC,EAAE,YAAY,EAAE,CAAC;QAC7B;;;;WAIG;QACH,UAAU,EAAE;YAAC,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAAA;SAAC,CAAC;QACzC;;WAEG;QACH,wBAAwB,EAAE,OAAO,CAAC;QAElC;;WAEG;QACH,YAAY,EAAE,CAAC,SAAS,EAAE,eAAe,KAAK,IAAI,CAAC;QAEnD;;WAEG;QACH,UAAU,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;QAEhC;;WAEG;QACH,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;QAE7B;;;;;WAKG;QACH,QAAQ,CACN,SAAS,EAAE,MAAM,GAAG,kBAAkB,EACtC,IAAI,EAAE,KAAK,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAC5C,OAAO,CAAC,SAAS,CAAC,CAAC;QAEtB;;WAEG;QACH,gBAAgB,CACd,MAAM,CAAC,EAAE,iBAAiB,GAAG;YAAC,KAAK,CAAC,EAAE,MAAM,CAAA;SAAC,GAC5C,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;QAExB;;WAEG;QACH,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,CAAC;QAEnD;;WAEG;QACH,gBAAgB,CACd,SAAS,EAAE,MAAM,GAAG,kBAAkB,EACtC,QAAQ,EAAE,MAAM,GACf,IAAI,CAAC;QAER;;;;;;WAMG;QACH,eAAe,CACb,SAAS,EAAE,MAAM,GAAG,kBAAkB,GACrC,SAAS,GAAG,SAAS,CAAC;QAEzB;;;WAGG;QACH,mBAAmB,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;QAC5C;;WAEG;QACH,YAAY,EAAE,MAAM,OAAO,CAAC,eAAe,CAAC,CAAC;QAE7C;;WAEG;QACH,gBAAgB,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;QAEtE;;WAEG;QACH,iBAAiB,EAAE,CACjB,SAAS,EAAE,MAAM,GAAG,kBAAkB,KACnC,OAAO,CAAC,MAAM,CAAC,CAAC;QAErB;;;;WAIG;QACH,UAAU,EAAE,CACV,KAAK,EAAE,MAAM,EACb,OAAO,CAAC,EAAE,MAAM,KACb,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC;QAEjC;;WAEG;QACH,SAAS,EAAE,CAAC,MAAM,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;QAElD;;WAEG;QACH,cAAc,EAAE,CACd,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,MAAM,KACZ,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAAC;QAEpC;;WAEG;QACH,eAAe,EAAE,CAAC,MAAM,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;QAE3D;;WAEG;QACH,gBAAgB,EAAE,CAChB,SAAS,EAAE,MAAM,GAAG,kBAAkB,KACnC,OAAO,CAAC,OAAO,CAAC,CAAC;QAEtB;;;WAGG;QACH,SAAS,EAAE,CAAC,SAAS,EAAE,MAAM,GAAG,kBAAkB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;QAErE;;;;;;WAMG;QACH,oBAAoB,EAAE,CACpB,SAAS,EAAE,MAAM,GAAG,kBAAkB,EACtC,KAAK,EAAE,MAAM,EACb,OAAO,CAAC,EAAE;YACR,OAAO,CAAC,EAAE,OAAO,CAAC;YAClB,IAAI,CAAC,EAAE,OAAO,CAAC;YACf,IAAI,CAAC,EAAE,OAAO,CAAC;YACf,uBAAuB,CAAC,EAAE,OAAO,CAAC;YAClC,WAAW,CAAC,EAAE,WAAW,CAAC;SAC3B,KACE,OAAO,CAAC;YACX,SAAS,EAAE,MAAM,GAAG,kBAAkB,CAAC;YACvC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;SAC9B,CAAC,CAAC;QAEH;;;;WAIG;QACH,eAAe,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CACrC;YACE,KAAK,EAAE,IAAI,CAAC;YACZ,UAAU,EAAE,MAAM,CAAC;YACnB,aAAa,EAAE,MAAM,CAAC;YACtB,aAAa,EAAE,MAAM,CAAC;YACtB,QAAQ,EAAE,MAAM,CAAC;SAClB,GACD;YACE,KAAK,EAAE,KAAK,CAAC;YACb,UAAU,EAAE;gBACV,IAAI,EAAE;oBACJ,UAAU,EAAE;wBACV,KAAK,EAAE,MAAM,CAAC;wBACd,SAAS,EAAE,MAAM,CAAC;wBAClB,UAAU,EAAE,MAAM,CAAC;qBACpB,CAAC;oBACF,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;oBACvC,IAAI,EAAE,MAAM,CAAC;iBACd,CAAC;aACH,EAAE,CAAC;SACL,CACJ,CAAC;KACH,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,SAAS,CAAC,EAAE,eAAe,CAAC;CAC7B,CAAC;AAEF;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,EAChC,SAAuC,GACxC,GAAE,sBAA2B,GAAG,YAAY,CAAC,gBAAgB,CAAC,CA8b9D;AAuGD;;;;;;;;;;GAUG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,EAClC,QAAQ,EAAE,CAAC,KAAK,EAAE,kBAAkB,GAAG,gBAAgB,KAAK,CAAC,GAC5D,CAAC,CAEH"}
+{"version":3,"file":"DuckDbSlice.d.ts","sourceRoot":"","sources":["../src/DuckDbSlice.ts"],"names":[],"mappings":"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"}

package/dist/DuckDbSlice.js

@@ -1,4 +1,5 @@
 import { createDbSchemaTrees, escapeVal, getColValAsNumber, isQualifiedTableName, joinStatements, makeQualifiedTableName, separateLastStatement, } from '@sqlrooms/duckdb-core';
+import { loadTableSchemas, } from './loadTableSchemas';
 import { createSlice, registerCommandsForOwner, unregisterCommandsForOwner, useBaseRoomStore, } from '@sqlrooms/room-store';
 import * as arrow from 'apache-arrow';
 import deepEquals from 'fast-deep-equal';
@@ -6,6 +7,15 @@ import { produce } from 'immer';
 import { z } from 'zod';
 import { createWasmDuckDbConnector } from './connectors/createDuckDbConnector';
 const DUCKDB_COMMAND_OWNER = '@sqlrooms/duckdb';
+const INTERNAL_SQLROOMS_PREFIX = '__sqlrooms_';
+/**
+ * Default filter to exclude internal SQLRooms tables, schemas, and databases
+ */
+export const createDefaultLoadTableSchemasFilter = (table) => {
+    return (!table.table?.startsWith(INTERNAL_SQLROOMS_PREFIX) &&
+        !table.database?.startsWith(INTERNAL_SQLROOMS_PREFIX) &&
+        !table.schema?.startsWith(INTERNAL_SQLROOMS_PREFIX));
+};
 const DropTableCommandInput = z.object({
     tableName: z.string().describe('Name of the table to drop.'),
 });
@@ -33,14 +43,25 @@ const CreateTableFromQueryCommandInput = z.object({
         .default(false)
         .describe('Allow multiple SQL statements where the final one is SELECT.'),
 });
-function isDuckDbPlaceholderViewColumn(columnName, columnType) {
-    return columnName === '__' && columnType.toUpperCase() === 'UNKNOWN';
-}
 /**
  * Create a DuckDB slice for managing the connector
  */
-export function createDuckDbSlice({ connector = createWasmDuckDbConnector(), } = {}) {
+export function createDuckDbSlice({ connector = createWasmDuckDbConnector(), loadTableSchemasFilter = createDefaultLoadTableSchemasFilter, } = {}) {
+    let refreshPromise = null;
+    let pendingSchemaRefresh = false;
     return createSlice((set, get, store) => {
+        /**
+         * Internal helper to load a table schema by exact name, bypassing the visibility filter.
+         * Used when performing exact lookups (e.g., checking if a specific table exists).
+         */
+        const loadTableSchemaByName = async (tableName) => {
+            const qualifiedName = isQualifiedTableName(tableName)
+                ? tableName
+                : makeQualifiedTableName({ table: tableName });
+            const connector = await get().db.getConnector();
+            const [table] = await loadTableSchemas(connector, qualifiedName);
+            return table;
+        };
         return {
             db: {
                 connector, // Will be initialized during init
@@ -60,7 +81,9 @@ export function createDuckDbSlice({ connector = createWasmDuckDbConnector(), } =
                 },
                 initialize: async () => {
                     await get().db.connector.initialize();
-                    await get().db.refreshTableSchemas();
+                    // No await here, we want to continue initializing the room even
+                    // if the table schemas are not refreshed yet
+                    get().db.refreshTableSchemas();
                     registerCommandsForOwner(store, DUCKDB_COMMAND_OWNER, createDuckDbCommands());
                 },
                 getConnector: async () => {
@@ -69,6 +92,18 @@ export function createDuckDbSlice({ connector = createWasmDuckDbConnector(), } =
                 },
                 destroy: async () => {
                     unregisterCommandsForOwner(store, DUCKDB_COMMAND_OWNER);
+                    // Wait for any in-flight refreshTableSchemas() to finish before
+                    // destroying the connector. initialize() fires it without await,
+                    // so it may still be querying the native DuckDB instance; tearing
+                    // that down mid-flight causes a use-after-free segfault.
+                    if (refreshPromise) {
+                        try {
+                            await refreshPromise;
+                        }
+                        catch {
+                            // ignore – we're shutting down
+                        }
+                    }
                     try {
                         if (get().db.connector) {
                             await get().db.connector.destroy();
@@ -174,108 +209,44 @@ export function createDuckDbSlice({ connector = createWasmDuckDbConnector(), } =
                     return await get().db.loadTableSchemas({ schema });
                 },
                 async loadTableSchemas(filter) {
-                    const { schema, database, table } = filter || {};
-                    const sql = `WITH tables_and_views AS (
-              FROM duckdb_tables() SELECT
-                database_name AS database,
-                schema_name AS schema,
-                table_name AS name,
-                sql,
-                comment,
-                estimated_size,
-                FALSE AS isView
-              UNION
-              FROM duckdb_views() SELECT
-                database_name AS database,
-                schema_name AS schema,
-                view_name AS name,
-                sql,
-                comment,
-                NULL estimated_size,
-                TRUE AS isView
-            )
-            SELECT
-                isView,
-                database, schema,
-                name, column_names, column_types,
-                sql, comment,
-                estimated_size
-            FROM (DESCRIBE)
-            LEFT OUTER JOIN tables_and_views USING (database, schema, name)
-            ${schema || database || table
-                        ? `WHERE ${[
-                            schema ? `schema = ${escapeVal(schema)}` : '',
-                            database ? `database = ${escapeVal(database)}` : '',
-                            table ? `name = ${escapeVal(table)}` : '',
-                        ]
-                            .filter(Boolean)
-                            .join(' AND ')}`
-                        : ''}`;
-                    const describeResults = await connector.query(sql);
-                    const newTables = [];
-                    for (let i = 0; i < describeResults.numRows; i++) {
-                        const isView = describeResults.getChild('isView')?.get(i);
-                        const database = describeResults.getChild('database')?.get(i);
-                        const schema = describeResults.getChild('schema')?.get(i);
-                        const table = describeResults.getChild('name')?.get(i);
-                        const sql = describeResults.getChild('sql')?.get(i);
-                        const comment = describeResults.getChild('comment')?.get(i);
-                        const estimatedSize = describeResults
-                            .getChild('estimated_size')
-                            ?.get(i);
-                        const columnNames = describeResults
-                            .getChild('column_names')
-                            ?.get(i);
-                        const columnTypes = describeResults
-                            .getChild('column_types')
-                            ?.get(i);
-                        const columns = [];
-                        for (let di = 0; di < (columnNames?.length ?? 0); di++) {
-                            const columnName = String(columnNames.get(di));
-                            const columnType = String(columnTypes?.get(di));
-                            if (isDuckDbPlaceholderViewColumn(columnName, columnType)) {
-                                continue;
-                            }
-                            columns.push({
-                                name: columnName,
-                                type: columnType,
-                            });
-                        }
-                        newTables.push({
-                            table: makeQualifiedTableName({ database, schema, table }),
-                            database,
-                            schema,
-                            tableName: table,
-                            columns,
-                            sql,
-                            comment,
-                            isView: Boolean(isView),
-                            rowCount: typeof estimatedSize === 'bigint'
-                                ? Number(estimatedSize)
-                                : estimatedSize === null
-                                    ? undefined
-                                    : estimatedSize,
-                        });
-                    }
-                    return newTables;
+                    const connector = await get().db.getConnector();
+                    return loadTableSchemas(connector, {
+                        ...filter,
+                        filterFunction: loadTableSchemasFilter,
+                    });
                 },
                 async checkTableExists(tableName) {
-                    const qualifiedName = isQualifiedTableName(tableName)
+                    const table = await loadTableSchemaByName(tableName);
+                    return Boolean(table);
+                },
+                async dropRelation(tableName) {
+                    const connector = await get().db.getConnector();
+                    const qualifiedTable = isQualifiedTableName(tableName)
                         ? tableName
                         : makeQualifiedTableName({ table: tableName });
-                    const table = (await get().db.loadTableSchemas(qualifiedName))[0];
-                    if (!table) {
-                        return false;
+                    const table = get().db.findTableByName(qualifiedTable) ??
+                        (await loadTableSchemaByName(qualifiedTable));
+                    const isView = table?.isView;
+                    if (isView) {
+                        await connector.query(`DROP VIEW IF EXISTS ${qualifiedTable};`);
                     }
-                    return true;
+                    else {
+                        await connector.query(`DROP TABLE IF EXISTS ${qualifiedTable};`);
+                    }
+                    get().db.refreshTableSchemas();
                 },
                 async dropTable(tableName) {
                     const connector = await get().db.getConnector();
                     const qualifiedTable = isQualifiedTableName(tableName)
                         ? tableName
                         : makeQualifiedTableName({ table: tableName });
+                    const table = get().db.findTableByName(qualifiedTable) ??
+                        (await loadTableSchemaByName(qualifiedTable));
+                    if (table?.isView) {
+                        throw new Error(`"${qualifiedTable}" is a view. Use dropRelation() to remove views.`);
+                    }
                     await connector.query(`DROP TABLE IF EXISTS ${qualifiedTable};`);
-                    await get().db.refreshTableSchemas();
+                    get().db.refreshTableSchemas();
                 },
                 async addTable(tableName, data) {
                     const qualifiedName = isQualifiedTableName(tableName)
@@ -291,14 +262,14 @@ export function createDuckDbSlice({ connector = createWasmDuckDbConnector(), } =
                             replace: true,
                         });
                     }
-                    const newTable = (await db.loadTableSchemas(qualifiedName))[0];
+                    const newTable = await loadTableSchemaByName(qualifiedName);
                     if (!newTable) {
                         throw new Error('Failed to add table');
                     }
                     set((state) => produce(state, (draft) => {
                         draft.db.tables.push(newTable);
                     }));
-                    await get().db.refreshTableSchemas();
+                    get().db.refreshTableSchemas();
                     return newTable;
                 },
                 async setTableRowCount(tableName, rowCount) {
@@ -325,37 +296,50 @@ export function createDuckDbSlice({ connector = createWasmDuckDbConnector(), } =
                         (!database || t.table.database === database));
                 },
                 async refreshTableSchemas() {
+                    if (refreshPromise) {
+                        pendingSchemaRefresh = true;
+                        return refreshPromise;
+                    }
                     set((state) => produce(state, (draft) => {
                         draft.db.isRefreshingTableSchemas = true;
                     }));
-                    try {
-                        const connector = await get().db.getConnector();
-                        const result = await connector.query(`SELECT current_schema() AS schema, current_database() AS database`);
-                        set((state) => produce(state, (draft) => {
-                            draft.db.currentSchema = result.getChild('schema')?.get(0);
-                            draft.db.currentDatabase = result
-                                .getChild('database')
-                                ?.get(0);
-                        }));
-                        const newTables = await get().db.loadTableSchemas();
-                        // Only update if there's an actual change in the schemas
-                        if (!deepEquals(newTables, get().db.tables)) {
+                    refreshPromise = (async () => {
+                        try {
+                            let newTables;
+                            do {
+                                pendingSchemaRefresh = false;
+                                const connector = await get().db.getConnector();
+                                const result = await connector.query(`SELECT current_schema() AS schema, current_database() AS database`);
+                                set((state) => produce(state, (draft) => {
+                                    draft.db.currentSchema = result
+                                        .getChild('schema')
+                                        ?.get(0);
+                                    draft.db.currentDatabase = result
+                                        .getChild('database')
+                                        ?.get(0);
+                                }));
+                                newTables = await get().db.loadTableSchemas();
+                            } while (pendingSchemaRefresh);
+                            if (!deepEquals(newTables, get().db.tables)) {
+                                set((state) => produce(state, (draft) => {
+                                    draft.db.tables = newTables;
+                                    draft.db.schemaTrees = createDbSchemaTrees(newTables);
+                                }));
+                            }
+                            return newTables;
+                        }
+                        catch (err) {
+                            get().room.captureException(err);
+                            return [];
+                        }
+                        finally {
+                            refreshPromise = null;
                             set((state) => produce(state, (draft) => {
-                                draft.db.tables = newTables;
-                                draft.db.schemaTrees = createDbSchemaTrees(newTables);
+                                draft.db.isRefreshingTableSchemas = false;
                             }));
                         }
-                        return newTables;
-                    }
-                    catch (err) {
-                        get().room.captureException(err);
-                        return [];
-                    }
-                    finally {
-                        set((state) => produce(state, (draft) => {
-                            draft.db.isRefreshingTableSchemas = false;
-                        }));
-                    }
+                    })();
+                    return refreshPromise;
                 },
                 async sqlSelectToJson(sql) {
                     const connector = await get().db.getConnector();
@@ -415,10 +399,18 @@ function createDuckDbCommands() {
         },
         {
             id: 'db.drop-table',
-            name: 'Drop table',
-            description: 'Drop a table from DuckDB by name',
+            name: 'Drop relation',
+            description: 'Drop a table or view from DuckDB by name',
             group: 'Database',
-            keywords: ['duckdb', 'database', 'drop', 'table', 'delete'],
+            keywords: [
+                'duckdb',
+                'database',
+                'drop',
+                'table',
+                'view',
+                'relation',
+                'delete',
+            ],
             inputSchema: DropTableCommandInput,
             inputDescription: 'Provide a tableName to remove from DuckDB.',
             metadata: {
@@ -436,11 +428,11 @@ function createDuckDbCommands() {
             },
             execute: async ({ getState }, input) => {
                 const { tableName } = input;
-                await getState().db.dropTable(tableName);
+                await getState().db.dropRelation(tableName);
                 return {
                     success: true,
                     commandId: 'db.drop-table',
-                    message: `Dropped table "${tableName}".`,
+                    message: `Dropped relation "${tableName}".`,
                 };
             },
         },