From 320e37aa425a43a97c518fa5c4191fc2bb9e83ca Mon Sep 17 00:00:00 2001 From: t8y2 <1156263951@qq.com> Date: Sun, 4 Oct 2026 14:44:51 +0000 Subject: [PATCH] fix(jdbc): expose routine parameter metadata Closes #11045 --- .../components/objects/ObjectSourceDialog.vue | 8 +- .../objects/RoutineMetadataPanel.vue | 24 +- ...ctSourceDialog.jdbcRoutineMetadata.spec.ts | 111 ++++++++ .../__tests__/RoutineMetadataPanel.spec.ts | 18 ++ .../table/__tests__/objectSourceLoad.spec.ts | 33 +++ .../desktop/src/lib/table/objectSourceLoad.ts | 4 +- .../src/lib/table/routineExecutionSql.ts | 1 + .../src/lib/table/routineParameters.ts | 64 ++++- apps/desktop/src/types/database.ts | 16 ++ crates/dbx-core/src/data/transfer.rs | 4 + crates/dbx-core/src/schema/mod.rs | 4 + .../dbx-drivers/src/db/cloudflare_d1/mod.rs | 9 +- crates/dbx-drivers/src/db/rqlite_driver.rs | 9 +- crates/dbx-drivers/src/db/turso_driver.rs | 9 +- crates/dbx-types/src/types.rs | 76 +++++- .../main/java/app/dbx/jdbc/DbxJdbcPlugin.java | 149 ++++++++++ .../java/app/dbx/jdbc/DbxJdbcPluginTest.java | 257 ++++++++++++++++++ 17 files changed, 781 insertions(+), 15 deletions(-) create mode 100644 apps/desktop/src/components/objects/__tests__/ObjectSourceDialog.jdbcRoutineMetadata.spec.ts diff --git a/apps/desktop/src/components/objects/ObjectSourceDialog.vue b/apps/desktop/src/components/objects/ObjectSourceDialog.vue index 184c6039a5..c954578dff 100644 --- a/apps/desktop/src/components/objects/ObjectSourceDialog.vue +++ b/apps/desktop/src/components/objects/ObjectSourceDialog.vue @@ -9,7 +9,7 @@ import { copyToClipboard } from "@/lib/common/clipboard"; import { formatSqlForDisplay, type SqlFormatDialect } from "@/lib/sql/sqlFormatter"; import { buildEditableObjectSource, buildExecutableObjectSourceStatements, executeObjectSourceSave, formatObjectSourceSaveError, resolveObjectSourceEditDraft } from "@/lib/table/objectSourceEditor"; import { loadObjectSourceWithRoutineFallback } from "@/lib/table/objectSourceLoad"; -import { xuguRoutineMetadataFromDefinition, type XuguRoutineMetadata } from "@/lib/table/routineParameters"; +import { jdbcRoutineMetadata, xuguRoutineMetadataFromDefinition, type RoutineMetadata } from "@/lib/table/routineParameters"; import { executeWithProductionSqlGuard } from "@/lib/database/productionExecutionGuard"; import * as api from "@/lib/backend/api"; import QueryEditor from "@/components/editor/QueryEditor.vue"; @@ -57,7 +57,7 @@ const editing = ref(false); const sourceEditable = ref(true); const error = ref(""); const saveError = ref(""); -const routineMetadata = ref(null); +const routineMetadata = ref(null); /** May differ from props.objectType after PROCEDURE/FUNCTION/PACKAGE fallback resolution. */ const resolvedObjectType = ref(props.objectType); let loadSerial = 0; @@ -111,7 +111,8 @@ async function loadSource(nextEditing = props.initialEditing && canEdit.value) { }); if (serial !== loadSerial) return; resolvedObjectType.value = resolvedType; - routineMetadata.value = props.databaseType === "xugu" && (resolvedType === "PROCEDURE" || resolvedType === "FUNCTION") ? xuguRoutineMetadataFromDefinition(result.source) : null; + const isRoutine = resolvedType === "PROCEDURE" || resolvedType === "FUNCTION"; + routineMetadata.value = !isRoutine ? null : result.routine_parameters !== undefined ? jdbcRoutineMetadata(result.routine_parameters) : target.databaseType === "xugu" ? xuguRoutineMetadataFromDefinition(result.source) : null; sourceEditable.value = editableAllowed; const displaySource = resolvedType === "SEQUENCE" ? result.source : editable; const formatted = await formatSqlForDisplay(displaySource, target.formatDialect ?? target.dialect, settingsStore.editorSettings.sqlFormatter); @@ -259,6 +260,7 @@ function closeDialog() {
+import { computed } from "vue"; import { useI18n } from "vue-i18n"; import type { RoutineParameter } from "@/lib/table/routineExecutionSql"; -defineProps<{ +const props = defineProps<{ parameters: RoutineParameter[]; returnType?: string; }>(); const { t } = useI18n(); +const showNullable = computed(() => props.parameters.some((parameter) => parameter.nullable !== undefined && parameter.nullable !== null)); function defaultLabel(parameter: RoutineParameter): string { if (!parameter.hasDefault) return "-"; return parameter.defaultValue?.trim() || "DEFAULT"; } + +function nullableLabel(parameter: RoutineParameter): string { + if (parameter.nullable === true) return t("structureEditor.nullable"); + if (parameter.nullable === false) return t("structureEditor.notNull"); + return "-"; +}