fix(editor): protect external SQL files from conflicting changes
This commit is contained in:
29 files changed
+1125
-65
No files matched your search
@@ -1284,6 +1284,9 @@ export const useQueryStore = defineStore("query", () => {
|
||||
sql: t.sql,
|
||||
savedSqlId: t.savedSqlId,
|
||||
externalSqlPath: t.externalSqlPath,
|
||||
externalSqlFileVersion: t.externalSqlFileVersion,
|
||||
externalSqlIgnoredFileVersion: t.externalSqlIgnoredFileVersion,
|
||||
externalSqlFileMissing: t.externalSqlFileMissing,
|
||||
lastExecutedSql: t.lastExecutedSql,
|
||||
resultBaseSql: t.resultBaseSql,
|
||||
resultSortedSql: t.resultSortedSql,
|
||||
@@ -1404,7 +1407,7 @@ export const useQueryStore = defineStore("query", () => {
|
||||
});
|
||||
}
|
||||
|
||||
function openExternalSqlFile(connectionId: string, database: string, path: string, sql: string) {
|
||||
function openExternalSqlFile(connectionId: string, database: string, path: string, sql: string, version?: QueryTab["externalSqlFileVersion"]) {
|
||||
const normalizedPath = normalizeExternalSqlPath(path);
|
||||
const existing = tabs.value.find((tab) => tab.mode === "query" && tab.externalSqlPath && normalizeExternalSqlPath(tab.externalSqlPath) === normalizedPath);
|
||||
if (existing) {
|
||||
@@ -1424,6 +1427,7 @@ export const useQueryStore = defineStore("query", () => {
|
||||
sql,
|
||||
originalSql: sql,
|
||||
externalSqlPath: path,
|
||||
externalSqlFileVersion: version,
|
||||
isExecuting: false,
|
||||
isCancelling: false,
|
||||
isExplaining: false,
|
||||
@@ -1858,6 +1862,46 @@ export const useQueryStore = defineStore("query", () => {
|
||||
if (tab) tab.originalSql = tab.sql;
|
||||
}
|
||||
|
||||
function applyExternalSqlFileSnapshot(id: string, sql: string, version: NonNullable<QueryTab["externalSqlFileVersion"]>) {
|
||||
const tab = tabs.value.find((candidate) => candidate.id === id);
|
||||
if (!tab?.externalSqlPath) return;
|
||||
tab.sql = sql;
|
||||
tab.originalSql = sql;
|
||||
tab.externalSqlFileVersion = version;
|
||||
tab.externalSqlIgnoredFileVersion = undefined;
|
||||
tab.externalSqlFileMissing = undefined;
|
||||
}
|
||||
|
||||
function markExternalSqlFileSaved(id: string, version: NonNullable<QueryTab["externalSqlFileVersion"]>) {
|
||||
const tab = tabs.value.find((candidate) => candidate.id === id);
|
||||
if (!tab?.externalSqlPath) return;
|
||||
tab.originalSql = tab.sql;
|
||||
tab.externalSqlFileVersion = version;
|
||||
tab.externalSqlIgnoredFileVersion = undefined;
|
||||
tab.externalSqlFileMissing = undefined;
|
||||
}
|
||||
|
||||
function updateExternalSqlFileVersion(id: string, version: NonNullable<QueryTab["externalSqlFileVersion"]>) {
|
||||
const tab = tabs.value.find((candidate) => candidate.id === id);
|
||||
if (!tab?.externalSqlPath) return;
|
||||
tab.externalSqlFileVersion = version;
|
||||
tab.externalSqlIgnoredFileVersion = undefined;
|
||||
tab.externalSqlFileMissing = undefined;
|
||||
}
|
||||
|
||||
function ignoreExternalSqlFileVersion(id: string, version: NonNullable<QueryTab["externalSqlFileVersion"]>) {
|
||||
const tab = tabs.value.find((candidate) => candidate.id === id);
|
||||
if (!tab?.externalSqlPath) return;
|
||||
tab.externalSqlIgnoredFileVersion = version;
|
||||
tab.externalSqlFileMissing = undefined;
|
||||
}
|
||||
|
||||
function acknowledgeExternalSqlFileMissing(id: string) {
|
||||
const tab = tabs.value.find((candidate) => candidate.id === id);
|
||||
if (!tab?.externalSqlPath) return;
|
||||
tab.externalSqlFileMissing = true;
|
||||
}
|
||||
|
||||
function persistSavedSqlEditorPosition(tab: QueryTab | undefined) {
|
||||
if (!tab?.savedSqlId || tab.mode !== "query") return;
|
||||
const pending = savedSqlEditorPositionTimers.get(tab.savedSqlId);
|
||||
@@ -2545,16 +2589,22 @@ export const useQueryStore = defineStore("query", () => {
|
||||
if (!tab) return;
|
||||
tab.savedSqlId = savedSqlId;
|
||||
tab.externalSqlPath = undefined;
|
||||
tab.externalSqlFileVersion = undefined;
|
||||
tab.externalSqlIgnoredFileVersion = undefined;
|
||||
tab.externalSqlFileMissing = undefined;
|
||||
if (title) {
|
||||
tab.title = title;
|
||||
tab.customTitle = true;
|
||||
}
|
||||
}
|
||||
|
||||
function linkExternalSqlPath(id: string, path: string, title?: string) {
|
||||
function linkExternalSqlPath(id: string, path: string, title?: string, version?: QueryTab["externalSqlFileVersion"]) {
|
||||
const tab = tabs.value.find((t) => t.id === id);
|
||||
if (!tab) return;
|
||||
tab.externalSqlPath = path;
|
||||
tab.externalSqlFileVersion = version;
|
||||
tab.externalSqlIgnoredFileVersion = undefined;
|
||||
tab.externalSqlFileMissing = undefined;
|
||||
tab.savedSqlId = undefined;
|
||||
if (title) {
|
||||
tab.title = title;
|
||||
@@ -5355,6 +5405,11 @@ export const useQueryStore = defineStore("query", () => {
|
||||
completePendingCloseAfterSaveAll,
|
||||
isTabDirty,
|
||||
markTabClean,
|
||||
applyExternalSqlFileSnapshot,
|
||||
markExternalSqlFileSaved,
|
||||
updateExternalSqlFileVersion,
|
||||
ignoreExternalSqlFileVersion,
|
||||
acknowledgeExternalSqlFileMissing,
|
||||
discardTabChanges,
|
||||
requestAppCloseConfirmation,
|
||||
closeOtherTabs,
|
||||
|
||||
Reference in new issue
Block a user