revert(sqlite): remove RC4 Legacy database support
This commit is contained in:
19 files changed
+49
-187
No files matched your search
@@ -141,7 +141,7 @@ import { REDIS_SCAN_PAGE_SIZE_DEFAULT } from "@/lib/redis/redisKeyPattern";
|
||||
import { normalizeRedisDatabaseAliases, redisDatabaseAlias, redisDatabaseLabel } from "@/lib/redis/redisDatabaseAlias";
|
||||
import { normalizeRedisKeyTemplates } from "@/lib/redis/redisKeyTemplates";
|
||||
import { appendAgentDriverUpdateHint, hasAgentDriverUpdate, hasInstalledAgentVersion, type AgentDriverInstallState } from "@/lib/connection/agentDriverInstallHint";
|
||||
import { appendConnectionErrorHints, isMysqlMissingPasswordFailure, isSqliteMissingEncryptionPasswordFailure } from "@/lib/connection/connectionErrorHints";
|
||||
import { appendConnectionErrorHints, isMysqlMissingPasswordFailure } from "@/lib/connection/connectionErrorHints";
|
||||
import { connectionNeedsPasswordPrompt } from "@/lib/connection/connectionPassword";
|
||||
import { appendVisibleDatabaseSelection } from "@/lib/connection/connectionVisibleDatabases";
|
||||
import { buildXuguTypeMemberNodes, isXuguTypeMemberContainer } from "@/lib/sidebar/xuguTypeMembers";
|
||||
@@ -3630,13 +3630,12 @@ export const useConnectionStore = defineStore("connection", () => {
|
||||
rebuildTreeNodes();
|
||||
}
|
||||
|
||||
async function connectDbWithPasswordRetry(config: ConnectionConfig, localAttempt: number): Promise<{ config: ConnectionConfig; id: string; rememberPassword: boolean }> {
|
||||
async function connectDbWithMissingPasswordRetry(config: ConnectionConfig, localAttempt: number): Promise<{ config: ConnectionConfig; id: string; rememberPassword: boolean }> {
|
||||
try {
|
||||
const id = await withConnectionAttemptTimeout(api.connectDb(config, localAttempt), config);
|
||||
return { config, id, rememberPassword: false };
|
||||
} catch (error) {
|
||||
const message = connectionErrorMessage(error);
|
||||
if (!isMysqlMissingPasswordFailure(config, message) && !isSqliteMissingEncryptionPasswordFailure(config, message)) throw error;
|
||||
if (!isMysqlMissingPasswordFailure(config, connectionErrorMessage(error))) throw error;
|
||||
const prompted = await ensureConnectionPassword(config, true);
|
||||
config = prompted.config;
|
||||
ensureLocalConnectionAttemptActive(config.id, localAttempt);
|
||||
@@ -3662,7 +3661,7 @@ export const useConnectionStore = defineStore("connection", () => {
|
||||
await ensureSqlServerLegacyCompatibilityComponentInstalled(config);
|
||||
}
|
||||
ensureLocalConnectionAttemptActive(config.id, localAttempt);
|
||||
const connection = await connectDbWithPasswordRetry(config, localAttempt);
|
||||
const connection = await connectDbWithMissingPasswordRetry(config, localAttempt);
|
||||
config = connection.config;
|
||||
rememberPassword ||= connection.rememberPassword;
|
||||
const id = connection.id;
|
||||
@@ -3905,7 +3904,7 @@ export const useConnectionStore = defineStore("connection", () => {
|
||||
await ensureSqlServerLegacyCompatibilityComponentInstalled(config);
|
||||
}
|
||||
ensureLocalConnectionAttemptActive(connectionId, localAttempt);
|
||||
const connection = await connectDbWithPasswordRetry(config, localAttempt);
|
||||
const connection = await connectDbWithMissingPasswordRetry(config, localAttempt);
|
||||
config = connection.config;
|
||||
rememberPassword ||= connection.rememberPassword;
|
||||
const id = connection.id;
|
||||
|
||||
Reference in new issue
Block a user