fix(doris): use internal database for external catalogs

This commit is contained in:
t8y2 committed 2026-07-10 15:48:56 +08:00
1 parent 9e2960881b
commit abee51d625
6 files changed
+82 -13

No files matched your search

@@ -201,6 +201,7 @@ interface DataGridProps {
databaseType?: DatabaseType;
connectionId?: string;
database?: string;
executionDatabase?: string;
schema?: string;
context?: "results" | "table-data";
sourceColumns?: Array<string | undefined>;
@@ -1353,7 +1354,7 @@ async function loadServerFilterValues(columnIndex: number, searchValue: string)
limit: SERVER_COLUMN_FILTER_LIMIT,
includeCounts: true,
});
const result = await api.executeQuery(props.connectionId, props.database ?? "", sql, tableMeta.schema ?? props.schema, undefined, {
const result = await api.executeQuery(props.connectionId, props.executionDatabase ?? props.database ?? "", sql, tableMeta.schema ?? props.schema, undefined, {
maxRows: SERVER_COLUMN_FILTER_LIMIT,
fetchSize: SERVER_COLUMN_FILTER_LIMIT,
pageSize: SERVER_COLUMN_FILTER_LIMIT,
@@ -3775,7 +3776,7 @@ async function lastPage() {
const sql = countTarget?.sql;
if (!sql) return;
try {
const result = await api.executeQuery(props.connectionId, props.database ?? "", sql, countTarget.schema);
const result = await api.executeQuery(props.connectionId, props.executionDatabase ?? props.database ?? "", sql, countTarget.schema);
const total = Number(result.rows?.[0]?.[0] ?? 0);
if (total <= 0) return;
const lastPageNum = Math.ceil(total / pageSize.value);
@@ -3809,7 +3810,7 @@ async function calculateTotalRowCount() {
try {
const countTarget = await buildCurrentCountTarget();
if (!countTarget?.sql) return;
const result = await api.executeQuery(props.connectionId, props.database ?? "", countTarget.sql, countTarget.schema);
const result = await api.executeQuery(props.connectionId, props.executionDatabase ?? props.database ?? "", countTarget.sql, countTarget.schema);
const total = Number(result.rows?.[0]?.[0] ?? 0);
if (Number.isFinite(total) && total >= 0) {
manualTotalRowCount.value = total;
@@ -3867,7 +3868,7 @@ const editor = useDataGridEditor({
editable: computed(() => props.editable),
databaseType: computed(() => props.databaseType),
connectionId: computed(() => props.connectionId),
database: computed(() => props.database),
database: computed(() => props.executionDatabase ?? props.database),
tableMeta: computed(() => props.tableMeta),
sourceColumns: computed(() => props.sourceColumns),
canEditExistingRows,
@@ -6188,7 +6189,7 @@ const {
copyInsertTargetLabel: computed(() => props.tableMeta?.tableName ?? props.customSaveHandler?.targetLabel),
databaseType: computed(() => props.databaseType),
connectionId: computed(() => props.connectionId),
database: computed(() => props.database),
database: computed(() => props.executionDatabase ?? props.database),
context: computed(() => props.context),
sourceColumns: visibleSourceColumns,
columnTypes: visibleColumnTypes,
@@ -63,6 +63,7 @@ import { defaultQueryResultArchiveFileName } from "@/lib/query/queryResultArchiv
import { saveQueryResultArchiveFile } from "@/lib/query/queryResultArchiveFile";
import { isTableDataEditable } from "@/lib/table/tableEditing";
import { tableMetaForDataTab } from "@/lib/table/tableDataTabMeta";
import { dataTabExecutionDatabase } from "@/lib/table/dataTabExecutionDatabase";
import { formatShortcut } from "@/lib/editor/shortcutRegistry";
import { effectiveDatabaseTypeForConnection } from "@/lib/database/jdbcDialect";
import { chartableColumnIndexes } from "@/lib/dataGrid/chartData";
@@ -197,6 +198,7 @@ const objectBrowserRef = ref<SearchableBrowserHandle>();
const activeTableMeta = computed(() => props.activeTab.tableMeta);
const activeDataTabTableMeta = computed(() => tableMetaForDataTab(props.activeTab));
const activeEffectiveDatabaseType = computed(() => effectiveDatabaseTypeForConnection(props.activeConnection));
const activeDataTabExecutionDatabase = computed(() => dataTabExecutionDatabase(props.activeConnection, props.activeTab.database, activeDataTabTableMeta.value?.catalog));
function findNodeInTree(nodes: TreeNode[], id: string): TreeNode | undefined {
for (const node of nodes) {
@@ -1388,6 +1390,7 @@ defineExpose({ focusSearch, refreshData, handleModRTarget, requestQueryEditorExe
:database-type="activeEffectiveDatabaseType"
:connection-id="activeTab.connectionId"
:database="activeTab.database"
:execution-database="activeDataTabExecutionDatabase"
:table-meta="activeDataTabTableMeta"
:table-info-tab="activeTab.tableInfoTab"
:page-offset="activeTab.resultPageOffset"