feat(sqlite): support attached database schema changes
This commit is contained in:
41 files changed
+1219
-129
No files matched your search
@@ -57,7 +57,7 @@ import type { ColumnInfo, ConnectionConfig, ForeignKeyInfo, IndexInfo, ObjectBro
|
||||
import { sortTablesByFkDependency, type TableWithFk } from "@/lib/table/tableDependencySort";
|
||||
import { isSchemaAware } from "@/lib/database/databaseCapabilities";
|
||||
import { supportsSchemaDiagram, supportsTableImport, supportsTableStructureEditing, supportsTableTruncate } from "@/lib/database/databaseFeatureSupport";
|
||||
import { codeMirrorSqlDialect, connectionUsesDatabaseObjectTreeMode, effectiveDatabaseTypeForConnection, tableStructureDatabaseTypeForConnection } from "@/lib/database/jdbcDialect";
|
||||
import { codeMirrorSqlDialect, connectionObjectTreeNodeSchema, connectionUsesDatabaseObjectTreeMode, effectiveDatabaseTypeForConnection, tableStructureDatabaseTypeForConnection } from "@/lib/database/jdbcDialect";
|
||||
import { getTableMetadataCapabilities, type TableMetadataCapabilities } from "@/lib/table/tableMetadataCapabilities";
|
||||
import { buildTableSelectSql } from "@/lib/table/tableSelectSql";
|
||||
import { buildDropObjectSql, buildDropTableSql, buildDuplicateTableStructureSql, buildCopyTableDataSql, buildEmptyTableSql, buildTruncateTableSql, supportsDropTableCascade, supportsTruncateTableCascade, type TableAdminSqlOptions } from "@/lib/database/dbAdminSql";
|
||||
@@ -2076,7 +2076,7 @@ async function loadObjects() {
|
||||
objects,
|
||||
database: props.database,
|
||||
fallbackSchema: schema,
|
||||
needsSchema: needsSchema.value,
|
||||
rowSchema: connectionObjectTreeNodeSchema(props.connection, props.database, selectedSchema.value),
|
||||
});
|
||||
const availableTableIds = new Set(rows.value.filter((row) => row.type === "TABLE").map((row) => row.id));
|
||||
setSelectedTableIds(new Set([...selectedTableIds.value].filter((id) => availableTableIds.has(id))));
|
||||
|
||||
@@ -89,7 +89,8 @@ import { copyNameForTreeNode, isDocumentBrowserTreeNode, objectSourceKindForTree
|
||||
import { dataTabOpenModeFromTreeClick, type DataTabOpenMode } from "@/lib/sidebar/dataTabOpenPolicy";
|
||||
import { isCopySidebarSelectionShortcut, isEditSidebarConnectionShortcut, isPasteSidebarSelectionShortcut } from "@/lib/editor/keyboardShortcuts";
|
||||
import { canRefreshDataTableFromSingleActivationDoubleClick, dataTableDoubleClickAction } from "@/lib/tabs/dataTabActivation";
|
||||
import { buildCreateDatabaseSql, buildDuckDbAttachDatabaseSql, duckDbAttachedDatabaseNameFromPath, supportsCreateDatabaseCharset, uniqueDuckDbAttachedDatabaseName } from "@/lib/database/createDatabaseSql";
|
||||
import { attachedDatabaseNameFromPath, buildCreateDatabaseSql, buildDuckDbAttachDatabaseSql, buildSqliteAttachDatabaseSql, supportsCreateDatabaseCharset, uniqueAttachedDatabaseName } from "@/lib/database/createDatabaseSql";
|
||||
import { SQLITE_DATABASE_FILE_EXTENSIONS } from "@/lib/database/databaseFileDetection";
|
||||
import {
|
||||
buildCreateSchemaSql,
|
||||
buildDropDatabaseSql,
|
||||
@@ -2003,7 +2004,12 @@ const canEditNacosNamespace = computed(() => {
|
||||
|
||||
const isDuckDbConnection = computed(() => {
|
||||
const config = activeNode.value.connectionId ? connectionStore.getConfig(activeNode.value.connectionId) : undefined;
|
||||
return activeNode.value.type === "connection" && connectionNamespaceCreationTarget(config) === "attach";
|
||||
return activeNode.value.type === "connection" && config?.db_type === "duckdb" && connectionNamespaceCreationTarget(config) === "attach";
|
||||
});
|
||||
|
||||
const isSqliteAttachConnection = computed(() => {
|
||||
const config = activeNode.value.connectionId ? connectionStore.getConfig(activeNode.value.connectionId) : undefined;
|
||||
return activeNode.value.type === "connection" && config?.db_type === "sqlite" && connectionNamespaceCreationTarget(config) === "attach";
|
||||
});
|
||||
|
||||
const isConnectionSchemaCreation = computed(() => {
|
||||
@@ -2285,6 +2291,10 @@ async function openCreateDatabase() {
|
||||
await createDuckDbAttachedDatabaseFile();
|
||||
return;
|
||||
}
|
||||
if (isSqliteAttachConnection.value) {
|
||||
await attachSqliteDatabaseFile();
|
||||
return;
|
||||
}
|
||||
openCreateDatabaseDialog();
|
||||
}
|
||||
|
||||
@@ -2374,6 +2384,7 @@ function openConnectionNamespaceCreation() {
|
||||
|
||||
function connectionNamespaceCreationLabel() {
|
||||
if (isDuckDbConnection.value) return t("contextMenu.createDuckDbFile");
|
||||
if (isSqliteAttachConnection.value) return t("contextMenu.attachSqliteDatabase");
|
||||
if (isConnectionSchemaCreation.value) return t("contextMenu.createSchema");
|
||||
return t("contextMenu.createDatabase");
|
||||
}
|
||||
@@ -2447,12 +2458,13 @@ async function createDuckDbAttachedDatabaseFile() {
|
||||
const path = ensureDuckDbFileExtension(selectedPath);
|
||||
await connectionStore.ensureConnected(node.connectionId);
|
||||
const existingDatabases = await api.listDatabases(node.connectionId);
|
||||
const name = uniqueDuckDbAttachedDatabaseName(
|
||||
duckDbAttachedDatabaseNameFromPath(path),
|
||||
const name = uniqueAttachedDatabaseName(
|
||||
attachedDatabaseNameFromPath(path, "duckdb_database"),
|
||||
existingDatabases.map((database) => database.name),
|
||||
);
|
||||
const sql = await buildDuckDbAttachDatabaseSql(path, name);
|
||||
await executeTreeNodeSqlWithProductionGuard(node, sql, { database: "" });
|
||||
const executionResult = await executeTreeNodeSqlWithProductionGuard(node, sql, { database: "" });
|
||||
if (executionResult === undefined) return;
|
||||
|
||||
const config = connectionStore.getConfig(node.connectionId);
|
||||
if (config) {
|
||||
@@ -2470,6 +2482,51 @@ async function createDuckDbAttachedDatabaseFile() {
|
||||
}
|
||||
}
|
||||
|
||||
async function attachSqliteDatabaseFile() {
|
||||
const node = activeNode.value;
|
||||
if (!node.connectionId) return;
|
||||
if (!isTauriRuntime()) {
|
||||
toast(t("contextMenu.attachSqliteDatabaseDesktopOnly"), 4000);
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
const { open } = await import("@tauri-apps/plugin-dialog");
|
||||
const selected = await open({
|
||||
title: t("contextMenu.attachSqliteDatabase"),
|
||||
multiple: false,
|
||||
filters: [{ name: "SQLite", extensions: SQLITE_DATABASE_FILE_EXTENSIONS }],
|
||||
});
|
||||
const path = Array.isArray(selected) ? selected[0] : selected;
|
||||
if (!path || typeof path !== "string") return;
|
||||
|
||||
await connectionStore.ensureConnected(node.connectionId);
|
||||
const existingDatabases = await api.listDatabases(node.connectionId);
|
||||
const name = uniqueAttachedDatabaseName(
|
||||
attachedDatabaseNameFromPath(path, "sqlite_database"),
|
||||
existingDatabases.map((database) => database.name),
|
||||
["main", "temp"],
|
||||
);
|
||||
const sql = await buildSqliteAttachDatabaseSql(path, name);
|
||||
const executionResult = await executeTreeNodeSqlWithProductionGuard(node, sql, { database: "" });
|
||||
if (executionResult === undefined) return;
|
||||
|
||||
const config = connectionStore.getConfig(node.connectionId);
|
||||
if (config) {
|
||||
await connectionStore.updateConnection({
|
||||
...config,
|
||||
attached_databases: [...(config.attached_databases ?? []), { name, path }],
|
||||
});
|
||||
}
|
||||
await connectionStore.ensureVisibleDatabase(node.connectionId, name);
|
||||
await connectionStore.loadDatabases(node.connectionId, { force: true });
|
||||
connectionStore.selectedTreeNodeId = `${node.connectionId}:${name}`;
|
||||
toast(t("contextMenu.attachSqliteDatabaseSuccess", { name }), 3000);
|
||||
} catch (e: any) {
|
||||
toast(t("contextMenu.tableOperationFailed", { message: e?.message || String(e) }), 5000);
|
||||
}
|
||||
}
|
||||
|
||||
async function confirmCreateDatabase() {
|
||||
const node = sidebarFormTarget.value ?? activeNode.value;
|
||||
const name = createDatabaseName.value.trim();
|
||||
|
||||
Reference in new issue
Block a user