fix(neo4j): preserve cypher labels during query execution

This commit is contained in:
Hand Sonic authored and GitHub committed 2026-09-29 11:29:53 +08:00
1 parent 62bf47a0e9
commit 77c542248d
9 files changed
+84 -11

No files matched your search

@@ -206,7 +206,16 @@ import { validateConfigName, generateId, type AiConfigItem, type ConfigNameValid
import { currentExecutableStatementRange, type SqlTextRange } from "@/lib/sql/sqlStatementRanges";
import { executableStatementRangeCacheForDoc, executableStatementRangeStartingAt, type ExecutableStatementRangeCache } from "@/lib/sql/executableStatementRangeCache";
import { EMPTY_TABLE_COLUMN_TEMPLATE_DATA_TYPE, parseTableColumnTemplateFields, TABLE_COLUMN_TEMPLATE_DATABASE_TYPES, tableColumnTemplateRowsToSettings } from "@/lib/table/tableColumnTemplates";
import { DEFAULT_SQL_VARIABLE_SYNTAX_TOGGLES, normalizeSqlVariableSyntaxOverrides, SQL_VARIABLE_SYNTAX_DATABASE_TYPES, SQL_VARIABLE_SYNTAX_KEYS, SQL_VARIABLE_SYNTAX_TOKENS, type SqlVariableSyntaxOverrides, type SqlVariableSyntaxToggles } from "@/lib/sql/sqlVariableSyntax";
import {
DEFAULT_SQL_VARIABLE_SYNTAX_TOGGLES,
normalizeSqlVariableSyntaxOverrides,
resolveSqlVariableSyntaxToggles,
SQL_VARIABLE_SYNTAX_DATABASE_TYPES,
SQL_VARIABLE_SYNTAX_KEYS,
SQL_VARIABLE_SYNTAX_TOKENS,
type SqlVariableSyntaxOverrides,
type SqlVariableSyntaxToggles,
} from "@/lib/sql/sqlVariableSyntax";
import {
buildMcpCherryStudioConfig,
buildMcpCodexConfig,
@@ -772,11 +781,12 @@ function updateExternalSqlEditorMaxMbInput(event: Event) {
}
function sqlVariableSyntaxToggle(key: keyof SqlVariableSyntaxToggles): boolean {
return editSqlVariableSyntaxOverrides.value[editSqlVariableSyntaxDatabaseType.value]?.[key] ?? true;
return resolveSqlVariableSyntaxToggles(editSqlVariableSyntaxOverrides.value, editSqlVariableSyntaxDatabaseType.value)[key];
}
function setSqlVariableSyntaxToggle(key: keyof SqlVariableSyntaxToggles, value: boolean) {
const dbType = editSqlVariableSyntaxDatabaseType.value;
if (dbType === "neo4j" && key === "named") return;
const merged: SqlVariableSyntaxToggles = {
...DEFAULT_SQL_VARIABLE_SYNTAX_TOGGLES,
...editSqlVariableSyntaxOverrides.value[dbType],
@@ -6798,7 +6808,7 @@ onUnmounted(() => {
<div class="text-sm font-medium text-muted-foreground">
{{ t("settings.sqlVariableSyntax") }}
</div>
<p class="text-xs text-muted-foreground">
<p v-if="editSqlVariableSyntaxDatabaseType !== 'neo4j'" class="text-xs text-muted-foreground">
{{ t("settings.sqlVariableSyntaxDescription") }}
</p>
</div>
@@ -6832,7 +6842,13 @@ onUnmounted(() => {
{{ t(`settings.sqlVariableSyntax_${key}Description`) }}
</p>
</div>
<Switch :id="`sql-var-syntax-${key}`" :model-value="sqlVariableSyntaxToggle(key)" :disabled="!editSqlVariableSubstitutionEnabled" class="mt-0.5 shrink-0" @update:model-value="(value) => setSqlVariableSyntaxToggle(key, value as boolean)" />
<Switch
:id="`sql-var-syntax-${key}`"
:model-value="sqlVariableSyntaxToggle(key)"
:disabled="!editSqlVariableSubstitutionEnabled || (editSqlVariableSyntaxDatabaseType === 'neo4j' && key === 'named')"
class="mt-0.5 shrink-0"
@update:model-value="(value) => setSqlVariableSyntaxToggle(key, value as boolean)"
/>
</div>
</div>
</div>