fix(oceanbase): preserve partition DDL and toggle storage options
This commit is contained in:
1 parent
8eba12ea2f
commit
fe0dd02f2b
36 files changed
+870
-125
No files matched your search
@@ -1,4 +1,7 @@
|
||||
<script setup lang="ts">
|
||||
import { applyDdlStoragePreference } from "@/lib/sql/ddlStorage";
|
||||
import DdlStorageToggle from "@/components/objects/DdlStorageToggle.vue";
|
||||
|
||||
import { computed, nextTick, onActivated, onBeforeUnmount, onDeactivated, onMounted, ref, shallowRef, watch } from "vue";
|
||||
import { uuid } from "@/lib/common/utils";
|
||||
import { useI18n } from "vue-i18n";
|
||||
@@ -173,7 +176,9 @@ const indexesLoading = ref(false);
|
||||
const foreignKeysLoading = ref(false);
|
||||
const constraintsLoading = ref(false);
|
||||
const triggersLoading = ref(false);
|
||||
const ddlContent = ref("");
|
||||
const rawDdlContent = ref("");
|
||||
const ddlStorageExcluded = ref(settingsStore.editorSettings.excludeDdlStorage);
|
||||
const ddlContent = computed(() => applyDdlStoragePreference(rawDdlContent.value, databaseType.value, ddlStorageExcluded.value));
|
||||
const ddlLoading = ref(false);
|
||||
const ddlEditorContainer = ref<HTMLDivElement>();
|
||||
const ddlSearchPanelRef = ref<InstanceType<typeof EditorSearchPanel>>();
|
||||
@@ -194,6 +199,12 @@ const ddlDraft = ref<string | null>(null);
|
||||
*/
|
||||
const ddlEditingEnabled = computed(() => !isCreateMode.value && !!ddlContent.value.trim());
|
||||
const ddlDirty = computed(() => ddlDraft.value !== null && ddlDraft.value.trim() !== ddlContent.value.trim());
|
||||
watch([() => settingsStore.editorSettings.excludeDdlStorage, ddlDirty], ([exclude, dirty]) => {
|
||||
if (!dirty && ddlStorageExcluded.value !== exclude) {
|
||||
ddlDraft.value = null;
|
||||
ddlStorageExcluded.value = exclude;
|
||||
}
|
||||
});
|
||||
|
||||
function ddlEditorDocument(): string {
|
||||
return ddlDraft.value ?? (ddlContent.value || t("structureEditor.emptyReadonly"));
|
||||
@@ -348,10 +359,10 @@ async function fetchDdl(force = false) {
|
||||
const { ddl } = await loadObjectDdl(ddlRequest(), { force });
|
||||
const dialect = sqlFormatDialectForDbType(databaseType.value);
|
||||
const formatted = await formatSqlForDisplay(ddl, dialect, settingsStore.editorSettings.sqlFormatter);
|
||||
ddlContent.value = settingsStore.editorSettings.generateSqlQuoteIdentifiers ? formatted : omitDdlIdentifierQuotes(formatted, dialect);
|
||||
rawDdlContent.value = settingsStore.editorSettings.generateSqlQuoteIdentifiers ? formatted : omitDdlIdentifierQuotes(formatted, dialect);
|
||||
ddlFetched.value = true;
|
||||
} catch (e: any) {
|
||||
ddlContent.value = `-- Error: ${e?.message || e}`;
|
||||
rawDdlContent.value = `-- Error: ${e?.message || e}`;
|
||||
ddlFetched.value = true;
|
||||
} finally {
|
||||
ddlLoading.value = false;
|
||||
@@ -1394,6 +1405,8 @@ function createCurrentDraft(initialized = true): TableStructureEditorDraft {
|
||||
// Only carried alongside an actual edit: without a draft the baseline is
|
||||
// refetched, and copying every table's DDL into every draft is pure weight.
|
||||
ddlContent: ddlDraft.value === null ? undefined : ddlContent.value,
|
||||
rawDdlContent: ddlDraft.value === null ? undefined : rawDdlContent.value,
|
||||
excludeDdlStorage: ddlStorageExcluded.value,
|
||||
newTableName: newTableName.value,
|
||||
tableComment: tableComment.value,
|
||||
originalTableComment: originalTableComment.value,
|
||||
@@ -1433,7 +1446,8 @@ function restoreDraft(draft: TableStructureEditorDraft) {
|
||||
// Restore the DDL baseline alongside the edit, otherwise the restored script
|
||||
// would read as dirty (or clean) against the wrong reference text.
|
||||
if (draft.ddlContent) {
|
||||
ddlContent.value = draft.ddlContent;
|
||||
rawDdlContent.value = draft.rawDdlContent ?? draft.ddlContent;
|
||||
ddlStorageExcluded.value = draft.excludeDdlStorage ?? false;
|
||||
ddlFetched.value = true;
|
||||
}
|
||||
ddlDraft.value = draft.ddlDraft ?? null;
|
||||
@@ -1504,7 +1518,7 @@ async function hydrateRestoredDraftFromDatabase() {
|
||||
const { ddl } = await loadObjectDdl({ connectionId, database, schema, tableName, catalog });
|
||||
const dialect = sqlFormatDialectForDbType(databaseType.value);
|
||||
const formatted = await formatSqlForDisplay(ddl, dialect, settingsStore.editorSettings.sqlFormatter);
|
||||
ddlContent.value = settingsStore.editorSettings.generateSqlQuoteIdentifiers ? formatted : omitDdlIdentifierQuotes(formatted, dialect);
|
||||
rawDdlContent.value = settingsStore.editorSettings.generateSqlQuoteIdentifiers ? formatted : omitDdlIdentifierQuotes(formatted, dialect);
|
||||
ddlFetched.value = true;
|
||||
nextColumns = applyManticoreDdlColumnExtras(nextColumns, ddl);
|
||||
} catch {
|
||||
@@ -1835,7 +1849,7 @@ function resetState() {
|
||||
triggers.value = [];
|
||||
triggersLoaded.value = false;
|
||||
clearColumnSelection();
|
||||
ddlContent.value = "";
|
||||
rawDdlContent.value = "";
|
||||
ddlDraft.value = null;
|
||||
ddlFetched.value = false;
|
||||
loadedMetadataFacets.clear();
|
||||
@@ -2164,7 +2178,7 @@ async function loadStructure(
|
||||
const { ddl } = await loadObjectDdl({ connectionId, database, schema, tableName, catalog }, { force: options.forceDdl });
|
||||
const dialect = sqlFormatDialectForDbType(databaseType.value);
|
||||
const formatted = await formatSqlForDisplay(ddl, dialect, settingsStore.editorSettings.sqlFormatter);
|
||||
ddlContent.value = settingsStore.editorSettings.generateSqlQuoteIdentifiers ? formatted : omitDdlIdentifierQuotes(formatted, dialect);
|
||||
rawDdlContent.value = settingsStore.editorSettings.generateSqlQuoteIdentifiers ? formatted : omitDdlIdentifierQuotes(formatted, dialect);
|
||||
ddlFetched.value = true;
|
||||
nextColumns = applyManticoreDdlColumnExtras(nextColumns, ddl);
|
||||
} catch {
|
||||
@@ -3773,7 +3787,7 @@ async function applyChanges() {
|
||||
warnings.value = [];
|
||||
sqliteSchemaRevision.value = undefined;
|
||||
ddlFetched.value = false;
|
||||
ddlContent.value = "";
|
||||
rawDdlContent.value = "";
|
||||
ddlDraft.value = null;
|
||||
if (isCreateMode.value) {
|
||||
clearDraft();
|
||||
@@ -5179,6 +5193,7 @@ watch(
|
||||
</div>
|
||||
<template v-else>
|
||||
<div v-if="ddlContent && !ddlSearchOpen" class="absolute right-3 top-3 z-10 flex items-center gap-1.5">
|
||||
<DdlStorageToggle :database-type="databaseType" :disabled="ddlDirty" />
|
||||
<Button v-if="ddlDirty" variant="outline" size="sm" class="h-7 gap-1 px-2" :title="t('structureEditor.resetDdl')" @click="resetDdlDraft">
|
||||
<RotateCcw class="h-3.5 w-3.5" />
|
||||
{{ t("structureEditor.resetDdl") }}
|
||||
|
||||
Reference in new issue
Block a user