Skip to content

refactor: route ClickHouse partition SQL through the driver's dialect-aware quoting #1503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
datlechin merged 1 commit into from
May 30, 2026
Merged

refactor: route ClickHouse partition SQL through the driver's dialect-aware quoting #1503

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 4 additions & 8 deletions TablePro/Views/Structure/ClickHousePartsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,7 @@ struct ClickHousePartsView: View {
private func optimizeTable() {
Task {
guard let driver = DatabaseManager.shared.driver(for: connectionId) else { return }
let escapedTable = tableName.replacingOccurrences(of: "`", with: "``")
let sql = "OPTIMIZE TABLE `\(escapedTable)` FINAL"
let sql = "OPTIMIZE TABLE \(driver.quoteIdentifier(tableName)) FINAL"
do {
_ = try await driver.execute(query: sql)
await loadParts()
Expand All @@ -138,8 +137,7 @@ struct ClickHousePartsView: View {
guard confirmed else { return }

guard let driver = DatabaseManager.shared.driver(for: connectionId) else { return }
let escapedTable = tableName.replacingOccurrences(of: "`", with: "``")
let sql = "ALTER TABLE `\(escapedTable)` DROP PARTITION '\(partitionValue.replacingOccurrences(of: "'", with: "''"))'"
let sql = "ALTER TABLE \(driver.quoteIdentifier(tableName)) DROP PARTITION '\(driver.escapeStringLiteral(partitionValue))'"
do {
_ = try await driver.execute(query: sql)
selection.removeAll()
Expand All @@ -165,8 +163,7 @@ struct ClickHousePartsView: View {
guard confirmed else { return }

guard let driver = DatabaseManager.shared.driver(for: connectionId) else { return }
let escapedTable = tableName.replacingOccurrences(of: "`", with: "``")
let sql = "ALTER TABLE `\(escapedTable)` DETACH PARTITION '\(partitionValue.replacingOccurrences(of: "'", with: "''"))'"
let sql = "ALTER TABLE \(driver.quoteIdentifier(tableName)) DETACH PARTITION '\(driver.escapeStringLiteral(partitionValue))'"
do {
_ = try await driver.execute(query: sql)
selection.removeAll()
Expand Down Expand Up @@ -197,12 +194,11 @@ struct ClickHousePartsView: View {
}

do {
let escapedTable = tableName.replacingOccurrences(of: "'", with: "''")
let sql = """
SELECT partition, name, rows, bytes_on_disk,
toString(modification_time) AS mod_time, active
FROM system.parts
WHERE database = currentDatabase() AND table = '\(escapedTable)'
WHERE database = currentDatabase() AND table = '\(driver.escapeStringLiteral(tableName))'
ORDER BY partition, name
"""
let result = try await driver.execute(query: sql)
Expand Down
Loading