fix(mysql): show inherited charset and collation in structure editor
This commit is contained in:
1 parent
48410b70b4
commit
06dcd0013c
16 files changed
+562
-91
No files matched your search
@@ -37,6 +37,7 @@ import { invalidateObjectMetadataCache, loadObjectMetadataFacet, type ObjectMeta
|
||||
import { invalidateTableMetadataCache } from "@/lib/metadata/tableMetadataCache";
|
||||
import { type BuildTableStructureChangeSqlOptions, type EditableStructureColumn, type EditableStructureForeignKey, type EditableStructureIndex, type EditableStructureTrigger } from "@/lib/table/tableStructureEditorSql";
|
||||
import { buildMysqlAutoIncrementCounterStatement, canEditMysqlAutoIncrementCounter, refreshMysqlAutoIncrementCounterDraft } from "@/lib/table/mysqlAutoIncrementCounter";
|
||||
import { mysqlTableCollationSql, parseMysqlTableCollation } from "@/lib/table/mysqlTableCollation";
|
||||
import { MYSQL_STORAGE_ENGINES_SQL, mysqlTableEngineSql, mysqlTableEngineSqlOption, parseMysqlTableEngineMetadata, refreshMysqlTableEngineDraft, supportsMysqlTableEngine } from "@/lib/table/mysqlTableEngine";
|
||||
import { PRESET_FIELDS_TEMPLATE_ID, createTableColumnTemplateDrafts } from "@/lib/table/tableColumnTemplates";
|
||||
import { getMysqlDataTypeHelp } from "@/lib/table/mysqlDataTypeHelp";
|
||||
@@ -928,6 +929,9 @@ const showCharacterSet = computed(() => structureDialect.value === "mysql");
|
||||
|
||||
const serverCharsetMetadata = ref<CreateDatabaseCharsetMetadata>();
|
||||
const charsetMetadataLoading = ref(false);
|
||||
// The table's own default collation, used only to keep inherited charsets out of the
|
||||
// generated DDL. Columns keep the real values MySQL reports so the pickers stay filled.
|
||||
const mysqlTableDefaultCollation = ref("");
|
||||
|
||||
const mysqlCharsetOptions = computed<string[]>(() => {
|
||||
const meta = serverCharsetMetadata.value;
|
||||
@@ -956,6 +960,22 @@ async function loadCharsetMetadata() {
|
||||
}
|
||||
}
|
||||
|
||||
async function loadMysqlTableDefaultCollation() {
|
||||
if (!showCharacterSet.value || isCreateMode.value || !props.connectionId || !props.database || !props.tableName) {
|
||||
mysqlTableDefaultCollation.value = "";
|
||||
return;
|
||||
}
|
||||
try {
|
||||
await store.ensureConnected(props.connectionId);
|
||||
const result = await api.executeQuery(props.connectionId, props.database, mysqlTableCollationSql(props.database, props.tableName), undefined, undefined, { maxRows: 1 });
|
||||
mysqlTableDefaultCollation.value = parseMysqlTableCollation(result);
|
||||
} catch {
|
||||
// Optional metadata: without it the DDL just spells out the charset the column
|
||||
// already has, which is equivalent SQL — never block the editor on this lookup.
|
||||
mysqlTableDefaultCollation.value = "";
|
||||
}
|
||||
}
|
||||
|
||||
function onCharsetChange(column: EditableStructureColumn, charset: string) {
|
||||
column.characterSet = charset;
|
||||
// If the collation is no longer valid for the new charset, clear it so the
|
||||
@@ -1614,6 +1634,7 @@ function structureChangeOptions(): BuildTableStructureChangeSqlOptions {
|
||||
tableComment: tableComment.value,
|
||||
originalTableComment: isCreateMode.value ? undefined : originalTableComment.value,
|
||||
mysqlEngine: mysqlTableEngineSqlOption({ value: mysqlTableEngine.value, originalValue: originalMysqlTableEngine.value }, isCreateMode.value, supportsMysqlEngine.value && !mysqlTableEngineLoading.value && !mysqlTableEngineLoadError.value),
|
||||
tableCollation: mysqlTableDefaultCollation.value || undefined,
|
||||
partitioned: isPartitionedParent.value,
|
||||
isGaussdbMMode: connection.value?.driver_profile?.toLowerCase() === "gaussdb-m",
|
||||
};
|
||||
@@ -1772,6 +1793,7 @@ function resetState() {
|
||||
mysqlTableEngineLoadRequestId += 1;
|
||||
mysqlTableEngineLoading.value = false;
|
||||
mysqlTableEngineLoadError.value = "";
|
||||
mysqlTableDefaultCollation.value = "";
|
||||
tableOwner.value = "";
|
||||
originalTableOwner.value = "";
|
||||
tableOwnerLoadRequestId += 1;
|
||||
@@ -2040,6 +2062,7 @@ async function loadStructure(
|
||||
// Load live charset/collation metadata from the MySQL server so the column
|
||||
// editor shows the correct options for the server version.
|
||||
void loadCharsetMetadata();
|
||||
void loadMysqlTableDefaultCollation();
|
||||
const nextColumnDrafts = createColumnDrafts(nextColumns, databaseType.value);
|
||||
const hydratedColumnDrafts = supportsCharacterLengthUnits.value && options.characterLengthUnitsAfterSave ? restoreCharacterLengthUnitsAfterSave(databaseType.value, nextColumnDrafts, options.characterLengthUnitsAfterSave) : nextColumnDrafts;
|
||||
columns.value = applyStoredLocalColumnOrder(hydratedColumnDrafts);
|
||||
@@ -3862,6 +3885,7 @@ watch(
|
||||
originalMysqlTableEngine,
|
||||
mysqlTableEngineLoading,
|
||||
mysqlTableEngineLoadError,
|
||||
mysqlTableDefaultCollation,
|
||||
tableOwner,
|
||||
ddlDraft,
|
||||
columns,
|
||||
|
||||
Reference in new issue
Block a user