Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion TablePro/Core/Database/DatabaseDriver.swift
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,15 @@ enum DatabaseDriverFactory {

private static func resolvePassword(for connection: DatabaseConnection) -> String {
if connection.usePgpass {
return ""
let pgpassHost = connection.additionalFields["pgpassOriginalHost"] ?? connection.host
let pgpassPort = connection.additionalFields["pgpassOriginalPort"]
.flatMap(Int.init) ?? connection.port
return PgpassReader.resolve(
host: pgpassHost.isEmpty ? "localhost" : pgpassHost,
port: pgpassPort,
database: connection.database,
username: connection.username
) ?? ""
}
return ConnectionStorage.shared.loadPassword(for: connection.id) ?? ""
}
Expand Down
8 changes: 7 additions & 1 deletion TablePro/Core/Database/DatabaseManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,12 @@ final class DatabaseManager {
tunnelSSL.clientKeyPath = ""
}

var effectiveFields = connection.additionalFields
if connection.usePgpass {
effectiveFields["pgpassOriginalHost"] = connection.host
effectiveFields["pgpassOriginalPort"] = String(connection.port)
}

return DatabaseConnection(
id: connection.id,
name: connection.name,
Expand All @@ -450,7 +456,7 @@ final class DatabaseManager {
type: connection.type,
sshConfig: SSHConfiguration(),
sslConfig: tunnelSSL,
additionalFields: connection.additionalFields
additionalFields: effectiveFields
)
}

Expand Down
Loading