feat: drop database from database switcher (#758)

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - Execute All Statements shortcut (Cmd+Shift+Enter) to run all statements in the editor (#770)
+- Drop database from the database switcher (context menu, toolbar button, Delete key)
 - Structure tab: search, sort, count badges, PK column, Copy As (CSV/JSON/SQL), destructive change confirmation
 - Structure tab: DDL view with tree-sitter highlighting, line numbers, and "Open in Editor"
 - Structure tab: charset/collation (MySQL), index prefix length, partial indexes (PostgreSQL), cross-schema FK

Packages/TableProCore/Sources/TableProPluginKit/PluginDatabaseDriver.swift

@@ -92,6 +92,7 @@ public protocol PluginDatabaseDriver: AnyObject, Sendable {
     func fetchDependentTypes(table: String, schema: String?) async throws -> [(name: String, labels: [String])]
     func fetchDependentSequences(table: String, schema: String?) async throws -> [(name: String, ddl: String)]
     func createDatabase(name: String, charset: String, collation: String?) async throws
+    func dropDatabase(name: String) async throws
     func executeParameterized(query: String, parameters: [String?]) async throws -> PluginQueryResult
 
     // Query building (optional, for NoSQL plugins)
@@ -268,6 +269,11 @@ public extension PluginDatabaseDriver {
         )
     }
 
+    func dropDatabase(name: String) async throws {
+        throw NSError(domain: "PluginDatabaseDriver", code: -1,
+                      userInfo: [NSLocalizedDescriptionKey: "Drop database is not supported by this driver"])
+    }
+
     func switchDatabase(to database: String) async throws {
         throw NSError(
             domain: "TableProPluginKit",

Plugins/BigQueryDriverPlugin/BigQueryPlugin.swift

@@ -209,6 +209,8 @@ final class BigQueryPlugin: NSObject, TableProPlugin, DriverPlugin {
         ]
     }
 
+    static let supportsDropDatabase = true
+
     func createDriver(config: DriverConnectionConfig) -> any PluginDatabaseDriver {
         BigQueryPluginDriver(config: config)
     }

Plugins/BigQueryDriverPlugin/BigQueryPluginDriver.swift

@@ -811,6 +811,12 @@ internal final class BigQueryPluginDriver: PluginDatabaseDriver, @unchecked Send
         _ = try await conn.executeQuery("CREATE SCHEMA `\(escaped)`")
     }
 
+    func dropDatabase(name: String) async throws {
+        guard let conn = connection else { throw BigQueryError.notConnected }
+        let escaped = name.replacingOccurrences(of: "`", with: "\\`")
+        _ = try await conn.executeQuery("DROP SCHEMA `\(escaped)`")
+    }
+
     func generateAddColumnSQL(table: String, column: PluginColumnDefinition) -> String? {
         guard let conn = connection else { return nil }
         let dataset = lock.withLock { _currentDataset } ?? ""

Plugins/CassandraDriverPlugin/CassandraPlugin.swift

@@ -104,6 +104,8 @@ internal final class CassandraPlugin: NSObject, TableProPlugin, DriverPlugin {
         )
     }
 
+    static let supportsDropDatabase = true
+
     func createDriver(config: DriverConnectionConfig) -> any PluginDatabaseDriver {
         CassandraPluginDriver(config: config)
     }
@@ -1244,6 +1246,11 @@ internal final class CassandraPluginDriver: PluginDatabaseDriver, @unchecked Sen
         _ = try await execute(query: query)
     }
 
+    func dropDatabase(name: String) async throws {
+        let safeKs = escapeIdentifier(name)
+        _ = try await execute(query: "DROP KEYSPACE \"\(safeKs)\"")
+    }
+
     func switchDatabase(to database: String) async throws {
         try await connectionActor.switchKeyspace(database)
         stateLock.lock()

Plugins/ClickHouseDriverPlugin/ClickHousePlugin.swift

@@ -53,6 +53,7 @@ final class ClickHousePlugin: NSObject, TableProPlugin, DriverPlugin {
 
     static let structureColumnFields: [StructureColumnField] = [.name, .type, .nullable, .defaultValue, .comment]
     static let supportsQueryProgress = true
+    static let supportsDropDatabase = true
 
     static let sqlDialect: SQLDialectDescriptor? = SQLDialectDescriptor(
         identifierQuote: "`",
@@ -583,6 +584,11 @@ final class ClickHousePluginDriver: PluginDatabaseDriver, @unchecked Sendable {
         _ = try await execute(query: "CREATE DATABASE `\(escapedName)`")
     }
 
+    func dropDatabase(name: String) async throws {
+        let escapedName = name.replacingOccurrences(of: "`", with: "``")
+        _ = try await execute(query: "DROP DATABASE `\(escapedName)`")
+    }
+
     // MARK: - All Tables Metadata
 
     func allTablesMetadataSQL(schema: String?) -> String? {

Plugins/CloudflareD1DriverPlugin/CloudflareD1Plugin.swift

@@ -99,6 +99,8 @@ final class CloudflareD1Plugin: NSObject, TableProPlugin, DriverPlugin {
         )
     ]
 
+    static let supportsDropDatabase = true
+
     func createDriver(config: DriverConnectionConfig) -> any PluginDatabaseDriver {
         CloudflareD1PluginDriver(config: config)
     }

Plugins/CloudflareD1DriverPlugin/CloudflareD1PluginDriver.swift

@@ -512,6 +512,26 @@ final class CloudflareD1PluginDriver: PluginDatabaseDriver, @unchecked Sendable
         lock.unlock()
     }
 
+    func dropDatabase(name: String) async throws {
+        guard let client = getClient() else {
+            throw CloudflareD1Error.notConnected
+        }
+
+        lock.lock()
+        let uuid = databaseNameToUuid[name]
+        lock.unlock()
+
+        guard let databaseId = uuid ?? (isUuid(name) ? name : nil) else {
+            throw CloudflareD1Error(message: String(format: String(localized: "Database '%@' not found"), name))
+        }
+
+        try await client.deleteDatabase(databaseId: databaseId)
+
+        lock.lock()
+        databaseNameToUuid.removeValue(forKey: name)
+        lock.unlock()
+    }
+
     func switchDatabase(to database: String) async throws {
         lock.lock()
         var uuid = databaseNameToUuid[database]

Plugins/CloudflareD1DriverPlugin/D1HttpClient.swift

@@ -260,6 +260,14 @@ final class D1HttpClient: @unchecked Sendable {
         return result
     }
 
+    func deleteDatabase(databaseId: String) async throws {
+        let url = try baseURL(databaseId: databaseId)
+        let data = try await performRequest(url: url, method: "DELETE", body: nil)
+
+        let envelope = try JSONDecoder().decode(D1ApiResponse<D1DatabaseInfo>.self, from: data)
+        try checkApiSuccess(envelope)
+    }
+
     // MARK: - Private Helpers
 
     private func baseURL(databaseId: String?) throws -> URL {

Plugins/MSSQLDriverPlugin/MSSQLPlugin.swift

@@ -93,6 +93,8 @@ final class MSSQLPlugin: NSObject, TableProPlugin, DriverPlugin {
         autoLimitStyle: .top
     )
 
+    static let supportsDropDatabase = true
+
     func createDriver(config: DriverConnectionConfig) -> any PluginDatabaseDriver {
         MSSQLPluginDriver(config: config)
     }
@@ -1362,6 +1364,11 @@ final class MSSQLPluginDriver: PluginDatabaseDriver, @unchecked Sendable {
         _ = try await execute(query: "CREATE DATABASE \(quotedName)")
     }
 
+    func dropDatabase(name: String) async throws {
+        let quotedName = "[\(name.replacingOccurrences(of: "]", with: "]]"))]"
+        _ = try await execute(query: "DROP DATABASE \(quotedName)")
+    }
+
     // MARK: - All Tables Metadata
 
     func allTablesMetadataSQL(schema: String?) -> String? {

Plugins/MongoDBDriverPlugin/MongoDBPlugin.swift

@@ -126,6 +126,8 @@ final class MongoDBPlugin: NSObject, TableProPlugin, DriverPlugin {
         ]
     }
 
+    static let supportsDropDatabase = true
+
     func createDriver(config: DriverConnectionConfig) -> any PluginDatabaseDriver {
         MongoDBPluginDriver(config: config)
     }

Plugins/MongoDBDriverPlugin/MongoDBPluginDriver.swift

@@ -457,6 +457,14 @@ final class MongoDBPluginDriver: PluginDatabaseDriver {
         _ = try await conn.runCommand("{\"drop\": \"__tablepro_init\"}", database: name)
     }
 
+    func dropDatabase(name: String) async throws {
+        guard let conn = mongoConnection else {
+            throw MongoDBPluginError.notConnected
+        }
+
+        _ = try await conn.runCommand("{\"dropDatabase\": 1}", database: name)
+    }
+
     // MARK: - Database Switching
 
     func switchDatabase(to database: String) async throws {

Plugins/MySQLDriverPlugin/MySQLPlugin.swift

@@ -93,6 +93,8 @@ final class MySQLPlugin: NSObject, TableProPlugin, DriverPlugin {
         requiresBackslashEscaping: true
     )
 
+    static let supportsDropDatabase = true
+
     func createDriver(config: DriverConnectionConfig) -> any PluginDatabaseDriver {
         MySQLPluginDriver(config: config)
     }

Plugins/MySQLDriverPlugin/MySQLPluginDriver.swift

@@ -650,6 +650,11 @@ final class MySQLPluginDriver: PluginDatabaseDriver, @unchecked Sendable {
         _ = try await execute(query: query)
     }
 
+    func dropDatabase(name: String) async throws {
+        let escapedName = name.replacingOccurrences(of: "`", with: "``")
+        _ = try await execute(query: "DROP DATABASE `\(escapedName)`")
+    }
+
     // MARK: - Database Switching
 
     func switchDatabase(to database: String) async throws {

Plugins/PostgreSQLDriverPlugin/PostgreSQLPlugin.swift

@@ -66,6 +66,7 @@ final class PostgreSQLPlugin: NSObject, TableProPlugin, DriverPlugin {
     static let supportsForeignKeyDisable = false
     static let requiresReconnectForDatabaseSwitch = true
     static let parameterStyle: ParameterStyle = .dollar
+    static let supportsDropDatabase = true
 
     static let sqlDialect: SQLDialectDescriptor? = SQLDialectDescriptor(
         identifierQuote: "\"",

Plugins/PostgreSQLDriverPlugin/PostgreSQLPluginDriver.swift

@@ -842,6 +842,11 @@ final class PostgreSQLPluginDriver: PluginDatabaseDriver, @unchecked Sendable {
         _ = try await execute(query: query)
     }
 
+    func dropDatabase(name: String) async throws {
+        let escapedName = name.replacingOccurrences(of: "\"", with: "\"\"")
+        _ = try await execute(query: "DROP DATABASE \"\(escapedName)\"")
+    }
+
     // MARK: - All Tables Metadata
 
     func allTablesMetadataSQL(schema: String?) -> String? {

Plugins/PostgreSQLDriverPlugin/RedshiftPluginDriver.swift

@@ -687,6 +687,11 @@ final class RedshiftPluginDriver: PluginDatabaseDriver, @unchecked Sendable {
         _ = try await execute(query: query)
     }
 
+    func dropDatabase(name: String) async throws {
+        let escapedName = name.replacingOccurrences(of: "\"", with: "\"\"")
+        _ = try await execute(query: "DROP DATABASE \"\(escapedName)\"")
+    }
+
     // MARK: - All Tables Metadata
 
     func allTablesMetadataSQL(schema: String?) -> String? {

Plugins/TableProPluginKit/DriverPlugin.swift

@@ -54,6 +54,7 @@ public protocol DriverPlugin: TableProPlugin {
     static var isDownloadable: Bool { get }
     static var postConnectActions: [PostConnectAction] { get }
     static var parameterStyle: ParameterStyle { get }
+    static var supportsDropDatabase: Bool { get }
 }
 
 public extension DriverPlugin {
@@ -114,4 +115,5 @@ public extension DriverPlugin {
     static var parameterStyle: ParameterStyle { .questionMark }
     static var isDownloadable: Bool { false }
     static var postConnectActions: [PostConnectAction] { [] }
+    static var supportsDropDatabase: Bool { false }
 }

Plugins/TableProPluginKit/PluginDatabaseDriver.swift

@@ -78,6 +78,7 @@ public protocol PluginDatabaseDriver: AnyObject, Sendable {
     func fetchDependentTypes(table: String, schema: String?) async throws -> [(name: String, labels: [String])]
     func fetchDependentSequences(table: String, schema: String?) async throws -> [(name: String, ddl: String)]
     func createDatabase(name: String, charset: String, collation: String?) async throws
+    func dropDatabase(name: String) async throws
     func executeParameterized(query: String, parameters: [String?]) async throws -> PluginQueryResult
 
     // Query building (optional, for NoSQL plugins)
@@ -223,6 +224,11 @@ public extension PluginDatabaseDriver {
         throw NSError(domain: "PluginDatabaseDriver", code: -1, userInfo: [NSLocalizedDescriptionKey: "createDatabase not supported"])
     }
 
+    func dropDatabase(name: String) async throws {
+        throw NSError(domain: "PluginDatabaseDriver", code: -1,
+                      userInfo: [NSLocalizedDescriptionKey: "Drop database is not supported by this driver"])
+    }
+
     func switchDatabase(to database: String) async throws {
         throw NSError(
             domain: "TableProPluginKit",

TablePro/Core/Database/DatabaseDriver.swift

@@ -130,6 +130,9 @@ protocol DatabaseDriver: AnyObject {
     /// Create a new database
     func createDatabase(name: String, charset: String, collation: String?) async throws
 
+    /// Drop a database
+    func dropDatabase(name: String) async throws
+
     // MARK: - Maintenance
 
     /// Returns the list of supported maintenance operations (e.g. "VACUUM", "ANALYZE").
@@ -233,6 +236,11 @@ extension DatabaseDriver {
         return true
     }
 
+    func dropDatabase(name: String) async throws {
+        throw NSError(domain: "DatabaseDriver", code: -1,
+                      userInfo: [NSLocalizedDescriptionKey: "Drop database is not supported by this driver"])
+    }
+
     /// Default fetchAllDatabaseMetadata: falls back to per-database calls (N+1).
     /// Drivers should override with a single bulk query where possible.
     func fetchAllDatabaseMetadata() async throws -> [DatabaseMetadata] {

TablePro/Core/Plugins/PluginDriverAdapter.swift

@@ -258,6 +258,10 @@ final class PluginDriverAdapter: DatabaseDriver, SchemaSwitchable {
         try await pluginDriver.createDatabase(name: name, charset: charset, collation: collation)
     }
 
+    func dropDatabase(name: String) async throws {
+        try await pluginDriver.dropDatabase(name: name)
+    }
+
     // MARK: - Batch Operations
 
     func fetchAllColumns() async throws -> [String: [ColumnInfo]] {

TablePro/Core/Plugins/PluginManager+Registration.swift

@@ -366,6 +366,11 @@ extension PluginManager {
             .supportsColumnReorder ?? false
     }
 
+    func supportsDropDatabase(for databaseType: DatabaseType) -> Bool {
+        PluginMetadataRegistry.shared.snapshot(forTypeId: databaseType.pluginTypeId)?
+            .capabilities.supportsDropDatabase ?? false
+    }
+
     func autoLimitStyle(for databaseType: DatabaseType) -> AutoLimitStyle {
         guard let snapshot = PluginMetadataRegistry.shared.snapshot(forTypeId: databaseType.pluginTypeId) else {
             return .limit

TablePro/Core/Plugins/PluginMetadataRegistry+CloudDefaults.swift

@@ -31,7 +31,8 @@ extension PluginMetadataRegistry {
                     supportsForeignKeyDisable: false,
                     supportsReadOnlyMode: true,
                     supportsQueryProgress: false,
-                    requiresReconnectForDatabaseSwitch: false
+                    requiresReconnectForDatabaseSwitch: false,
+                    supportsDropDatabase: false
                 ),
                 schema: PluginMetadataSnapshot.SchemaInfo(
                     defaultSchemaName: "",
@@ -172,7 +173,8 @@ extension PluginMetadataRegistry {
                     supportsForeignKeyDisable: false,
                     supportsReadOnlyMode: true,
                     supportsQueryProgress: false,
-                    requiresReconnectForDatabaseSwitch: false
+                    requiresReconnectForDatabaseSwitch: false,
+                    supportsDropDatabase: true
                 ),
                 schema: PluginMetadataSnapshot.SchemaInfo(
                     defaultSchemaName: "",