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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Space key toggles FK preview popover on selected cell, rebindable in Settings > Keyboard (#648)

### Fixed

- Accept SQLAlchemy-style connection URLs with driver hints (e.g., `postgresql+psycopg://`) (#642)

## [0.29.0] - 2026-04-09

### Added
Expand Down
3 changes: 3 additions & 0 deletions TablePro/Core/Utilities/Connection/ConnectionURLParser.swift
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,9 @@ struct ConnectionURLParser {
if scheme.hasSuffix("+ssh") {
isSSH = true
scheme = String(scheme.dropLast(4))
} else if let plusIdx = scheme.lastIndex(of: "+"),
!scheme.hasSuffix("+srv") {
scheme = String(scheme[scheme.startIndex..<plusIdx])
}

let dbType: DatabaseType
Expand Down
50 changes: 50 additions & 0 deletions TableProTests/Core/Utilities/DatabaseURLSchemeTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -246,4 +246,54 @@ struct DatabaseURLSchemeTests {
}
#expect(parsed.type == .postgresql)
}

// MARK: - Driver Hint Stripping

@Test("PostgreSQL+psycopg scheme strips driver hint")
func postgresqlPsycopgScheme() {
let result = ConnectionURLParser.parse("postgresql+psycopg://user:pass@localhost:5432/mydb")
guard case .success(let parsed) = result else {
Issue.record("Expected success"); return
}
#expect(parsed.type == .postgresql)
#expect(parsed.host == "localhost")
#expect(parsed.database == "mydb")
}

@Test("PostgreSQL+asyncpg scheme strips driver hint")
func postgresqlAsyncpgScheme() {
let result = ConnectionURLParser.parse("postgresql+asyncpg://user:pass@localhost/mydb")
guard case .success(let parsed) = result else {
Issue.record("Expected success"); return
}
#expect(parsed.type == .postgresql)
}

@Test("MySQL+pymysql scheme strips driver hint")
func mysqlPymysqlScheme() {
let result = ConnectionURLParser.parse("mysql+pymysql://user:pass@localhost:3306/mydb")
guard case .success(let parsed) = result else {
Issue.record("Expected success"); return
}
#expect(parsed.type == .mysql)
}

@Test("MongoDB+srv scheme preserved (not stripped)")
func mongodbSrvPreserved() {
let result = ConnectionURLParser.parse("mongodb+srv://user:pass@cluster.example.com/mydb")
guard case .success(let parsed) = result else {
Issue.record("Expected success"); return
}
#expect(parsed.type == .mongodb)
}

@Test("PostgreSQL+ssh still enables SSH mode")
func postgresqlSshStillWorks() {
let result = ConnectionURLParser.parse("postgresql+ssh://user:pass@localhost/mydb")
guard case .success(let parsed) = result else {
Issue.record("Expected success"); return
}
#expect(parsed.type == .postgresql)
#expect(parsed.isSSH == true)
}
}
Loading