diff --git a/apple/.swiftlint.yml b/apple/.swiftlint.yml index 18f3dbed90..5221058a23 100644 --- a/apple/.swiftlint.yml +++ b/apple/.swiftlint.yml @@ -209,6 +209,13 @@ custom_rules: excluded_match_kinds: [comment, doccomment] message: "Schema, table and column names, SQL, payloads, hosts and paths are the user's. Log them at .private(mask: .hash), or .private next to a byte count." severity: error + driver_adapter_downcast: + name: "Driver Adapter Downcast" + regex: '\b(as[?!]|is)\s+PluginDriverAdapter\b' + included: ['.*/TablePro/'] + excluded_match_kinds: [comment, doccomment] + message: "Ask DatabaseDriver, or its plugin, for what the call needs: a cast hands every other driver the nil branch." + severity: error # Storage and preferences preference_key_namespace: @@ -295,7 +302,8 @@ custom_rules: regex: '\bSchemaStatementGenerator\(|\bCreateTableStatementComposer\.compose\(|\bgenerateCreateTableStatements\(' excluded: - '.*/(Packages|Plugins)/' - - '.*/(DatabaseManager\+SchemaComposition|StructureTableRebuildHandler|CreateTableStatementComposer|SchemaSyncScriptBuilder)\.swift$' + # CreateTableEligibility only asks whether a probe table has a statement, and sends nothing. + - '.*/(DatabaseManager\+SchemaComposition|StructureTableRebuildHandler|CreateTableStatementComposer|SchemaSyncScriptBuilder|CreateTableEligibility)\.swift$' message: "Compose DDL only on a driver leased for the statement's own scope (DatabaseManager+SchemaComposition)." severity: error result_buffer_handoff: diff --git a/apple/Configs/PluginKit.xcconfig b/apple/Configs/PluginKit.xcconfig index 207ba58516..7664a8dd5a 100644 --- a/apple/Configs/PluginKit.xcconfig +++ b/apple/Configs/PluginKit.xcconfig @@ -1,3 +1,3 @@ // When to raise each, and how the build stamps them: .claude/rules/plugin-system.md, ABI. -TABLEPRO_PLUGINKIT_VERSION = 44 +TABLEPRO_PLUGINKIT_VERSION = 45 TABLEPRO_PLUGINKIT_MINIMUM_VERSION = 19 diff --git a/apple/Packages/TableProCore/Sources/TableProMSSQLCore/MSSQLSchemaQueries.swift b/apple/Packages/TableProCore/Sources/TableProMSSQLCore/MSSQLSchemaQueries.swift index 64913d299a..1c23bef903 100644 --- a/apple/Packages/TableProCore/Sources/TableProMSSQLCore/MSSQLSchemaQueries.swift +++ b/apple/Packages/TableProCore/Sources/TableProMSSQLCore/MSSQLSchemaQueries.swift @@ -239,6 +239,13 @@ public enum MSSQLSchemaQueries { return collation.flatMap(nonEmpty) ?? previous.flatMap(nonEmpty) } + // sp_rename reads its first argument as a multipart name, so each part is bracketed before the whole becomes a + // literal: unbracketed, a schema literally named `[dbo]` names dbo. The new name is one part and stays bare. + public static func renameColumnStatement(schema: String, table: String, column: String, to newName: String) -> String { + let path = [schema, table, column].map { SQLQuoting.identifier($0, quote: .bracket) }.joined(separator: ".") + return "EXEC sp_rename \(MSSQLStringLiteral.quoted(path)), \(MSSQLStringLiteral.quoted(newName)), 'COLUMN'" + } + public static func alterColumnStatement( qualifiedTable: String, column: String, diff --git a/apple/Packages/TableProCore/Tests/TableProMSSQLCoreTests/MSSQLSchemaQueriesTests.swift b/apple/Packages/TableProCore/Tests/TableProMSSQLCoreTests/MSSQLSchemaQueriesTests.swift index f005fd9221..86af97fc78 100644 --- a/apple/Packages/TableProCore/Tests/TableProMSSQLCoreTests/MSSQLSchemaQueriesTests.swift +++ b/apple/Packages/TableProCore/Tests/TableProMSSQLCoreTests/MSSQLSchemaQueriesTests.swift @@ -462,4 +462,16 @@ struct MSSQLSchemaQueriesTests { #expect(MSSQLSchemaQueries.columns(schema: "dbo", table: "t").contains("= 'PRIMARY KEY'")) #expect(MSSQLSchemaQueries.schemas.contains("'information_schema'")) } + + @Test("A rename brackets each part of the column it names, so a schema called [dbo] is not dbo") + func renameColumnBracketsEachPart() { + #expect( + MSSQLSchemaQueries.renameColumnStatement(schema: "sales", table: "orders", column: "id", to: "order_id") + == "EXEC sp_rename N'[sales].[orders].[id]', N'order_id', 'COLUMN'" + ) + #expect( + MSSQLSchemaQueries.renameColumnStatement(schema: "[dbo]", table: "o'rders", column: "a.b", to: "c") + == "EXEC sp_rename N'[[dbo]]].[o''rders].[a.b]', N'c', 'COLUMN'" + ) + } } diff --git a/apple/Packages/TableProCore/Tests/TableProPluginKitTests/PluginSchemaDDLDefaultsTests.swift b/apple/Packages/TableProCore/Tests/TableProPluginKitTests/PluginSchemaDDLDefaultsTests.swift new file mode 100644 index 0000000000..ac1cdfefa3 --- /dev/null +++ b/apple/Packages/TableProCore/Tests/TableProPluginKitTests/PluginSchemaDDLDefaultsTests.swift @@ -0,0 +1,95 @@ +import Foundation +import TableProPluginKit +import Testing + +private final class SchemaLessDDLDriver: PluginDatabaseDriver, @unchecked Sendable { + var supportsSchemas: Bool { false } + var supportsTransactions: Bool { false } + var currentSchema: String? { nil } + var serverVersion: String? { nil } + + func connect() async throws {} + func disconnect() {} + func ping() async throws {} + func execute(query: String) async throws -> PluginQueryResult { + PluginQueryResult(columns: [], columnTypeNames: [], rows: [], rowsAffected: 0, executionTime: 0) + } + + func fetchTables(schema: String?) async throws -> [PluginTableInfo] { [] } + func fetchColumns(table: String, schema: String?) async throws -> [PluginColumnInfo] { [] } + func fetchIndexes(table: String, schema: String?) async throws -> [PluginIndexInfo] { [] } + func fetchForeignKeys(table: String, schema: String?) async throws -> [PluginForeignKeyInfo] { [] } + func fetchTableDDL(table: String, schema: String?) async throws -> String { "" } + func fetchViewDefinition(view: String, schema: String?) async throws -> String { "" } + func fetchTableMetadata(table: String, schema: String?) async throws -> PluginTableMetadata { + PluginTableMetadata(tableName: table) + } + + func fetchDatabases() async throws -> [String] { [] } + func fetchDatabaseMetadata(_ database: String) async throws -> PluginDatabaseMetadata { + PluginDatabaseMetadata(name: database) + } + + func generateAddColumnSQL(table: String, column: PluginColumnDefinition) -> String? { "add \(table)" } + func generateModifyColumnSQL( + table: String, + oldColumn: PluginColumnDefinition, + newColumn: PluginColumnDefinition + ) -> String? { "modify \(table)" } + func generateDropColumnSQL(table: String, columnName: String) -> String? { "drop \(table)" } + func generateAddIndexSQL(table: String, index: PluginIndexDefinition) -> String? { "index \(table)" } + func generateDropIndexSQL(table: String, indexName: String) -> String? { "drop index \(table)" } + func generateModifyIndexSQL(table: String, oldIndexName: String, newIndex: PluginIndexDefinition) -> String? { + "replace index \(table)" + } + func generateAddForeignKeySQL(table: String, fk: PluginForeignKeyDefinition) -> String? { "fk \(table)" } + func generateDropForeignKeySQL(table: String, constraintName: String) -> String? { "drop fk \(table)" } + func generateAddCheckConstraintSQL(table: String, constraint: PluginCheckConstraintDefinition) -> String? { + "check \(table)" + } + func generateDropCheckConstraintSQL(table: String, constraintName: String) -> String? { "drop check \(table)" } + func generateRenameCheckConstraintSQL(table: String, from oldName: String, to newName: String) -> String? { + "rename check \(table)" + } + func generateModifyPrimaryKeySQL( + table: String, + oldColumns: [String], + newColumns: [String], + constraintName: String? + ) -> [String]? { ["pk \(table)"] } + func generateCreateTableSQL(definition: PluginCreateTableDefinition) -> String? { "create \(definition.tableName)" } +} + +struct PluginSchemaDDLDefaultsTests { + private let driver: any PluginDatabaseDriver = SchemaLessDDLDriver() + private let column = PluginColumnDefinition(name: "c", dataType: "TEXT") + + @Test("A driver that answers only the schema-less generators answers the schema-taking ones") + func schemaTakingDefaultsForward() { + let index = PluginIndexDefinition(name: "i", columns: ["c"]) + let fk = PluginForeignKeyDefinition(name: "f", columns: ["c"], referencedTable: "u", referencedColumns: ["id"]) + let check = PluginCheckConstraintDefinition(name: "k", expression: "c <> ''") + + #expect(driver.generateAddColumnSQL(table: "t", schema: "s", column: column) == "add t") + #expect(driver.generateModifyColumnSQL(table: "t", schema: "s", oldColumn: column, newColumn: column) == "modify t") + #expect(driver.generateDropColumnSQL(table: "t", schema: "s", columnName: "c") == "drop t") + #expect(driver.generateAddIndexSQL(table: "t", schema: "s", index: index) == "index t") + #expect(driver.generateDropIndexSQL(table: "t", schema: "s", indexName: "i") == "drop index t") + #expect(driver.generateModifyIndexSQL(table: "t", schema: "s", oldIndexName: "i", newIndex: index) == "replace index t") + #expect(driver.generateAddForeignKeySQL(table: "t", schema: "s", fk: fk) == "fk t") + #expect(driver.generateDropForeignKeySQL(table: "t", schema: "s", constraintName: "f") == "drop fk t") + #expect(driver.generateAddCheckConstraintSQL(table: "t", schema: "s", constraint: check) == "check t") + #expect(driver.generateDropCheckConstraintSQL(table: "t", schema: "s", constraintName: "k") == "drop check t") + #expect(driver.generateRenameCheckConstraintSQL(table: "t", schema: "s", from: "k", to: "m") == "rename check t") + #expect( + driver.generateModifyPrimaryKeySQL( + table: "t", schema: "s", oldColumns: [], newColumns: ["c"], constraintName: nil + ) == ["pk t"] + ) + #expect( + driver.generateCreateTableStatements( + definition: PluginCreateTableDefinition(tableName: "t", columns: [column]), schema: "s" + ) == ["create t"] + ) + } +} diff --git a/apple/Plugins/BigQueryDriverPlugin/BigQueryPluginDriver.swift b/apple/Plugins/BigQueryDriverPlugin/BigQueryPluginDriver.swift index a67fb55d13..f26deec935 100644 --- a/apple/Plugins/BigQueryDriverPlugin/BigQueryPluginDriver.swift +++ b/apple/Plugins/BigQueryDriverPlugin/BigQueryPluginDriver.swift @@ -155,9 +155,9 @@ internal final class BigQueryPluginDriver: PluginDatabaseDriver, @unchecked Send "CREATE OR REPLACE VIEW \(quoteIdentifier(viewName)) AS\nSELECT * FROM table_name;" } - func generateAddColumnSQL(table: String, column: PluginColumnDefinition) -> String? { + func generateAddColumnSQL(table: String, schema: String?, column: PluginColumnDefinition) -> String? { guard let projectId else { return nil } - var sql = "ALTER TABLE \(qualifiedTable(table, schema: nil, projectId: projectId)) " + var sql = "ALTER TABLE \(qualifiedTable(table, schema: schema, projectId: projectId)) " + "ADD COLUMN \(quoteIdentifier(column.name)) \(column.dataType)" if !column.isNullable { sql += " NOT NULL" @@ -168,9 +168,9 @@ internal final class BigQueryPluginDriver: PluginDatabaseDriver, @unchecked Send return sql } - func generateDropColumnSQL(table: String, columnName: String) -> String? { + func generateDropColumnSQL(table: String, schema: String?, columnName: String) -> String? { guard let projectId else { return nil } - return "ALTER TABLE \(qualifiedTable(table, schema: nil, projectId: projectId)) " + return "ALTER TABLE \(qualifiedTable(table, schema: schema, projectId: projectId)) " + "DROP COLUMN \(quoteIdentifier(columnName))" } diff --git a/apple/TablePro/Models/Schema/ClickHousePartStatements.swift b/apple/Plugins/ClickHouseDriverPlugin/ClickHousePartStatements.swift similarity index 51% rename from apple/TablePro/Models/Schema/ClickHousePartStatements.swift rename to apple/Plugins/ClickHouseDriverPlugin/ClickHousePartStatements.swift index c11617c1c6..be4596cdd3 100644 --- a/apple/TablePro/Models/Schema/ClickHousePartStatements.swift +++ b/apple/Plugins/ClickHouseDriverPlugin/ClickHousePartStatements.swift @@ -1,53 +1,44 @@ // // ClickHousePartStatements.swift -// TablePro +// ClickHouseDriverPlugin // import Foundation +import TableProPluginKit // ClickHouse takes the database from a request parameter any tab can move, so every statement names its own. -internal enum ClickHousePartStatements { - internal static func qualifiedName( - database: String, - table: String, - quote: (String) -> String - ) -> String { +nonisolated enum ClickHousePartStatements { + static func qualifiedName(database: String, table: String, quote: (String) -> String) -> String { guard !database.isEmpty else { return quote(table) } return "\(quote(database)).\(quote(table))" } - internal static func optimize( - database: String, - table: String, - quote: (String) -> String - ) -> String { + static func optimize(database: String, table: String, quote: (String) -> String) -> String { "OPTIMIZE TABLE \(qualifiedName(database: database, table: table, quote: quote)) FINAL" } - internal static func dropPartition( + static func dropPartition( database: String, table: String, partitionId: String, quote: (String) -> String ) -> String? { guard isValidPartitionId(partitionId) else { return nil } - let name = qualifiedName(database: database, table: table, quote: quote) - return "ALTER TABLE \(name) DROP PARTITION ID '\(partitionId)'" + return "ALTER TABLE \(qualifiedName(database: database, table: table, quote: quote)) DROP PARTITION ID '\(partitionId)'" } - internal static func detachPartition( + static func detachPartition( database: String, table: String, partitionId: String, quote: (String) -> String ) -> String? { guard isValidPartitionId(partitionId) else { return nil } - let name = qualifiedName(database: database, table: table, quote: quote) - return "ALTER TABLE \(name) DETACH PARTITION ID '\(partitionId)'" + return "ALTER TABLE \(qualifiedName(database: database, table: table, quote: quote)) DETACH PARTITION ID '\(partitionId)'" } // The server's own rule (MergeTreePartInfo::validatePartitionID); it also keeps quotes out of the literal. - internal static func isValidPartitionId(_ id: String) -> Bool { + static func isValidPartitionId(_ id: String) -> Bool { !id.isEmpty && id.unicodeScalars.allSatisfy { scalar in switch scalar { case "0"..."9", "a"..."z", "A"..."Z", "-": true @@ -56,24 +47,30 @@ internal enum ClickHousePartStatements { } } - // With no database of its own, ClickHouse resolves a request against its configured default. - private static func databasePredicate(_ database: String, escape: (String) -> String) -> String { - guard !database.isEmpty else { return "currentDatabase()" } - return "'\(escape(database))'" - } - // `partition` renders a tuple key as `(202401,'eu')` and no key as `tuple()`, so statements name `partition_id`. - internal static func parts( - database: String, - table: String, - escape: (String) -> String - ) -> String { + // With no database of its own, ClickHouse resolves a request against its configured default. + static func parts(database: String, table: String) -> String { """ SELECT partition, partition_id, name, rows, bytes_on_disk, toString(modification_time) AS mod_time, active FROM system.parts - WHERE database = \(databasePredicate(database, escape: escape)) AND table = '\(escape(table))' + WHERE database = \(ClickHousePluginDriver.databaseExpression(database)) \ + AND table = \(ClickHousePluginDriver.stringLiteral(table)) ORDER BY partition, name """ } + + // Column order is `parts`. + static func part(from row: [PluginCellValue]) -> PluginStoragePart? { + guard let name = row[safe: 2]?.asText else { return nil } + return PluginStoragePart( + partition: row[safe: 0]?.asText ?? "", + partitionId: row[safe: 1]?.asText ?? "", + name: name, + rows: row[safe: 3]?.asText.flatMap { UInt64($0) } ?? 0, + bytesOnDisk: row[safe: 4]?.asText.flatMap { UInt64($0) } ?? 0, + modificationTime: row[safe: 5]?.asText ?? "", + isActive: row[safe: 6]?.asText == "1" + ) + } } diff --git a/apple/Plugins/ClickHouseDriverPlugin/ClickHousePluginDriver+StorageParts.swift b/apple/Plugins/ClickHouseDriverPlugin/ClickHousePluginDriver+StorageParts.swift new file mode 100644 index 0000000000..9bd734d4bf --- /dev/null +++ b/apple/Plugins/ClickHouseDriverPlugin/ClickHousePluginDriver+StorageParts.swift @@ -0,0 +1,30 @@ +// +// ClickHousePluginDriver+StorageParts.swift +// ClickHouseDriverPlugin +// + +import Foundation +import TableProPluginKit + +nonisolated extension ClickHousePluginDriver: PluginStorageParts { + func fetchStorageParts(table: String, database: String) async throws -> [PluginStoragePart] { + let result = try await execute(query: ClickHousePartStatements.parts(database: database, table: table)) + return result.rows.compactMap(ClickHousePartStatements.part(from:)) + } + + func mergePartsStatement(table: String, database: String) -> String? { + ClickHousePartStatements.optimize(database: database, table: table, quote: quoteIdentifier) + } + + func dropPartitionStatement(table: String, database: String, partitionId: String) -> String? { + ClickHousePartStatements.dropPartition( + database: database, table: table, partitionId: partitionId, quote: quoteIdentifier + ) + } + + func detachPartitionStatement(table: String, database: String, partitionId: String) -> String? { + ClickHousePartStatements.detachPartition( + database: database, table: table, partitionId: partitionId, quote: quoteIdentifier + ) + } +} diff --git a/apple/TableProTests/Models/Schema/ClickHousePartStatementsTests.swift b/apple/Plugins/ClickHouseDriverTests/ClickHousePartStatementsTests.swift similarity index 78% rename from apple/TableProTests/Models/Schema/ClickHousePartStatementsTests.swift rename to apple/Plugins/ClickHouseDriverTests/ClickHousePartStatementsTests.swift index cdee26b95c..0daab3b546 100644 --- a/apple/TableProTests/Models/Schema/ClickHousePartStatementsTests.swift +++ b/apple/Plugins/ClickHouseDriverTests/ClickHousePartStatementsTests.swift @@ -1,15 +1,14 @@ // // ClickHousePartStatementsTests.swift -// TableProTests +// ClickHouseDriverTests // import Foundation -@testable import TablePro +import TableProPluginKit import Testing struct ClickHousePartStatementsTests { private let quote: (String) -> String = { "`\($0.replacingOccurrences(of: "`", with: "``"))`" } - private let escape: (String) -> String = { $0.replacingOccurrences(of: "'", with: "\\'") } // An unqualified DROP PARTITION deleted data from whichever database the shared driver was last pinned to. @Test("Every statement names the database it was given") @@ -75,9 +74,7 @@ struct ClickHousePartStatementsTests { // `currentDatabase()` answers with the request parameter, so the list showed another database's parts. @Test("The parts read filters on the named database, never the connection's current one") func partsReadNamesTheDatabase() { - let sql = ClickHousePartStatements.parts( - database: "analytics", table: "events", escape: escape - ) + let sql = ClickHousePartStatements.parts(database: "analytics", table: "events") #expect(sql.contains("WHERE database = 'analytics'")) #expect(sql.contains("AND table = 'events'")) #expect(!sql.contains("currentDatabase()")) @@ -85,7 +82,7 @@ struct ClickHousePartStatementsTests { @Test("The parts read selects the partition ID beside the displayed partition value") func partsReadSelectsThePartitionId() { - let sql = ClickHousePartStatements.parts(database: "analytics", table: "events", escape: escape) + let sql = ClickHousePartStatements.parts(database: "analytics", table: "events") #expect(sql.contains("SELECT partition, partition_id, name, rows, bytes_on_disk,")) } @@ -100,7 +97,7 @@ struct ClickHousePartStatementsTests { ClickHousePartStatements.optimize(database: "", table: "events", quote: quote) == "OPTIMIZE TABLE `events` FINAL" ) - let sql = ClickHousePartStatements.parts(database: "", table: "events", escape: escape) + let sql = ClickHousePartStatements.parts(database: "", table: "events") #expect(sql.contains("WHERE database = currentDatabase()")) #expect(!sql.contains("database = ''")) } @@ -112,4 +109,33 @@ struct ClickHousePartStatementsTests { ) #expect(sql == "ALTER TABLE `we``ird`.`ev``ents` DROP PARTITION ID '202401'") } + + @Test("A quote in a table name stays inside the literal") + func tableNameIsEscaped() { + let sql = ClickHousePartStatements.parts(database: "analytics", table: #"o'b\rien"#) + #expect(sql.contains(#"AND table = 'o''b\\rien'"#)) + } + + @Test("A parts row keeps the partition ID a statement names beside the value it shows") + func rowCarriesThePartitionId() throws { + let row: [PluginCellValue] = [ + "(202401,'eu')", + "c1f8e6e2a7b04d4c9e1f0a2b3c4d5e6f", + "c1f8e6e2a7b04d4c9e1f0a2b3c4d5e6f_1_1_0", + "12", + "4096", + "2026-01-05 10:00:00", + "1", + ] + + let parsed = try #require(ClickHousePartStatements.part(from: row)) + + #expect(parsed.partition == "(202401,'eu')") + #expect(parsed.partitionId == "c1f8e6e2a7b04d4c9e1f0a2b3c4d5e6f") + #expect(parsed.name == "c1f8e6e2a7b04d4c9e1f0a2b3c4d5e6f_1_1_0") + #expect(parsed.rows == 12) + #expect(parsed.bytesOnDisk == 4096) + #expect(parsed.modificationTime == "2026-01-05 10:00:00") + #expect(parsed.isActive) + } } diff --git a/apple/Plugins/DamengDriverPlugin/DamengPluginDriver+Editing.swift b/apple/Plugins/DamengDriverPlugin/DamengPluginDriver+Editing.swift index f0c495b41e..33235d3731 100644 --- a/apple/Plugins/DamengDriverPlugin/DamengPluginDriver+Editing.swift +++ b/apple/Plugins/DamengDriverPlugin/DamengPluginDriver+Editing.swift @@ -72,9 +72,9 @@ extension DamengPluginDriver { } } - func generateCreateTableSQL(definition: PluginCreateTableDefinition) -> String? { + func generateCreateTableStatements(definition: PluginCreateTableDefinition, schema: String?) -> [String]? { guard !definition.columns.isEmpty else { return nil } - let table = qualifiedName(schema: nil, object: definition.tableName) + let table = qualifiedName(schema: schema, object: definition.tableName) let primaryKeys = definition.columns.filter(\.isPrimaryKey) let inlinePrimaryKey = primaryKeys.count == 1 var definitions = definition.columns.map { columnDefinition($0, inlinePrimaryKey: inlinePrimaryKey) } @@ -88,8 +88,7 @@ extension DamengPluginDriver { guard let comment = column.comment, !comment.isEmpty else { return nil } return "COMMENT ON COLUMN \(table).\(quoteIdentifier(column.name)) IS \(stringLiteral(comment))" } - let statements = [createTable] + indexes + comments - return statements.joined(separator: ";\n") + ";" + return [createTable] + indexes + comments } func generateColumnDefinitionSQL(column: PluginColumnDefinition) -> String? { @@ -104,16 +103,17 @@ extension DamengPluginDriver { foreignKeyDefinition(fk) } - func generateAddColumnSQL(table: String, column: PluginColumnDefinition) -> String? { - "ALTER TABLE \(qualifiedName(schema: nil, object: table)) ADD \(columnDefinition(column, inlinePrimaryKey: false))" + func generateAddColumnSQL(table: String, schema: String?, column: PluginColumnDefinition) -> String? { + "ALTER TABLE \(qualifiedName(schema: schema, object: table)) ADD \(columnDefinition(column, inlinePrimaryKey: false))" } func generateModifyColumnSQL( table: String, + schema: String?, oldColumn: PluginColumnDefinition, newColumn: PluginColumnDefinition ) -> String? { - let qualifiedTable = qualifiedName(schema: nil, object: table) + let qualifiedTable = qualifiedName(schema: schema, object: table) var statements: [String] = [] if oldColumn.name != newColumn.name { statements.append( @@ -131,33 +131,34 @@ extension DamengPluginDriver { return statements.isEmpty ? nil : statements.joined(separator: ";\n") } - func generateDropColumnSQL(table: String, columnName: String) -> String? { - "ALTER TABLE \(qualifiedName(schema: nil, object: table)) DROP COLUMN \(quoteIdentifier(columnName))" + func generateDropColumnSQL(table: String, schema: String?, columnName: String) -> String? { + "ALTER TABLE \(qualifiedName(schema: schema, object: table)) DROP COLUMN \(quoteIdentifier(columnName))" } - func generateAddIndexSQL(table: String, index: PluginIndexDefinition) -> String? { - indexDefinition(index, table: qualifiedName(schema: nil, object: table)) + func generateAddIndexSQL(table: String, schema: String?, index: PluginIndexDefinition) -> String? { + indexDefinition(index, table: qualifiedName(schema: schema, object: table)) } - func generateDropIndexSQL(table: String, indexName: String) -> String? { - "DROP INDEX \(qualifiedName(schema: nil, object: indexName))" + func generateDropIndexSQL(table: String, schema: String?, indexName: String) -> String? { + "DROP INDEX \(qualifiedName(schema: schema, object: indexName))" } - func generateAddForeignKeySQL(table: String, fk: PluginForeignKeyDefinition) -> String? { - "ALTER TABLE \(qualifiedName(schema: nil, object: table)) ADD \(foreignKeyDefinition(fk))" + func generateAddForeignKeySQL(table: String, schema: String?, fk: PluginForeignKeyDefinition) -> String? { + "ALTER TABLE \(qualifiedName(schema: schema, object: table)) ADD \(foreignKeyDefinition(fk))" } - func generateDropForeignKeySQL(table: String, constraintName: String) -> String? { - "ALTER TABLE \(qualifiedName(schema: nil, object: table)) DROP CONSTRAINT \(quoteIdentifier(constraintName))" + func generateDropForeignKeySQL(table: String, schema: String?, constraintName: String) -> String? { + "ALTER TABLE \(qualifiedName(schema: schema, object: table)) DROP CONSTRAINT \(quoteIdentifier(constraintName))" } func generateModifyPrimaryKeySQL( table: String, + schema: String?, oldColumns: [String], newColumns: [String], constraintName: String? ) -> [String]? { - let qualifiedTable = qualifiedName(schema: nil, object: table) + let qualifiedTable = qualifiedName(schema: schema, object: table) var statements: [String] = [] if !oldColumns.isEmpty { if let constraintName, !constraintName.isEmpty { diff --git a/apple/Plugins/DuckDBDriverPlugin/DuckDBPlugin.swift b/apple/Plugins/DuckDBDriverPlugin/DuckDBPlugin.swift index eab2cca22e..b25bb6fef5 100644 --- a/apple/Plugins/DuckDBDriverPlugin/DuckDBPlugin.swift +++ b/apple/Plugins/DuckDBDriverPlugin/DuckDBPlugin.swift @@ -1279,22 +1279,13 @@ final class DuckDBPluginDriver: PluginDatabaseDriver, @unchecked Sendable { // MARK: - Create Table DDL - /// The shape an older app runs: the table and its indexes. The sequences and column comments - /// need statements of their own, which only `generateCreateTableStatements` returns. - func generateCreateTableSQL(definition: PluginCreateTableDefinition) -> String? { - guard let statements = generateCreateTableStatements(definition: definition) else { return nil } - let sequenceCount = definition.columns.filter(\.autoIncrement).count - let tableAndIndexes = statements.dropFirst(sequenceCount).prefix(1 + definition.indexes.count) - return tableAndIndexes.map { $0 + ";" }.joined(separator: "\n\n") - } - - func generateCreateTableStatements(definition: PluginCreateTableDefinition) -> [String]? { + func generateCreateTableStatements(definition: PluginCreateTableDefinition, schema: String?) -> [String]? { guard !definition.columns.isEmpty, definition.columns.allSatisfy({ Self.columnTextRefusal(for: $0) == nil }), definition.indexes.allSatisfy({ Self.indexExpressionRefusal(for: $0) == nil }) else { return nil } - let schema = resolveSchema(nil) + let schema = resolveSchema(schema) let table = definition.tableName let qualifiedTable = "\(quoteIdentifier(schema)).\(quoteIdentifier(table))" let pkColumns = definition.columns.filter { $0.isPrimaryKey } @@ -1436,23 +1427,29 @@ final class DuckDBPluginDriver: PluginDatabaseDriver, @unchecked Sendable { return def } - private func qualifiedTableName(_ table: String) -> String { - "\(quoteIdentifier(resolveSchema(nil))).\(quoteIdentifier(table))" + private func qualifiedTableName(_ table: String, schema: String?) -> String { + "\(quoteIdentifier(resolveSchema(schema))).\(quoteIdentifier(table))" } // MARK: - ALTER TABLE DDL // One statement only; an auto-increment column needs its sequence created first, so it is unsupported here. - func generateAddColumnSQL(table: String, column: PluginColumnDefinition) -> String? { + func generateAddColumnSQL(table: String, schema: String?, column: PluginColumnDefinition) -> String? { guard !column.autoIncrement, Self.columnTextRefusal(for: column) == nil else { return nil } - let schema = resolveSchema(nil) - let colDef = duckdbColumnDefinition(column, schema: schema, table: table, inlinePK: false, inCreateTable: false) - return "ALTER TABLE \(qualifiedTableName(table)) ADD COLUMN \(colDef)" + let colDef = duckdbColumnDefinition( + column, schema: resolveSchema(schema), table: table, inlinePK: false, inCreateTable: false + ) + return "ALTER TABLE \(qualifiedTableName(table, schema: schema)) ADD COLUMN \(colDef)" } - func generateModifyColumnSQL(table: String, oldColumn: PluginColumnDefinition, newColumn: PluginColumnDefinition) -> String? { + func generateModifyColumnSQL( + table: String, + schema: String?, + oldColumn: PluginColumnDefinition, + newColumn: PluginColumnDefinition + ) -> String? { guard Self.columnTextRefusal(for: newColumn) == nil else { return nil } - let qt = qualifiedTableName(table) + let qt = qualifiedTableName(table, schema: schema) var stmts: [String] = [] if oldColumn.name != newColumn.name { @@ -1481,29 +1478,35 @@ final class DuckDBPluginDriver: PluginDatabaseDriver, @unchecked Sendable { return stmts.isEmpty ? nil : stmts.joined(separator: ";\n") } - func generateDropColumnSQL(table: String, columnName: String) -> String? { - "ALTER TABLE \(qualifiedTableName(table)) DROP COLUMN \(quoteIdentifier(columnName))" + func generateDropColumnSQL(table: String, schema: String?, columnName: String) -> String? { + "ALTER TABLE \(qualifiedTableName(table, schema: schema)) DROP COLUMN \(quoteIdentifier(columnName))" } - func generateAddIndexSQL(table: String, index: PluginIndexDefinition) -> String? { + func generateAddIndexSQL(table: String, schema: String?, index: PluginIndexDefinition) -> String? { guard Self.indexExpressionRefusal(for: index) == nil else { return nil } - return duckdbIndexDefinition(index, qualifiedTable: qualifiedTableName(table)) + return duckdbIndexDefinition(index, qualifiedTable: qualifiedTableName(table, schema: schema)) } - func generateDropIndexSQL(table: String, indexName: String) -> String? { - "DROP INDEX \(quoteIdentifier(indexName))" + func generateDropIndexSQL(table: String, schema: String?, indexName: String) -> String? { + "DROP INDEX \(quoteIdentifier(resolveSchema(schema))).\(quoteIdentifier(indexName))" } - func generateAddForeignKeySQL(table: String, fk: PluginForeignKeyDefinition) -> String? { - duckdbForeignKeyDefinition(fk).map { "ALTER TABLE \(qualifiedTableName(table)) ADD \($0)" } + func generateAddForeignKeySQL(table: String, schema: String?, fk: PluginForeignKeyDefinition) -> String? { + duckdbForeignKeyDefinition(fk).map { "ALTER TABLE \(qualifiedTableName(table, schema: schema)) ADD \($0)" } } - func generateDropForeignKeySQL(table: String, constraintName: String) -> String? { - "ALTER TABLE \(qualifiedTableName(table)) DROP CONSTRAINT \(quoteIdentifier(constraintName))" + func generateDropForeignKeySQL(table: String, schema: String?, constraintName: String) -> String? { + "ALTER TABLE \(qualifiedTableName(table, schema: schema)) DROP CONSTRAINT \(quoteIdentifier(constraintName))" } - func generateModifyPrimaryKeySQL(table: String, oldColumns: [String], newColumns: [String], constraintName: String?) -> [String]? { - let qt = qualifiedTableName(table) + func generateModifyPrimaryKeySQL( + table: String, + schema: String?, + oldColumns: [String], + newColumns: [String], + constraintName: String? + ) -> [String]? { + let qt = qualifiedTableName(table, schema: schema) var stmts: [String] = [] if !oldColumns.isEmpty { let name = constraintName.map { quoteIdentifier($0) } ?? "/* unknown constraint */" diff --git a/apple/Plugins/MSSQLDriverPlugin/MSSQLPluginDriver+DDL.swift b/apple/Plugins/MSSQLDriverPlugin/MSSQLPluginDriver+DDL.swift index 04ee0192ab..a989ce81b2 100644 --- a/apple/Plugins/MSSQLDriverPlugin/MSSQLPluginDriver+DDL.swift +++ b/apple/Plugins/MSSQLDriverPlugin/MSSQLPluginDriver+DDL.swift @@ -11,12 +11,8 @@ import TableProPluginKit extension MSSQLPluginDriver { // MARK: - Create Table DDL - func generateCreateTableSQL(definition: PluginCreateTableDefinition) -> String? { - MSSQLTableDefinitionSQL.createTable(definition, schema: currentSchemaName) - } - - func generateCreateTableStatements(definition: PluginCreateTableDefinition) -> [String]? { - MSSQLTableDefinitionSQL.createTableStatements(definition, schema: currentSchemaName) + func generateCreateTableStatements(definition: PluginCreateTableDefinition, schema: String?) -> [String]? { + MSSQLTableDefinitionSQL.createTableStatements(definition, schema: effectiveSchema(schema)) } func objectCommentStatement(name: String, objectType: String, schema: String?, comment: String?) -> String? { @@ -27,8 +23,8 @@ extension MSSQLPluginDriver { // MARK: - ALTER TABLE DDL - private func mssqlQualifiedTable(_ table: String) -> String { - MSSQLTableDefinitionSQL.qualifiedTable(table, schema: currentSchemaName) + private func mssqlQualifiedTable(_ table: String, schema: String?) -> String { + MSSQLTableDefinitionSQL.qualifiedTable(table, schema: effectiveSchema(schema)) } func schemaOperationRefusal(_ operation: PluginSchemaOperation) -> String? { @@ -48,18 +44,23 @@ extension MSSQLPluginDriver { } } - func generateAddColumnSQL(table: String, column: PluginColumnDefinition) -> String? { + func generateAddColumnSQL(table: String, schema: String?, column: PluginColumnDefinition) -> String? { guard let columnSQL = MSSQLTableDefinitionSQL.columnDefinition(column, inlinePrimaryKey: nil) else { return nil } - let addColumn = "ALTER TABLE \(mssqlQualifiedTable(table)) ADD \(columnSQL)" + let addColumn = "ALTER TABLE \(mssqlQualifiedTable(table, schema: schema)) ADD \(columnSQL)" guard let comment = column.comment, !comment.isEmpty else { return addColumn } let description = MSSQLTableDefinitionSQL.columnDescriptionStatement( - schema: currentSchemaName, table: table, column: column.name, comment: comment + schema: effectiveSchema(schema), table: table, column: column.name, comment: comment ) return addColumn + ";\n" + description } - func generateModifyColumnSQL(table: String, oldColumn: PluginColumnDefinition, newColumn: PluginColumnDefinition) -> String? { - let qt = mssqlQualifiedTable(table) + func generateModifyColumnSQL( + table: String, + schema: String?, + oldColumn: PluginColumnDefinition, + newColumn: PluginColumnDefinition + ) -> String? { + let qt = mssqlQualifiedTable(table, schema: schema) var stmts: [String] = [] let alteration = Self.columnAlteration(from: oldColumn, to: newColumn) let needsTypeChange = alteration.writesType @@ -67,9 +68,9 @@ extension MSSQLPluginDriver { // Rename column first so subsequent statements reference the correct name if oldColumn.name != newColumn.name { - let path = MSSQLStringLiteral.quoted("\(currentSchemaName).\(table).\(oldColumn.name)") - let renamed = MSSQLStringLiteral.quoted(newColumn.name) - stmts.append("EXEC sp_rename \(path), \(renamed), 'COLUMN'") + stmts.append(MSSQLSchemaQueries.renameColumnStatement( + schema: effectiveSchema(schema), table: table, column: oldColumn.name, to: newColumn.name + )) } let colName = quoteIdentifier(newColumn.name) @@ -123,47 +124,51 @@ extension MSSQLPluginDriver { return (old.dataType != new.dataType || old.isNullable != new.isNullable || changesCollation, collation) } - func generateDropColumnSQL(table: String, columnName: String) -> String? { - "ALTER TABLE \(mssqlQualifiedTable(table)) DROP COLUMN \(quoteIdentifier(columnName))" + func generateDropColumnSQL(table: String, schema: String?, columnName: String) -> String? { + "ALTER TABLE \(mssqlQualifiedTable(table, schema: schema)) DROP COLUMN \(quoteIdentifier(columnName))" } - func generateAddIndexSQL(table: String, index: PluginIndexDefinition) -> String? { - MSSQLTableDefinitionSQL.indexDefinition(index, qualifiedTable: mssqlQualifiedTable(table)) + func generateAddIndexSQL(table: String, schema: String?, index: PluginIndexDefinition) -> String? { + MSSQLTableDefinitionSQL.indexDefinition(index, qualifiedTable: mssqlQualifiedTable(table, schema: schema)) } - func generateDropIndexSQL(table: String, indexName: String) -> String? { - "DROP INDEX \(quoteIdentifier(indexName)) ON \(mssqlQualifiedTable(table))" + func generateDropIndexSQL(table: String, schema: String?, indexName: String) -> String? { + "DROP INDEX \(quoteIdentifier(indexName)) ON \(mssqlQualifiedTable(table, schema: schema))" } - func generateAddForeignKeySQL(table: String, fk: PluginForeignKeyDefinition) -> String? { - MSSQLTableDefinitionSQL.foreignKeyDefinition(fk, defaultSchema: currentSchemaName).map { - "ALTER TABLE \(mssqlQualifiedTable(table)) ADD \($0)" + func generateAddForeignKeySQL(table: String, schema: String?, fk: PluginForeignKeyDefinition) -> String? { + MSSQLTableDefinitionSQL.foreignKeyDefinition(fk, defaultSchema: effectiveSchema(schema)).map { + "ALTER TABLE \(mssqlQualifiedTable(table, schema: schema)) ADD \($0)" } } - func generateDropForeignKeySQL(table: String, constraintName: String) -> String? { - "ALTER TABLE \(mssqlQualifiedTable(table)) DROP CONSTRAINT \(quoteIdentifier(constraintName))" + func generateDropForeignKeySQL(table: String, schema: String?, constraintName: String) -> String? { + "ALTER TABLE \(mssqlQualifiedTable(table, schema: schema)) DROP CONSTRAINT \(quoteIdentifier(constraintName))" } - func generateAddCheckConstraintSQL(table: String, constraint: PluginCheckConstraintDefinition) -> String? { + func generateAddCheckConstraintSQL( + table: String, + schema: String?, + constraint: PluginCheckConstraintDefinition + ) -> String? { let expression = constraint.expression.trimmingCharacters(in: .whitespacesAndNewlines) let check = "(" + expression + ")" guard !expression.isEmpty, !constraint.name.isEmpty, MSSQLDefinitionText.isParenthesizedExpression(check) else { return nil } - return "ALTER TABLE \(mssqlQualifiedTable(table)) ADD CONSTRAINT " + return "ALTER TABLE \(mssqlQualifiedTable(table, schema: schema)) ADD CONSTRAINT " + "\(quoteIdentifier(constraint.name)) CHECK \(check)" } - func generateDropCheckConstraintSQL(table: String, constraintName: String) -> String? { + func generateDropCheckConstraintSQL(table: String, schema: String?, constraintName: String) -> String? { guard !constraintName.isEmpty else { return nil } - return "ALTER TABLE \(mssqlQualifiedTable(table)) DROP CONSTRAINT \(quoteIdentifier(constraintName))" + return "ALTER TABLE \(mssqlQualifiedTable(table, schema: schema)) DROP CONSTRAINT \(quoteIdentifier(constraintName))" } /// `sys.check_constraints.parent_column_id` is 0 for a multi-column check, so the columns come /// from `sys.sql_expression_dependencies`, which lists them for both shapes. func fetchCheckConstraints(table: String, schema: String?) async throws -> [PluginCheckConstraintInfo] { - let targetLiteral = MSSQLStringLiteral.quoted(mssqlQualifiedTable(table)) + let targetLiteral = MSSQLStringLiteral.quoted(mssqlQualifiedTable(table, schema: schema)) let query = """ SELECT cc.name, cc.definition, cc.is_not_trusted, COL_NAME(d.referenced_id, d.referenced_minor_id) @@ -195,8 +200,14 @@ extension MSSQLPluginDriver { return ordered.compactMap { byName[$0] } } - func generateModifyPrimaryKeySQL(table: String, oldColumns: [String], newColumns: [String], constraintName: String?) -> [String]? { - let qt = mssqlQualifiedTable(table) + func generateModifyPrimaryKeySQL( + table: String, + schema: String?, + oldColumns: [String], + newColumns: [String], + constraintName: String? + ) -> [String]? { + let qt = mssqlQualifiedTable(table, schema: schema) var stmts: [String] = [] if !oldColumns.isEmpty { let name = constraintName.map { quoteIdentifier($0) } ?? "/* unknown constraint */" diff --git a/apple/Plugins/OracleDriverPlugin/OraclePlugin.swift b/apple/Plugins/OracleDriverPlugin/OraclePlugin.swift index c3764f36da..5fff067069 100644 --- a/apple/Plugins/OracleDriverPlugin/OraclePlugin.swift +++ b/apple/Plugins/OracleDriverPlugin/OraclePlugin.swift @@ -192,14 +192,15 @@ private extension SQLOperatorDescriptor { final class OraclePluginDriver: PluginDatabaseDriver, @unchecked Sendable { let config: DriverConnectionConfig private(set) var core: OracleCoreConnection? - private var _currentSchema: String? + // Read by statement generation on any thread while a connect or a schema switch writes it. + private let sessionSchema = OSAllocatedUnfairLock(initialState: nil) private var _serverVersion: String? let principalState = OSAllocatedUnfairLock(initialState: OraclePrincipalState()) let debugState = OSAllocatedUnfairLock(initialState: OracleDebugState()) private static let logger = Logger(subsystem: "com.TablePro", category: "OraclePluginDriver") - var currentSchema: String? { _currentSchema } + var currentSchema: String? { sessionSchema.withLock { $0 } } var serverVersion: String? { _serverVersion } var connectionWarning: String? { core?.loginWarning } var supportsSchemas: Bool { true } @@ -271,9 +272,9 @@ final class OraclePluginDriver: PluginDatabaseDriver, @unchecked Sendable { on: connection, deadline: deadline ), let schema = result.rows.first?.first?.stringValue { - _currentSchema = schema + sessionSchema.withLock { $0 = schema } } else { - _currentSchema = config.username.uppercased() + sessionSchema.withLock { $0 = config.username.uppercased() } } if let result = try await optionalConnectQuery( @@ -674,7 +675,7 @@ final class OraclePluginDriver: PluginDatabaseDriver, @unchecked Sendable { } func generateDropTriggerSQL(name: String, table: String, schema: String?) -> String? { - OracleObjectQueries.dropTrigger(name: name, schema: schema, currentSchema: _currentSchema) + OracleObjectQueries.dropTrigger(name: name, schema: schema, currentSchema: currentSchema) } var fetchesAllColumnsInOneRequest: Bool { true } @@ -956,22 +957,12 @@ final class OraclePluginDriver: PluginDatabaseDriver, @unchecked Sendable { // MARK: - Create Table DDL - /// Leaves out the column comments: an older app sends this text in one call, and Oracle refuses a second statement - /// in it with ORA-03405. - func generateCreateTableSQL(definition: PluginCreateTableDefinition) -> String? { - guard let statements = createTableAndIndexStatements(definition: definition), - let createTable = statements.first else { return nil } - let indexStatements = statements.dropFirst() - guard !indexStatements.isEmpty else { return createTable + ";" } - return createTable + ";\n\n" + indexStatements.joined(separator: ";\n") + ";" - } - /// Oracle runs one statement per call, and sent as one text the table and its indexes fail with ORA-03405 and /// create nothing. - func generateCreateTableStatements(definition: PluginCreateTableDefinition) -> [String]? { - guard let statements = createTableAndIndexStatements(definition: definition) else { return nil } + func generateCreateTableStatements(definition: PluginCreateTableDefinition, schema: String?) -> [String]? { + guard let statements = createTableAndIndexStatements(definition: definition, schema: schema) else { return nil } let comments = OracleColumnStatements.commentStatements( - qualifiedTable: oracleQualifiedTable(definition.tableName), columns: definition.columns + qualifiedTable: oracleQualifiedTable(definition.tableName, schema: schema), columns: definition.columns ) return statements + comments } @@ -992,10 +983,10 @@ final class OraclePluginDriver: PluginDatabaseDriver, @unchecked Sendable { return String(localized: "An auto-increment column takes its values from a sequence, so it cannot also have a default.") } - private func createTableAndIndexStatements(definition: PluginCreateTableDefinition) -> [String]? { + private func createTableAndIndexStatements(definition: PluginCreateTableDefinition, schema: String?) -> [String]? { guard !definition.columns.isEmpty else { return nil } - let qualifiedTable = oracleQualifiedTable(definition.tableName) + let qualifiedTable = oracleQualifiedTable(definition.tableName, schema: schema) let pkColumns = definition.columns.filter { $0.isPrimaryKey } let inlinePK = pkColumns.count == 1 var parts: [String] = definition.columns.map { oracleColumnDefinition($0, inlinePK: inlinePK) } @@ -1023,7 +1014,7 @@ final class OraclePluginDriver: PluginDatabaseDriver, @unchecked Sendable { } func generateIndexDefinitionSQL(index: PluginIndexDefinition, tableName: String?) -> String? { - let qualifiedTable = tableName.map { oracleQualifiedTable($0) } ?? "\"table\"" + let qualifiedTable = tableName.map { oracleQualifiedTable($0, schema: nil) } ?? "\"table\"" return oracleIndexDefinition(index, qualifiedTable: qualifiedTable) } @@ -1033,23 +1024,28 @@ final class OraclePluginDriver: PluginDatabaseDriver, @unchecked Sendable { // MARK: - ALTER TABLE DDL - func generateAddColumnSQL(table: String, column: PluginColumnDefinition) -> String? { - let qt = oracleQualifiedTable(table) + func generateAddColumnSQL(table: String, schema: String?, column: PluginColumnDefinition) -> String? { + let qt = oracleQualifiedTable(table, schema: schema) let colDef = oracleColumnDefinition(column, inlinePK: false) return "ALTER TABLE \(qt) ADD (\(colDef))" } - func generateModifyColumnSQL(table: String, oldColumn: PluginColumnDefinition, newColumn: PluginColumnDefinition) -> String? { + func generateModifyColumnSQL( + table: String, + schema: String?, + oldColumn: PluginColumnDefinition, + newColumn: PluginColumnDefinition + ) -> String? { OracleColumnStatements.modify( - qualifiedTable: oracleQualifiedTable(table), + qualifiedTable: oracleQualifiedTable(table, schema: schema), oldColumn: oldColumn, newColumn: newColumn, quote: quoteIdentifier ) } - func generateDropColumnSQL(table: String, columnName: String) -> String? { - "ALTER TABLE \(oracleQualifiedTable(table)) DROP COLUMN \(quoteIdentifier(columnName))" + func generateDropColumnSQL(table: String, schema: String?, columnName: String) -> String? { + "ALTER TABLE \(oracleQualifiedTable(table, schema: schema)) DROP COLUMN \(quoteIdentifier(columnName))" } /// Oracle has no positional clause, but making a column invisible and visible again moves it to @@ -1070,7 +1066,7 @@ final class OraclePluginDriver: PluginDatabaseDriver, @unchecked Sendable { columns: [PluginColumnDefinition], desiredOrder: [String] ) async throws -> PluginColumnReorderPlan? { - let qt = oracleQualifiedTable(table) + let qt = oracleQualifiedTable(table, schema: schema) let currentOrder = try await fetchColumns(table: table, schema: schema).map(\.name) let cycled = PluginColumnReorderPlanner.appendCycle(from: currentOrder, to: desiredOrder) let statements = cycled.flatMap { column -> [String] in @@ -1094,27 +1090,26 @@ final class OraclePluginDriver: PluginDatabaseDriver, @unchecked Sendable { ) } - func generateAddIndexSQL(table: String, index: PluginIndexDefinition) -> String? { - oracleIndexDefinition(index, qualifiedTable: oracleQualifiedTable(table)) + func generateAddIndexSQL(table: String, schema: String?, index: PluginIndexDefinition) -> String? { + oracleIndexDefinition(index, qualifiedTable: oracleQualifiedTable(table, schema: schema)) } - func generateDropIndexSQL(table: String, indexName: String) -> String? { - "DROP INDEX \(quoteIdentifier(indexName))" + func generateDropIndexSQL(table: String, schema: String?, indexName: String) -> String? { + "DROP INDEX \(quoteIdentifier(effectiveSchema(schema))).\(quoteIdentifier(indexName))" } - func generateAddForeignKeySQL(table: String, fk: PluginForeignKeyDefinition) -> String? { - "ALTER TABLE \(oracleQualifiedTable(table)) ADD \(oracleForeignKeyConstraint(fk))" + func generateAddForeignKeySQL(table: String, schema: String?, fk: PluginForeignKeyDefinition) -> String? { + "ALTER TABLE \(oracleQualifiedTable(table, schema: schema)) ADD \(oracleForeignKeyConstraint(fk))" } - func generateDropForeignKeySQL(table: String, constraintName: String) -> String? { - "ALTER TABLE \(oracleQualifiedTable(table)) DROP CONSTRAINT \(quoteIdentifier(constraintName))" + func generateDropForeignKeySQL(table: String, schema: String?, constraintName: String) -> String? { + "ALTER TABLE \(oracleQualifiedTable(table, schema: schema)) DROP CONSTRAINT \(quoteIdentifier(constraintName))" } // MARK: - DDL Helpers - private func oracleQualifiedTable(_ table: String) -> String { - let schema = _currentSchema ?? config.username.uppercased() - return "\(quoteIdentifier(schema)).\(quoteIdentifier(table))" + private func oracleQualifiedTable(_ table: String, schema: String?) -> String { + "\(quoteIdentifier(effectiveSchema(schema))).\(quoteIdentifier(table))" } /// An unknown release writes the identity: `schemaOperationRefusal` stops auto-increment on a known 11g. @@ -1162,7 +1157,7 @@ final class OraclePluginDriver: PluginDatabaseDriver, @unchecked Sendable { } catch let error as OracleCoreError { throw error.asPluginError } - _currentSchema = schema + sessionSchema.withLock { $0 = schema } core.noteSessionSchema(schema) } @@ -1290,6 +1285,6 @@ final class OraclePluginDriver: PluginDatabaseDriver, @unchecked Sendable { } func effectiveSchema(_ schema: String?) -> String { - schema ?? _currentSchema ?? config.username.uppercased() + schema ?? currentSchema ?? config.username.uppercased() } } diff --git a/apple/Plugins/PostgreSQLDriverPlugin/LibPQDriverCore.swift b/apple/Plugins/PostgreSQLDriverPlugin/LibPQDriverCore.swift index db64ba3433..96f8531bce 100644 --- a/apple/Plugins/PostgreSQLDriverPlugin/LibPQDriverCore.swift +++ b/apple/Plugins/PostgreSQLDriverPlugin/LibPQDriverCore.swift @@ -7,6 +7,7 @@ // import Foundation +import os import TableProPluginKit import TableProPostgreSQLCore @@ -23,8 +24,16 @@ final class LibPQDriverCore: @unchecked Sendable { connectionLock.withLock { _libpqConnection } } - var currentSchema: String = "public" - private var selectedSchema: String? + private struct SchemaState { + var current = "public" + var selected: String? + } + + // Read by statement generation on any thread while a connect or a schema switch writes it. + private let schemaState = OSAllocatedUnfairLock(initialState: SchemaState()) + + var currentSchema: String { schemaState.withLock { $0.current } } + private var selectedSchema: String? { schemaState.withLock { $0.selected } } var onPostConnect: (@Sendable () async throws -> Void)? @@ -115,10 +124,10 @@ final class LibPQDriverCore: @unchecked Sendable { switch await probeSchema(pqConn, query: PostgreSQLSchemaQueries.currentSchema) { case .schema(let schema): - currentSchema = schema + schemaState.withLock { $0.current = schema } case .empty: if let fallback = await firstFallbackSchema(pqConn) { - currentSchema = fallback + schemaState.withLock { $0.current = fallback } _ = try? await pqConn.executeQuery(PostgreSQLSchemaQueries.setSearchPath(toSchema: fallback)) } case .failed: @@ -129,7 +138,7 @@ final class LibPQDriverCore: @unchecked Sendable { (try? await pqConn.executeQuery( PostgreSQLSchemaQueries.setSearchPath(toSchema: selectedSchema) )) != nil { - currentSchema = selectedSchema + schemaState.withLock { $0.current = selectedSchema } } try await onPostConnect?() @@ -182,8 +191,10 @@ final class LibPQDriverCore: @unchecked Sendable { func applySchema(_ schema: String) async throws { _ = try await execute(query: PostgreSQLSchemaQueries.setSearchPath(toSchema: schema)) - selectedSchema = schema - currentSchema = schema + schemaState.withLock { + $0.selected = schema + $0.current = schema + } } func disconnect() { diff --git a/apple/Plugins/PostgreSQLDriverPlugin/PostgreSQLPluginDriver.swift b/apple/Plugins/PostgreSQLDriverPlugin/PostgreSQLPluginDriver.swift index 67de451b85..b41131155e 100644 --- a/apple/Plugins/PostgreSQLDriverPlugin/PostgreSQLPluginDriver.swift +++ b/apple/Plugins/PostgreSQLDriverPlugin/PostgreSQLPluginDriver.swift @@ -842,17 +842,8 @@ class PostgreSQLPluginDriver: LibPQBackedDriver, @unchecked Sendable { // MARK: - Create Table DDL - func generateCreateTableSQL(definition: PluginCreateTableDefinition) -> String? { - guard let parts = createTableParts(definition) else { return nil } - var sql = parts.createTable + ";" - if !parts.indexStatements.isEmpty { - sql += "\n\n" + parts.indexStatements.joined(separator: ";\n") + ";" - } - return sql - } - - func generateCreateTableStatements(definition: PluginCreateTableDefinition) -> [String]? { - guard let parts = createTableParts(definition) else { return nil } + func generateCreateTableStatements(definition: PluginCreateTableDefinition, schema: String?) -> [String]? { + guard let parts = createTableParts(definition, schema: schema) else { return nil } let columnComments = PostgreSQLRelationSQL.columnCommentStatements( qualifiedTable: parts.qualifiedTable, columns: definition.columns @@ -861,14 +852,14 @@ class PostgreSQLPluginDriver: LibPQBackedDriver, @unchecked Sendable { } private func createTableParts( - _ definition: PluginCreateTableDefinition + _ definition: PluginCreateTableDefinition, + schema: String? ) -> (qualifiedTable: String, createTable: String, indexStatements: [String])? { guard !definition.columns.isEmpty, PostgreSQLVersionedStatements.refusal(for: definition, capabilities: versionedCapabilities) == nil else { return nil } - let schema = core.currentSchema - let qualifiedTable = "\(quoteIdentifier(schema)).\(quoteIdentifier(definition.tableName))" + let qualifiedTable = qualifiedTableName(definition.tableName, schema: schema) let pkColumns = definition.columns.filter { $0.isPrimaryKey } let inlinePK = pkColumns.count == 1 var parts: [String] = definition.columns.map { pgColumnDefinition($0, inlinePK: inlinePK) } @@ -988,13 +979,13 @@ class PostgreSQLPluginDriver: LibPQBackedDriver, @unchecked Sendable { // MARK: - ALTER TABLE DDL - private func qualifiedTableName(_ table: String) -> String { - "\(quoteIdentifier(core.currentSchema)).\(quoteIdentifier(table))" + private func qualifiedTableName(_ table: String, schema: String?) -> String { + "\(quoteIdentifier(schema ?? core.currentSchema)).\(quoteIdentifier(table))" } - func generateAddColumnSQL(table: String, column: PluginColumnDefinition) -> String? { + func generateAddColumnSQL(table: String, schema: String?, column: PluginColumnDefinition) -> String? { guard schemaOperationRefusal(.addColumn(column)) == nil else { return nil } - let qt = qualifiedTableName(table) + let qt = qualifiedTableName(table, schema: schema) let colDef = pgColumnDefinition(column, inlinePK: false) let add = "ALTER TABLE \(qt) ADD COLUMN \(colDef)" guard let comment = column.comment, !comment.isEmpty else { return add } @@ -1006,8 +997,13 @@ class PostgreSQLPluginDriver: LibPQBackedDriver, @unchecked Sendable { return add + ";\n" + commentStatement } - func generateModifyColumnSQL(table: String, oldColumn: PluginColumnDefinition, newColumn: PluginColumnDefinition) -> String? { - let qt = qualifiedTableName(table) + func generateModifyColumnSQL( + table: String, + schema: String?, + oldColumn: PluginColumnDefinition, + newColumn: PluginColumnDefinition + ) -> String? { + let qt = qualifiedTableName(table, schema: schema) var stmts: [String] = [] if oldColumn.name != newColumn.name { @@ -1050,50 +1046,60 @@ class PostgreSQLPluginDriver: LibPQBackedDriver, @unchecked Sendable { return stmts.isEmpty ? nil : stmts.joined(separator: ";\n") } - func generateDropColumnSQL(table: String, columnName: String) -> String? { - "ALTER TABLE \(qualifiedTableName(table)) DROP COLUMN \(quoteIdentifier(columnName))" + func generateDropColumnSQL(table: String, schema: String?, columnName: String) -> String? { + "ALTER TABLE \(qualifiedTableName(table, schema: schema)) DROP COLUMN \(quoteIdentifier(columnName))" } - func generateAddIndexSQL(table: String, index: PluginIndexDefinition) -> String? { + func generateAddIndexSQL(table: String, schema: String?, index: PluginIndexDefinition) -> String? { guard schemaOperationRefusal(.addIndex(index)) == nil else { return nil } - return PostgreSQLIndexClauses.createStatement(for: index, qualifiedTable: qualifiedTableName(table)) + return PostgreSQLIndexClauses.createStatement(for: index, qualifiedTable: qualifiedTableName(table, schema: schema)) } - func generateDropIndexSQL(table: String, indexName: String) -> String? { - "DROP INDEX \(quoteIdentifier(core.currentSchema)).\(quoteIdentifier(indexName))" + func generateDropIndexSQL(table: String, schema: String?, indexName: String) -> String? { + "DROP INDEX \(quoteIdentifier(schema ?? core.currentSchema)).\(quoteIdentifier(indexName))" } - func generateAddForeignKeySQL(table: String, fk: PluginForeignKeyDefinition) -> String? { - "ALTER TABLE \(qualifiedTableName(table)) ADD \(pgForeignKeyDefinition(fk))" + func generateAddForeignKeySQL(table: String, schema: String?, fk: PluginForeignKeyDefinition) -> String? { + "ALTER TABLE \(qualifiedTableName(table, schema: schema)) ADD \(pgForeignKeyDefinition(fk))" } - func generateDropForeignKeySQL(table: String, constraintName: String) -> String? { - "ALTER TABLE \(qualifiedTableName(table)) DROP CONSTRAINT \(quoteIdentifier(constraintName))" + func generateDropForeignKeySQL(table: String, schema: String?, constraintName: String) -> String? { + "ALTER TABLE \(qualifiedTableName(table, schema: schema)) DROP CONSTRAINT \(quoteIdentifier(constraintName))" } - func generateAddCheckConstraintSQL(table: String, constraint: PluginCheckConstraintDefinition) -> String? { + func generateAddCheckConstraintSQL( + table: String, + schema: String?, + constraint: PluginCheckConstraintDefinition + ) -> String? { let expression = constraint.expression.trimmingCharacters(in: .whitespacesAndNewlines) guard !expression.isEmpty, !constraint.name.isEmpty else { return nil } - return "ALTER TABLE \(qualifiedTableName(table)) ADD CONSTRAINT " + return "ALTER TABLE \(qualifiedTableName(table, schema: schema)) ADD CONSTRAINT " + "\(quoteIdentifier(constraint.name)) CHECK (\(expression))" } - func generateDropCheckConstraintSQL(table: String, constraintName: String) -> String? { + func generateDropCheckConstraintSQL(table: String, schema: String?, constraintName: String) -> String? { guard !constraintName.isEmpty else { return nil } - return "ALTER TABLE \(qualifiedTableName(table)) DROP CONSTRAINT \(quoteIdentifier(constraintName))" + return "ALTER TABLE \(qualifiedTableName(table, schema: schema)) DROP CONSTRAINT \(quoteIdentifier(constraintName))" } - func generateRenameCheckConstraintSQL(table: String, from oldName: String, to newName: String) -> String? { + func generateRenameCheckConstraintSQL(table: String, schema: String?, from oldName: String, to newName: String) -> String? { PostgreSQLVersionedStatements.renameConstraint( - qualifiedTable: qualifiedTableName(table), + qualifiedTable: qualifiedTableName(table, schema: schema), from: oldName, to: newName, capabilities: versionedCapabilities ) } - func generateModifyPrimaryKeySQL(table: String, oldColumns: [String], newColumns: [String], constraintName: String?) -> [String]? { - let qt = qualifiedTableName(table) + func generateModifyPrimaryKeySQL( + table: String, + schema: String?, + oldColumns: [String], + newColumns: [String], + constraintName: String? + ) -> [String]? { + let qt = qualifiedTableName(table, schema: schema) var stmts: [String] = [] if !oldColumns.isEmpty { let name = constraintName.map { quoteIdentifier($0) } ?? "/* unknown constraint */" diff --git a/apple/Plugins/PostgreSQLDriverTests/PostgreSQLDDLSchemaQualificationTests.swift b/apple/Plugins/PostgreSQLDriverTests/PostgreSQLDDLSchemaQualificationTests.swift new file mode 100644 index 0000000000..907f811b45 --- /dev/null +++ b/apple/Plugins/PostgreSQLDriverTests/PostgreSQLDDLSchemaQualificationTests.swift @@ -0,0 +1,56 @@ +import TableProPluginKit +import Testing + +struct PostgreSQLDDLSchemaQualificationTests { + private let driver = PostgreSQLPluginDriver(config: DriverConnectionConfig( + host: "", port: 0, username: "", password: "", database: "" + )) + private let column = PluginColumnDefinition(name: "note", dataType: "text") + + @Test("Every table statement names the schema it is given, not the session's") + func alterStatementsNameTheGivenSchema() throws { + let statements: [String?] = [ + driver.generateAddColumnSQL(table: "orders", schema: "sales", column: column), + driver.generateModifyColumnSQL( + table: "orders", schema: "sales", + oldColumn: column, newColumn: PluginColumnDefinition(name: "memo", dataType: "text") + ), + driver.generateDropColumnSQL(table: "orders", schema: "sales", columnName: "note"), + driver.generateAddIndexSQL( + table: "orders", schema: "sales", index: PluginIndexDefinition(name: "orders_note", columns: ["note"]) + ), + driver.generateDropIndexSQL(table: "orders", schema: "sales", indexName: "orders_note"), + driver.generateAddForeignKeySQL( + table: "orders", schema: "sales", + fk: PluginForeignKeyDefinition( + name: "orders_customer", columns: ["customer_id"], referencedTable: "customers", referencedColumns: ["id"] + ) + ), + driver.generateDropForeignKeySQL(table: "orders", schema: "sales", constraintName: "orders_customer"), + driver.generateAddCheckConstraintSQL( + table: "orders", schema: "sales", + constraint: PluginCheckConstraintDefinition(name: "positive", expression: "total > 0") + ), + driver.generateDropCheckConstraintSQL(table: "orders", schema: "sales", constraintName: "positive") + ] + let primaryKey = try #require(driver.generateModifyPrimaryKeySQL( + table: "orders", schema: "sales", oldColumns: ["id"], newColumns: ["id", "line"], constraintName: "orders_pkey" + )) + let created = try #require(driver.generateCreateTableStatements( + definition: PluginCreateTableDefinition(tableName: "orders", columns: [column]), schema: "sales" + )) + + for sql in statements.map({ $0 ?? "" }) + primaryKey + created { + #expect(sql.contains("\"sales\"."), "\(sql)") + #expect(!sql.contains("\"public\""), "\(sql)") + } + } + + @Test("No schema falls back to the session's") + func nilSchemaUsesTheSessionSchema() { + #expect( + driver.generateDropColumnSQL(table: "orders", schema: nil, columnName: "note") + == "ALTER TABLE \"public\".\"orders\" DROP COLUMN \"note\"" + ) + } +} diff --git a/apple/Plugins/SnowflakeDriverPlugin/SnowflakePluginDriver+DDL.swift b/apple/Plugins/SnowflakeDriverPlugin/SnowflakePluginDriver+DDL.swift index 95341109ef..d032d96635 100644 --- a/apple/Plugins/SnowflakeDriverPlugin/SnowflakePluginDriver+DDL.swift +++ b/apple/Plugins/SnowflakeDriverPlugin/SnowflakePluginDriver+DDL.swift @@ -76,43 +76,45 @@ extension SnowflakePluginDriver { ) } - private var ddlGenerator: SnowflakeDDLGenerator { + private func ddlGenerator(schema: String?) -> SnowflakeDDLGenerator { SnowflakeDDLGenerator(qualifiedTable: { [weak self] table in - self?.qualifiedName(table: table, schema: nil) ?? table + self?.qualifiedName(table: table, schema: schema) ?? table }) } - func generateAddColumnSQL(table: String, column: PluginColumnDefinition) -> String? { - ddlGenerator.addColumnSQL(table: table, column: column) + func generateAddColumnSQL(table: String, schema: String?, column: PluginColumnDefinition) -> String? { + ddlGenerator(schema: schema).addColumnSQL(table: table, column: column) } func generateModifyColumnSQL( table: String, + schema: String?, oldColumn: PluginColumnDefinition, newColumn: PluginColumnDefinition ) -> String? { - ddlGenerator.modifyColumnSQL(table: table, old: oldColumn, new: newColumn) + ddlGenerator(schema: schema).modifyColumnSQL(table: table, old: oldColumn, new: newColumn) } - func generateDropColumnSQL(table: String, columnName: String) -> String? { - ddlGenerator.dropColumnSQL(table: table, columnName: columnName) + func generateDropColumnSQL(table: String, schema: String?, columnName: String) -> String? { + ddlGenerator(schema: schema).dropColumnSQL(table: table, columnName: columnName) } func generateModifyPrimaryKeySQL( table: String, + schema: String?, oldColumns: [String], newColumns: [String], constraintName: String? ) -> [String]? { - ddlGenerator.modifyPrimaryKeySQL(table: table, oldColumns: oldColumns, newColumns: newColumns) + ddlGenerator(schema: schema).modifyPrimaryKeySQL(table: table, oldColumns: oldColumns, newColumns: newColumns) } - func generateCreateTableSQL(definition: PluginCreateTableDefinition) -> String? { - ddlGenerator.createTableSQL(definition: definition) + func generateCreateTableStatements(definition: PluginCreateTableDefinition, schema: String?) -> [String]? { + ddlGenerator(schema: schema).createTableSQL(definition: definition).map { [$0] } } func generateColumnDefinitionSQL(column: PluginColumnDefinition) -> String? { - ddlGenerator.columnDefinitionSQL(column) + ddlGenerator(schema: nil).columnDefinitionSQL(column) } func objectCommentStatement(name: String, objectType: String, schema: String?, comment: String?) -> String? { diff --git a/apple/Plugins/TableProPluginKit/PluginDatabaseDriver.swift b/apple/Plugins/TableProPluginKit/PluginDatabaseDriver.swift index 991d7721a6..6b35fd0965 100644 --- a/apple/Plugins/TableProPluginKit/PluginDatabaseDriver.swift +++ b/apple/Plugins/TableProPluginKit/PluginDatabaseDriver.swift @@ -484,6 +484,21 @@ public protocol PluginDatabaseDriver: AnyObject, Sendable { func generateModifyPrimaryKeySQL(table: String, oldColumns: [String], newColumns: [String], constraintName: String?) -> [String]? func generateMoveColumnSQL(table: String, column: PluginColumnDefinition, afterColumn: String?) -> String? + // The schema the caller's scope names, nil for the session's. The defaults forward to the schema-less + // requirements above, so a driver that only answers those keeps qualifying with its session schema. + func generateAddColumnSQL(table: String, schema: String?, column: PluginColumnDefinition) -> String? + func generateModifyColumnSQL(table: String, schema: String?, oldColumn: PluginColumnDefinition, newColumn: PluginColumnDefinition) -> String? + func generateDropColumnSQL(table: String, schema: String?, columnName: String) -> String? + func generateAddIndexSQL(table: String, schema: String?, index: PluginIndexDefinition) -> String? + func generateDropIndexSQL(table: String, schema: String?, indexName: String) -> String? + func generateModifyIndexSQL(table: String, schema: String?, oldIndexName: String, newIndex: PluginIndexDefinition) -> String? + func generateAddForeignKeySQL(table: String, schema: String?, fk: PluginForeignKeyDefinition) -> String? + func generateDropForeignKeySQL(table: String, schema: String?, constraintName: String) -> String? + func generateAddCheckConstraintSQL(table: String, schema: String?, constraint: PluginCheckConstraintDefinition) -> String? + func generateDropCheckConstraintSQL(table: String, schema: String?, constraintName: String) -> String? + func generateRenameCheckConstraintSQL(table: String, schema: String?, from oldName: String, to newName: String) -> String? + func generateModifyPrimaryKeySQL(table: String, schema: String?, oldColumns: [String], newColumns: [String], constraintName: String?) -> [String]? + /// The statements that put `table`'s columns into `desiredOrder`, or nil where the engine /// cannot reorder them. /// @@ -615,6 +630,7 @@ public protocol PluginDatabaseDriver: AnyObject, Sendable { /// answers ORA-03405 and creates nothing. Only the driver knows where its own statements end, so a driver whose /// DDL holds more than one statement answers here. The default is that one string, sent whole. func generateCreateTableStatements(definition: PluginCreateTableDefinition) -> [String]? + func generateCreateTableStatements(definition: PluginCreateTableDefinition, schema: String?) -> [String]? // Definition SQL for clipboard copy (optional — return nil if not supported) func generateColumnDefinitionSQL(column: PluginColumnDefinition) -> String? @@ -1360,6 +1376,81 @@ public extension PluginDatabaseDriver { func generateModifyPrimaryKeySQL(table: String, oldColumns: [String], newColumns: [String], constraintName: String?) -> [String]? { nil } func generateMoveColumnSQL(table: String, column: PluginColumnDefinition, afterColumn: String?) -> String? { nil } + func generateAddColumnSQL(table: String, schema: String?, column: PluginColumnDefinition) -> String? { + generateAddColumnSQL(table: table, column: column) + } + + func generateModifyColumnSQL( + table: String, + schema: String?, + oldColumn: PluginColumnDefinition, + newColumn: PluginColumnDefinition + ) -> String? { + generateModifyColumnSQL(table: table, oldColumn: oldColumn, newColumn: newColumn) + } + + func generateDropColumnSQL(table: String, schema: String?, columnName: String) -> String? { + generateDropColumnSQL(table: table, columnName: columnName) + } + + func generateAddIndexSQL(table: String, schema: String?, index: PluginIndexDefinition) -> String? { + generateAddIndexSQL(table: table, index: index) + } + + func generateDropIndexSQL(table: String, schema: String?, indexName: String) -> String? { + generateDropIndexSQL(table: table, indexName: indexName) + } + + func generateModifyIndexSQL( + table: String, + schema: String?, + oldIndexName: String, + newIndex: PluginIndexDefinition + ) -> String? { + generateModifyIndexSQL(table: table, oldIndexName: oldIndexName, newIndex: newIndex) + } + + func generateAddForeignKeySQL(table: String, schema: String?, fk: PluginForeignKeyDefinition) -> String? { + generateAddForeignKeySQL(table: table, fk: fk) + } + + func generateDropForeignKeySQL(table: String, schema: String?, constraintName: String) -> String? { + generateDropForeignKeySQL(table: table, constraintName: constraintName) + } + + func generateAddCheckConstraintSQL( + table: String, + schema: String?, + constraint: PluginCheckConstraintDefinition + ) -> String? { + generateAddCheckConstraintSQL(table: table, constraint: constraint) + } + + func generateDropCheckConstraintSQL(table: String, schema: String?, constraintName: String) -> String? { + generateDropCheckConstraintSQL(table: table, constraintName: constraintName) + } + + func generateRenameCheckConstraintSQL( + table: String, + schema: String?, + from oldName: String, + to newName: String + ) -> String? { + generateRenameCheckConstraintSQL(table: table, from: oldName, to: newName) + } + + func generateModifyPrimaryKeySQL( + table: String, + schema: String?, + oldColumns: [String], + newColumns: [String], + constraintName: String? + ) -> [String]? { + generateModifyPrimaryKeySQL( + table: table, oldColumns: oldColumns, newColumns: newColumns, constraintName: constraintName + ) + } + func generateColumnReorderPlan( table: String, schema: String?, @@ -1417,6 +1508,10 @@ public extension PluginDatabaseDriver { generateCreateTableSQL(definition: definition).map { [$0] } } + func generateCreateTableStatements(definition: PluginCreateTableDefinition, schema: String?) -> [String]? { + generateCreateTableStatements(definition: definition) + } + func generateColumnDefinitionSQL(column: PluginColumnDefinition) -> String? { nil } func generateIndexDefinitionSQL(index: PluginIndexDefinition, tableName: String?) -> String? { nil } func generateForeignKeyDefinitionSQL(fk: PluginForeignKeyDefinition) -> String? { nil } diff --git a/apple/Plugins/TableProPluginKit/PluginStorageParts.swift b/apple/Plugins/TableProPluginKit/PluginStorageParts.swift new file mode 100644 index 0000000000..b012963b23 --- /dev/null +++ b/apple/Plugins/TableProPluginKit/PluginStorageParts.swift @@ -0,0 +1,39 @@ +import Foundation + +// The parts a table's rows are stored in, for an engine that writes a table as merged parts grouped by partition. +// Every statement names its own database: the session's can move under it. +public protocol PluginStorageParts: AnyObject, Sendable { + func fetchStorageParts(table: String, database: String) async throws -> [PluginStoragePart] + // Nil where the engine cannot express it; a partition id the engine would not accept is one. + func mergePartsStatement(table: String, database: String) -> String? + func dropPartitionStatement(table: String, database: String, partitionId: String) -> String? + func detachPartitionStatement(table: String, database: String, partitionId: String) -> String? +} + +public struct PluginStoragePart: Sendable, Hashable { + public let partition: String + public let partitionId: String + public let name: String + public let rows: UInt64 + public let bytesOnDisk: UInt64 + public let modificationTime: String + public let isActive: Bool + + public init( + partition: String, + partitionId: String, + name: String, + rows: UInt64, + bytesOnDisk: UInt64, + modificationTime: String, + isActive: Bool + ) { + self.partition = partition + self.partitionId = partitionId + self.name = name + self.rows = rows + self.bytesOnDisk = bytesOnDisk + self.modificationTime = modificationTime + self.isActive = isActive + } +} diff --git a/apple/Plugins/TrinoDriverPlugin/TrinoPluginDriver+DDL.swift b/apple/Plugins/TrinoDriverPlugin/TrinoPluginDriver+DDL.swift index 03100eecbc..6e3b66bbfc 100644 --- a/apple/Plugins/TrinoDriverPlugin/TrinoPluginDriver+DDL.swift +++ b/apple/Plugins/TrinoDriverPlugin/TrinoPluginDriver+DDL.swift @@ -3,20 +3,21 @@ import TableProPluginKit import TableProTrinoCore extension TrinoPluginDriver { - func generateAddColumnSQL(table: String, column: PluginColumnDefinition) -> String? { - TrinoDDLSQL.addColumn(qualifiedTable: qualifiedName(table: table, schema: nil), column: columnSpec(column)) + func generateAddColumnSQL(table: String, schema: String?, column: PluginColumnDefinition) -> String? { + TrinoDDLSQL.addColumn(qualifiedTable: qualifiedName(table: table, schema: schema), column: columnSpec(column)) } - func generateDropColumnSQL(table: String, columnName: String) -> String? { - TrinoDDLSQL.dropColumn(qualifiedTable: qualifiedName(table: table, schema: nil), name: columnName) + func generateDropColumnSQL(table: String, schema: String?, columnName: String) -> String? { + TrinoDDLSQL.dropColumn(qualifiedTable: qualifiedName(table: table, schema: schema), name: columnName) } func generateModifyColumnSQL( table: String, + schema: String?, oldColumn: PluginColumnDefinition, newColumn: PluginColumnDefinition ) -> String? { - let target = qualifiedName(table: table, schema: nil) + let target = qualifiedName(table: table, schema: schema) var statements: [String] = [] if oldColumn.name != newColumn.name { statements.append(TrinoDDLSQL.renameColumn(qualifiedTable: target, from: oldColumn.name, to: newColumn.name)) @@ -37,13 +38,13 @@ extension TrinoPluginDriver { return statements.isEmpty ? nil : statements.joined(separator: ";\n") } - func generateCreateTableSQL(definition: PluginCreateTableDefinition) -> String? { + func generateCreateTableStatements(definition: PluginCreateTableDefinition, schema: String?) -> [String]? { TrinoDDLSQL.createTable( - qualifiedTable: qualifiedName(table: definition.tableName, schema: nil), + qualifiedTable: qualifiedName(table: definition.tableName, schema: schema), columns: definition.columns.map(columnSpec), tableComment: nil, ifNotExists: definition.ifNotExists - ) + ).map { [$0] } } func schemaOperationRefusal(_ operation: PluginSchemaOperation) -> String? { diff --git a/apple/TablePro/Core/Compare/CompareMetadataService.swift b/apple/TablePro/Core/Compare/CompareMetadataService.swift index d728c45cb4..b774c76219 100644 --- a/apple/TablePro/Core/Compare/CompareMetadataService.swift +++ b/apple/TablePro/Core/Compare/CompareMetadataService.swift @@ -533,7 +533,7 @@ internal struct CompareMetadataService { } nonisolated internal static func pluginDriver(from driver: DatabaseDriver) -> (any PluginDatabaseDriver)? { - (driver as? PluginDriverAdapter)?.schemaPluginDriver + driver.plugin } } diff --git a/apple/TablePro/Core/Compare/CompareRunner.swift b/apple/TablePro/Core/Compare/CompareRunner.swift index 901d3f4745..902d61e917 100644 --- a/apple/TablePro/Core/Compare/CompareRunner.swift +++ b/apple/TablePro/Core/Compare/CompareRunner.swift @@ -471,6 +471,7 @@ internal struct CompareRunner { in: Self.referenceNamespace(of: context.target) ) + let targetSchema = context.target.scope.schema return try await DatabaseManager.shared.withMetadataDriver(scope: context.target.scope) { driver in guard let plugin = CompareMetadataService.pluginDriver(from: driver) else { throw CompareSyncError.unsupportedOperation( @@ -478,7 +479,7 @@ internal struct CompareRunner { ) } var statements = try SchemaSyncScriptBuilder( - targetDriver: plugin, targetDatabaseType: driver.connection.type + targetDriver: plugin, targetDatabaseType: driver.connection.type, targetSchema: targetSchema ).build(operations: tableOperations, foreignKeysByTable: foreignKeys) let sourceBuilder = SourceObjectSyncBuilder( targetDriver: plugin, diff --git a/apple/TablePro/Core/Compare/SchemaSyncScriptBuilder.swift b/apple/TablePro/Core/Compare/SchemaSyncScriptBuilder.swift index 7c7f8267dd..85ca7f13dc 100644 --- a/apple/TablePro/Core/Compare/SchemaSyncScriptBuilder.swift +++ b/apple/TablePro/Core/Compare/SchemaSyncScriptBuilder.swift @@ -13,12 +13,15 @@ import TableProSQLGrammar internal struct SchemaSyncScriptBuilder { private let targetDriver: any PluginDatabaseDriver + // Names the schema in every statement: the snapshot's own is the source's on a compare across schemas. + private let targetSchema: String? private let targetTypeFamily: SQLTypeFamily private let scriptText: SQLScriptText private let classifier = SyncSafetyClassifier() - internal init(targetDriver: any PluginDatabaseDriver, targetDatabaseType: DatabaseType) { + internal init(targetDriver: any PluginDatabaseDriver, targetDatabaseType: DatabaseType, targetSchema: String?) { self.targetDriver = targetDriver + self.targetSchema = targetSchema self.targetTypeFamily = SQLTypeFamily.of(targetDatabaseType) self.scriptText = SQLScriptText( databaseType: targetDatabaseType, @@ -114,7 +117,7 @@ internal struct SchemaSyncScriptBuilder { } /// Taken from the driver statement by statement rather than divided here: the driver wrote them and knows /// where each ends, and Oracle refuses its table and its indexes sent as one call. - let statements = (targetDriver.generateCreateTableStatements(definition: definition) ?? []) + let statements = (targetDriver.generateCreateTableStatements(definition: definition, schema: targetSchema) ?? []) .map { StatementBlank.trimming($0) } .filter { !$0.isEmpty } guard !statements.isEmpty else { @@ -146,7 +149,7 @@ internal struct SchemaSyncScriptBuilder { changes: [SchemaChange], additionalHazards: (SchemaChange) -> [SyncHazard] = { _ in [] } ) throws -> [SyncStatement] { - let generator = SchemaStatementGenerator(tableName: relation, pluginDriver: targetDriver) + let generator = SchemaStatementGenerator(tableName: relation, schema: targetSchema, pluginDriver: targetDriver) var statements: [SyncStatement] = [] for change in SchemaChangeOrdering.sorted(changes) { let hazards = classifier.hazards(for: change, typeFamily: targetTypeFamily) + additionalHazards(change) diff --git a/apple/TablePro/Core/Compare/SourceObjectSyncBuilder.swift b/apple/TablePro/Core/Compare/SourceObjectSyncBuilder.swift index 1aae131114..27464be9e6 100644 --- a/apple/TablePro/Core/Compare/SourceObjectSyncBuilder.swift +++ b/apple/TablePro/Core/Compare/SourceObjectSyncBuilder.swift @@ -47,7 +47,9 @@ internal struct SourceObjectSyncBuilder { for: targetDatabaseType, session: targetDriver.sessionLexicalState ).execution ) - self.changeBuilder = SchemaSyncScriptBuilder(targetDriver: targetDriver, targetDatabaseType: targetDatabaseType) + self.changeBuilder = SchemaSyncScriptBuilder( + targetDriver: targetDriver, targetDatabaseType: targetDatabaseType, targetSchema: indexSchema + ) } internal func build(for result: CompareObjectResult, action: TableSyncAction) throws -> [SyncStatement] { diff --git a/apple/TablePro/Core/Database/CreateTableEligibility.swift b/apple/TablePro/Core/Database/CreateTableEligibility.swift index faffcad27e..af932ecbb6 100644 --- a/apple/TablePro/Core/Database/CreateTableEligibility.swift +++ b/apple/TablePro/Core/Database/CreateTableEligibility.swift @@ -7,7 +7,7 @@ import Foundation import TableProPluginKit /// Whether New Table can do anything on a connection. The Create Table editor turns a draft into -/// statements through the driver's form or its `generateCreateTableSQL`, and an engine with neither +/// statements through the driver's form or its `generateCreateTableStatements`, and an engine with neither /// used to be offered the editor anyway and refuse only after the grid was filled in. So the driver /// is asked here, with a one-column probe, the way `DatabaseObjectToolEligibility` asks its hooks. enum CreateTableEligibility { @@ -34,7 +34,6 @@ enum CreateTableEligibility { static func canCreateTable(with driver: DatabaseDriver?) -> Bool { guard let driver else { return false } if driver.createTableFormSpec(schema: nil) != nil { return true } - guard let adapter = driver as? PluginDriverAdapter else { return false } - return adapter.generateCreateTableSQL(definition: probeDefinition) != nil + return driver.plugin?.generateCreateTableStatements(definition: probeDefinition, schema: nil) != nil } } diff --git a/apple/TablePro/Core/Database/DatabaseDriver.swift b/apple/TablePro/Core/Database/DatabaseDriver.swift index 8a7ee251c0..2855ef8141 100644 --- a/apple/TablePro/Core/Database/DatabaseDriver.swift +++ b/apple/TablePro/Core/Database/DatabaseDriver.swift @@ -511,6 +511,19 @@ protocol DatabaseDriver: AnyObject, Sendable { var primaryKeyNamesOneRow: Bool { get } + // The plugin this session drives, for the PluginKit surface the app calls as it is. Nil for a driver that wraps + // none, so every caller states what happens without one. + var plugin: (any PluginDatabaseDriver)? { get } + + // The query timeout the session was opened with, nil when the driver was given none. + var sessionQueryTimeoutSeconds: Int? { get } + + func truncateTableStatements(table: String, schema: String?, cascade: Bool) -> [String]? + func dropObjectStatement(name: String, objectType: String, schema: String?, cascade: Bool) -> String? + + func streamRows(query: String, safeModeIsReadOnly: Bool) -> AsyncThrowingStream + func streamExportRows(query: String, safeModeIsReadOnly: Bool) -> AsyncThrowingStream + /// Quote an identifier (table or column name) using the driver's quoting style func quoteIdentifier(_ name: String) -> String @@ -670,6 +683,57 @@ extension DatabaseDriver { var primaryKeyNamesOneRow: Bool { true } + var plugin: (any PluginDatabaseDriver)? { nil } + + var sessionQueryTimeoutSeconds: Int? { nil } + + func truncateTableStatements(table: String, schema: String?, cascade: Bool) -> [String]? { nil } + func dropObjectStatement(name: String, objectType: String, schema: String?, cascade: Bool) -> String? { nil } + + func streamRows(query: String, safeModeIsReadOnly: Bool) -> AsyncThrowingStream { + AsyncThrowingStream { $0.finish(throwing: DatabaseError.unsupportedOperation) } + } + + func streamExportRows( + query: String, + safeModeIsReadOnly: Bool + ) -> AsyncThrowingStream { + AsyncThrowingStream { $0.finish(throwing: DatabaseError.unsupportedOperation) } + } + + /// Which of these objects this connection has a drop or truncate statement for. + /// + /// Resolved per object rather than per engine, because a plugin answers per object: Typesense + /// has a statement for a collection and none for anything else, and Elasticsearch has none for + /// an index name carrying a wildcard. Every menu that offers either operation asks this, so the + /// answer and the statement it leads to come from one place. + func tableOperationEligibility( + for refs: some Collection, + isReadOnly: Bool + ) -> TableOperationEligibility.Context { + guard !isReadOnly else { return .unavailable } + var droppable: Set = [] + var truncatable: Set = [] + for ref in refs { + if dropObjectStatement( + name: ref.table.name, + objectType: TableObjectKeyword.forDDL(ref.table.type), + schema: ref.qualifyingSchema, + cascade: false + ) != nil { + droppable.insert(ref) + } + if truncateTableStatements( + table: ref.table.name, schema: ref.qualifyingSchema, cascade: false + ) != nil { + truncatable.insert(ref) + } + } + return TableOperationEligibility.Context( + droppable: droppable, truncatable: truncatable, isReadOnly: false + ) + } + func beginTransaction(mode: PluginTransactionAccessMode) async throws { try await beginTransaction() } diff --git a/apple/TablePro/Core/Database/DatabaseManager+Health.swift b/apple/TablePro/Core/Database/DatabaseManager+Health.swift index 8a01955d0f..15f49fe3bc 100644 --- a/apple/TablePro/Core/Database/DatabaseManager+Health.swift +++ b/apple/TablePro/Core/Database/DatabaseManager+Health.swift @@ -370,9 +370,9 @@ extension DatabaseManager { ) async -> String? { var warnings: [String?] = [] // The schema lives inside the database, and a database switch can leave the driver on none. - if let savedDatabase, let adapter = driver as? PluginDriverAdapter { + if let savedDatabase, let plugin = driver.plugin { do { - try await adapter.switchDatabase(to: savedDatabase) + try await plugin.switchDatabase(to: savedDatabase) } catch { Self.logger.warning("Failed to restore database '\(savedDatabase)' on reconnect: \(error.localizedDescription)") warnings.append(String( diff --git a/apple/TablePro/Core/Database/DatabaseManager+Principals.swift b/apple/TablePro/Core/Database/DatabaseManager+Principals.swift index d3b63817f1..1a22c21175 100644 --- a/apple/TablePro/Core/Database/DatabaseManager+Principals.swift +++ b/apple/TablePro/Core/Database/DatabaseManager+Principals.swift @@ -7,8 +7,7 @@ extension DatabaseManager { func principalDriver( for connectionId: UUID ) -> (any PluginDatabaseDriver & PluginPrincipalManagement)? { - guard let adapter = driver(for: connectionId) as? PluginDriverAdapter else { return nil } - return adapter.schemaPluginDriver as? any PluginDatabaseDriver & PluginPrincipalManagement + driver(for: connectionId)?.plugin as? any PluginDatabaseDriver & PluginPrincipalManagement } func executePrincipalChanges( diff --git a/apple/TablePro/Core/Database/DatabaseManager+SchemaComposition.swift b/apple/TablePro/Core/Database/DatabaseManager+SchemaComposition.swift index 0a7fe0f775..1917b17b30 100644 --- a/apple/TablePro/Core/Database/DatabaseManager+SchemaComposition.swift +++ b/apple/TablePro/Core/Database/DatabaseManager+SchemaComposition.swift @@ -14,7 +14,7 @@ extension DatabaseManager { _ body: @Sendable @escaping (DatabaseDriver, any PluginDatabaseDriver) async throws -> T ) async throws -> T { try await withScopedDriver(scope: scope, route: route, cancellation: .untracked) { driver in - guard let pluginDriver = (driver as? PluginDriverAdapter)?.schemaPluginDriver else { + guard let pluginDriver = driver.plugin else { throw DatabaseError.unsupportedOperation } return try await body(driver, pluginDriver) @@ -89,8 +89,9 @@ extension DatabaseManager { scope: DatabaseScope, route: ScopedDriverRoute ) async throws -> [String] { - try await withSchemaComposer(scope: scope, route: route) { _, pluginDriver in - (pluginDriver.generateCreateTableStatements(definition: definition) ?? []) + let schema = scope.schema + return try await withSchemaComposer(scope: scope, route: route) { _, pluginDriver in + (pluginDriver.generateCreateTableStatements(definition: definition, schema: schema) ?? []) .map { StatementBlank.trimming($0) } .filter { !$0.isEmpty } } diff --git a/apple/TablePro/Core/Database/DatabaseManager+ScopedDriver.swift b/apple/TablePro/Core/Database/DatabaseManager+ScopedDriver.swift index 904f0e3fdf..e4b869922d 100644 --- a/apple/TablePro/Core/Database/DatabaseManager+ScopedDriver.swift +++ b/apple/TablePro/Core/Database/DatabaseManager+ScopedDriver.swift @@ -797,8 +797,8 @@ extension DatabaseManager { ) ) } - } else if let adapter = driver as? PluginDriverAdapter { - try await adapter.switchDatabase(to: scope.database) + } else if let plugin = driver.plugin { + try await plugin.switchDatabase(to: scope.database) } } guard let schema = scope.schema, let schemaDriver = driver as? SchemaSwitchable else { return } diff --git a/apple/TablePro/Core/Database/DatabaseManager+Sessions.swift b/apple/TablePro/Core/Database/DatabaseManager+Sessions.swift index c3d63a5b56..68a8b89b20 100644 --- a/apple/TablePro/Core/Database/DatabaseManager+Sessions.swift +++ b/apple/TablePro/Core/Database/DatabaseManager+Sessions.swift @@ -393,10 +393,10 @@ extension DatabaseManager { switch action { case .selectDatabaseFromLastSession: if resolvedConnection.database.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty, - let adapter = driver as? PluginDriverAdapter, + let plugin = driver.plugin, let savedDb = appSettingsStorage.loadLastDatabase(for: connection.id) { do { - try await adapter.switchDatabase(to: savedDb) + try await plugin.switchDatabase(to: savedDb) activeSessions[connection.id]?.browseDatabase = savedDb } catch { Self.logger.warning("Failed to restore saved database '\(savedDb, privacy: .private(mask: .hash))' for \(connection.id): \(error.publicLogShape, privacy: .public)") @@ -406,7 +406,7 @@ extension DatabaseManager { let initialDb = resolvedConnection.databaseIndex(selectedBy: fieldId) if initialDb != 0 { do { - try await (driver as? PluginDriverAdapter)?.switchDatabase(to: String(initialDb)) + try await driver.plugin?.switchDatabase(to: String(initialDb)) } catch { Self.logger.error( "Failed to switch to database \(initialDb): \(error.publicLogShape, privacy: .public)" @@ -454,7 +454,7 @@ extension DatabaseManager { } else { try await reconnectOntoDatabase(database, for: connectionId) } - } else if driver is PluginDriverAdapter { + } else if driver.plugin != nil { let grouping = pm?.schema.databaseGroupingStrategy ?? .byDatabase let browsesSchemas = grouping == .bySchema || grouping == .hierarchicalSchema let sessionStartedAt = session(for: connectionId)?.connectedAt @@ -465,14 +465,15 @@ extension DatabaseManager { guard session(for: connectionId)?.connectedAt == sessionStartedAt else { throw CancellationError() } - guard let adapter = self.driver(for: connectionId) as? PluginDriverAdapter else { + guard let current = self.driver(for: connectionId), let plugin = current.plugin else { throw DatabaseError.notConnected } - try await adapter.switchDatabase(to: database) - if grouping == .bySchema { - await resetSchema(on: adapter, to: pm?.schema.defaultSchemaName) + try await plugin.switchDatabase(to: database) + let schemaDriver = current as? SchemaSwitchable + if grouping == .bySchema, let schemaDriver { + await resetSchema(on: schemaDriver, to: pm?.schema.defaultSchemaName) } - return adapter.currentSchema + return schemaDriver?.currentSchema } } updateSession(connectionId) { session in diff --git a/apple/TablePro/Core/Database/TableOperationSQLBuilder.swift b/apple/TablePro/Core/Database/TableOperationSQLBuilder.swift index 472a9849f4..f08bad4b6e 100644 --- a/apple/TablePro/Core/Database/TableOperationSQLBuilder.swift +++ b/apple/TablePro/Core/Database/TableOperationSQLBuilder.swift @@ -7,10 +7,10 @@ import Foundation @MainActor struct TableOperationSQLBuilder { - let adapterProvider: () -> PluginDriverAdapter? + let driverProvider: () -> DatabaseDriver? - init(adapterProvider: @escaping () -> PluginDriverAdapter?) { - self.adapterProvider = adapterProvider + init(driverProvider: @escaping () -> DatabaseDriver?) { + self.driverProvider = driverProvider } /// Every statement is built from the queued reference alone. @@ -66,18 +66,18 @@ struct TableOperationSQLBuilder { } func foreignKeyDisableStatements() -> [String] { - adapterProvider()?.foreignKeyDisableStatements() ?? [] + driverProvider()?.foreignKeyDisableStatements() ?? [] } func foreignKeyEnableStatements() -> [String] { - adapterProvider()?.foreignKeyEnableStatements() ?? [] + driverProvider()?.foreignKeyEnableStatements() ?? [] } private func truncateStatements( _ ref: DatabaseTreeTableRef, options: TableOperationOptions ) -> [String]? { - guard let adapter = adapterProvider() else { return nil } - return adapter.truncateTableStatements( + guard let driver = driverProvider() else { return nil } + return driver.truncateTableStatements( table: ref.table.name, schema: ref.qualifyingSchema, cascade: options.cascade ) } @@ -85,8 +85,8 @@ struct TableOperationSQLBuilder { private func dropObjectStatement( _ ref: DatabaseTreeTableRef, options: TableOperationOptions ) -> String? { - guard let adapter = adapterProvider() else { return nil } - return adapter.dropObjectStatement( + guard let driver = driverProvider() else { return nil } + return driver.dropObjectStatement( name: ref.table.name, objectType: TableObjectKeyword.forDDL(ref.table.type), schema: ref.qualifyingSchema, diff --git a/apple/TablePro/Core/LiveMessages/LiveMessageSessionSource.swift b/apple/TablePro/Core/LiveMessages/LiveMessageSessionSource.swift index 095c7c72c9..60671f0976 100644 --- a/apple/TablePro/Core/LiveMessages/LiveMessageSessionSource.swift +++ b/apple/TablePro/Core/LiveMessages/LiveMessageSessionSource.swift @@ -71,11 +71,11 @@ extension LiveMessageSessionSource { static func live(scope: DatabaseScope) -> LiveMessageSessionSource { LiveMessageSessionSource { let driver = try await openDedicatedDriver(scope: scope) - guard let adapter = driver as? PluginDriverAdapter else { + guard let plugin = driver.plugin else { driver.disconnect() throw LiveMessageError.unsupported } - return LiveMessageDriverHandle(driver: adapter.schemaPluginDriver) { adapter.disconnect() } + return LiveMessageDriverHandle(driver: plugin) { driver.disconnect() } } } diff --git a/apple/TablePro/Core/LiveMessages/MainContentCoordinator+LiveMessages.swift b/apple/TablePro/Core/LiveMessages/MainContentCoordinator+LiveMessages.swift index 627c150b49..058b8fbc94 100644 --- a/apple/TablePro/Core/LiveMessages/MainContentCoordinator+LiveMessages.swift +++ b/apple/TablePro/Core/LiveMessages/MainContentCoordinator+LiveMessages.swift @@ -13,8 +13,8 @@ extension MainContentCoordinator { private var liveMessaging: (any PluginDatabaseDriver & PluginLiveMessaging)? { guard AppModuleSettings.shared.isEnabled(.liveMessages), connection.type.supportsConnectionPooling, - let adapter = services.databaseManager.driver(for: connectionId) as? PluginDriverAdapter, - let messaging = adapter.schemaPluginDriver as? any PluginDatabaseDriver & PluginLiveMessaging, + let messaging = services.databaseManager.driver(for: connectionId)?.plugin + as? any PluginDatabaseDriver & PluginLiveMessaging, messaging.liveMessageKind != nil else { return nil } return messaging diff --git a/apple/TablePro/Core/ObjectCopy/ObjectCopyPlanner.swift b/apple/TablePro/Core/ObjectCopy/ObjectCopyPlanner.swift index 80a2cb599f..ecb68594af 100644 --- a/apple/TablePro/Core/ObjectCopy/ObjectCopyPlanner.swift +++ b/apple/TablePro/Core/ObjectCopy/ObjectCopyPlanner.swift @@ -767,12 +767,12 @@ internal struct ObjectCopyPlanner { guard let plugin = CompareMetadataService.pluginDriver(from: driver) else { throw ObjectCopyError.refused(Self.noTargetDriver) } - let builder = SchemaSyncScriptBuilder( - targetDriver: plugin, targetDatabaseType: driver.connection.type - ) var result: [String: ObjectCopyTableDDL] = [:] for input in inputs { try Task.checkCancellation() + let builder = SchemaSyncScriptBuilder( + targetDriver: plugin, targetDatabaseType: driver.connection.type, targetSchema: input.targetSchema + ) var ddl = ObjectCopyTableDDL() if input.dropsFirst { ddl.drop = Self.dropStatements( diff --git a/apple/TablePro/Core/Plugins/ExportDataSourceAdapter.swift b/apple/TablePro/Core/Plugins/ExportDataSourceAdapter.swift index bfb2c5a5a1..6306730dd1 100644 --- a/apple/TablePro/Core/Plugins/ExportDataSourceAdapter.swift +++ b/apple/TablePro/Core/Plugins/ExportDataSourceAdapter.swift @@ -59,7 +59,7 @@ final class ExportDataSourceAdapter: PluginExportDataSource, @unchecked Sendable } private var pluginDriver: (any PluginDatabaseDriver)? { - (driver as? PluginDriverAdapter)?.schemaPluginDriver + driver.plugin } // One line per table whose rows stopped at a ceiling, so a partial copy is never reported as the whole table. @@ -130,10 +130,7 @@ final class ExportDataSourceAdapter: PluginExportDataSource, @unchecked Sendable query: String, table: String ) -> AsyncThrowingStream { - guard let adapter = driver as? PluginDriverAdapter else { - return AsyncThrowingStream { $0.finish(throwing: PluginExportError.exportFailed("No plugin driver available")) } - } - let rows = adapter.streamExportRows(query: query, safeModeIsReadOnly: safeModeIsReadOnly) + let rows = driver.streamExportRows(query: query, safeModeIsReadOnly: safeModeIsReadOnly) return reportingCut(of: rows, table: table, engineCeiling: pagination.maximumRows) } diff --git a/apple/TablePro/Core/Plugins/PluginDriverAdapter+CopyIn.swift b/apple/TablePro/Core/Plugins/PluginDriverAdapter+CopyIn.swift index df153629f4..85e7a29207 100644 --- a/apple/TablePro/Core/Plugins/PluginDriverAdapter+CopyIn.swift +++ b/apple/TablePro/Core/Plugins/PluginDriverAdapter+CopyIn.swift @@ -8,7 +8,7 @@ import TableProPluginKit extension PluginDriverAdapter { var supportsCopyFromStandardInput: Bool { - schemaPluginDriver.capabilities.contains(.copyFromStandardInput) + pluginDriver.capabilities.contains(.copyFromStandardInput) } func copyFromStandardInput( @@ -22,6 +22,6 @@ extension PluginDriverAdapter { throw PluginDriverUnsupportedOperation.copyFromStandardInput } let sent = context.map { statementContext(statement, approvedAs: $0) } ?? statementContext(statement) - return mapQueryResult(try await schemaPluginDriver.copyFromStandardInput(statement: statement, rows: rows, context: sent)) + return mapQueryResult(try await pluginDriver.copyFromStandardInput(statement: statement, rows: rows, context: sent)) } } diff --git a/apple/TablePro/Core/Plugins/PluginDriverAdapter+CreateTableForm.swift b/apple/TablePro/Core/Plugins/PluginDriverAdapter+CreateTableForm.swift index 9ec28777d3..ff35e4f560 100644 --- a/apple/TablePro/Core/Plugins/PluginDriverAdapter+CreateTableForm.swift +++ b/apple/TablePro/Core/Plugins/PluginDriverAdapter+CreateTableForm.swift @@ -8,10 +8,10 @@ import TableProPluginKit internal extension PluginDriverAdapter { func createTableFormSpec(schema: String?) -> PluginCreateTableFormSpec? { - schemaPluginDriver.createTableFormSpec(schema: schema) + pluginDriver.createTableFormSpec(schema: schema) } func createTableStatements(for request: PluginCreateTableRequest, schema: String?) throws -> [String] { - try schemaPluginDriver.createTableStatements(for: request, schema: schema) + try pluginDriver.createTableStatements(for: request, schema: schema) } } diff --git a/apple/TablePro/Core/Plugins/PluginDriverAdapter+Export.swift b/apple/TablePro/Core/Plugins/PluginDriverAdapter+Export.swift index 15eb32cba2..d3404a9c8b 100644 --- a/apple/TablePro/Core/Plugins/PluginDriverAdapter+Export.swift +++ b/apple/TablePro/Core/Plugins/PluginDriverAdapter+Export.swift @@ -6,7 +6,7 @@ extension PluginDriverAdapter { if let error = StatementTextValidator.error(for: query) { return AsyncThrowingStream { $0.finish(throwing: error) } } - return schemaPluginDriver.streamRows(query: query, context: streamContext(query, safeModeIsReadOnly)) + return pluginDriver.streamRows(query: query, context: streamContext(query, safeModeIsReadOnly)) } func streamExportRows( @@ -16,7 +16,7 @@ extension PluginDriverAdapter { if let error = StatementTextValidator.error(for: query) { return AsyncThrowingStream { $0.finish(throwing: error) } } - return schemaPluginDriver.streamExportRows(query: query, context: streamContext(query, safeModeIsReadOnly)) + return pluginDriver.streamExportRows(query: query, context: streamContext(query, safeModeIsReadOnly)) } private func streamContext(_ query: String, _ safeModeIsReadOnly: Bool) -> PluginStatementContext { diff --git a/apple/TablePro/Core/Plugins/PluginDriverAdapter+ReadOnlyMode.swift b/apple/TablePro/Core/Plugins/PluginDriverAdapter+ReadOnlyMode.swift index dc8b03615b..a93cf00f27 100644 --- a/apple/TablePro/Core/Plugins/PluginDriverAdapter+ReadOnlyMode.swift +++ b/apple/TablePro/Core/Plugins/PluginDriverAdapter+ReadOnlyMode.swift @@ -8,13 +8,13 @@ import TableProPluginKit extension PluginDriverAdapter { var enforcesReadOnlyMode: Bool { - schemaPluginDriver.capabilities.contains(.enforcesReadOnlyMode) + pluginDriver.capabilities.contains(.enforcesReadOnlyMode) } func executeBoundedQuery(query: String, rowCap: Int, context: PluginStatementContext) async throws -> QueryResult? { try StatementTextValidator.validate(query) try refuseUnenforcedPolicy(context) - guard let pluginResult = try await schemaPluginDriver.executeBoundedQuery( + guard let pluginResult = try await pluginDriver.executeBoundedQuery( query: query, rowCap: rowCap, context: statementContext(query, approvedAs: context) diff --git a/apple/TablePro/Core/Plugins/PluginDriverAdapter+SchemaChangeChecks.swift b/apple/TablePro/Core/Plugins/PluginDriverAdapter+SchemaChangeChecks.swift index 5dcb69f862..b321de0e0e 100644 --- a/apple/TablePro/Core/Plugins/PluginDriverAdapter+SchemaChangeChecks.swift +++ b/apple/TablePro/Core/Plugins/PluginDriverAdapter+SchemaChangeChecks.swift @@ -7,16 +7,12 @@ import Foundation import TableProPluginKit internal extension PluginDriverAdapter { - func schemaChangeToken() async throws -> String? { - try await schemaPluginDriver.schemaChangeToken() - } - func reviewSchemaChange( table: String, schema: String?, operations: [PluginSchemaOperation] ) async throws -> PluginSchemaChangeReview { - try await schemaPluginDriver.reviewSchemaChange(table: table, schema: schema, operations: operations) + try await pluginDriver.reviewSchemaChange(table: table, schema: schema, operations: operations) } func schemaChangeRefusalBeforeWriting( @@ -25,7 +21,7 @@ internal extension PluginDriverAdapter { operations: [PluginSchemaOperation], review: PluginSchemaChangeReview ) async throws -> String? { - try await schemaPluginDriver.schemaChangeRefusalBeforeWriting( + try await pluginDriver.schemaChangeRefusalBeforeWriting( table: table, schema: schema, operations: operations, @@ -39,7 +35,7 @@ internal extension PluginDriverAdapter { operations: [PluginSchemaOperation], review: PluginSchemaChangeReview ) async throws -> String? { - try await schemaPluginDriver.schemaChangeShortfallAfterWriting( + try await pluginDriver.schemaChangeShortfallAfterWriting( table: table, schema: schema, operations: operations, @@ -48,6 +44,6 @@ internal extension PluginDriverAdapter { } func tableDefinitionDidChange(table: String, schema: String?) { - schemaPluginDriver.tableDefinitionDidChange(table: table, schema: schema) + pluginDriver.tableDefinitionDidChange(table: table, schema: schema) } } diff --git a/apple/TablePro/Core/Plugins/PluginDriverAdapter+ServerObjects.swift b/apple/TablePro/Core/Plugins/PluginDriverAdapter+ServerObjects.swift index 1994fe8817..83fd8fd173 100644 --- a/apple/TablePro/Core/Plugins/PluginDriverAdapter+ServerObjects.swift +++ b/apple/TablePro/Core/Plugins/PluginDriverAdapter+ServerObjects.swift @@ -10,15 +10,15 @@ import TableProPluginKit extension PluginDriverAdapter { private static let serverObjectsLogger = Logger(subsystem: "com.TablePro", category: "PluginDriverAdapter") - var serverObjectKinds: [PluginServerObjectKind] { schemaPluginDriver.serverObjectKinds } + var serverObjectKinds: [PluginServerObjectKind] { pluginDriver.serverObjectKinds } // A container kind is stamped with the schema it was read from, as routines are; a database kind // names no schema and reads with none. func fetchServerObjects(ofKind kindId: String, schema: String?) async throws -> [ServerObjectInfo] { - let isDatabaseScoped = schemaPluginDriver.serverObjectKinds.first { $0.id == kindId }?.scope == .database - let resolvedSchema = isDatabaseScoped ? nil : (schema ?? schemaPluginDriver.currentSchema) + let isDatabaseScoped = pluginDriver.serverObjectKinds.first { $0.id == kindId }?.scope == .database + let resolvedSchema = isDatabaseScoped ? nil : (schema ?? pluginDriver.currentSchema) do { - return try await schemaPluginDriver.fetchServerObjects(ofKind: kindId, schema: resolvedSchema) + return try await pluginDriver.fetchServerObjects(ofKind: kindId, schema: resolvedSchema) .filter { $0.kindId == kindId } .map { ServerObjectInfo($0).adoptingSchema(resolvedSchema) } .sorted { ($0.schema ?? "", $0.name) < ($1.schema ?? "", $1.name) } @@ -31,6 +31,6 @@ extension PluginDriverAdapter { } func fetchServerObject(_ object: ServerObjectInfo) async throws -> ServerObjectInfo { - ServerObjectInfo(try await schemaPluginDriver.fetchServerObject(object.pluginObject)) + ServerObjectInfo(try await pluginDriver.fetchServerObject(object.pluginObject)) } } diff --git a/apple/TablePro/Core/Plugins/PluginDriverAdapter.swift b/apple/TablePro/Core/Plugins/PluginDriverAdapter.swift index a2355bc845..0aab414335 100644 --- a/apple/TablePro/Core/Plugins/PluginDriverAdapter.swift +++ b/apple/TablePro/Core/Plugins/PluginDriverAdapter.swift @@ -37,7 +37,7 @@ final class PluginDriverAdapter: DatabaseDriver, SchemaSwitchable, DatabaseRepor let connection: DatabaseConnection let effectiveQueryTimeoutSeconds: Int - private let pluginDriver: any PluginDatabaseDriver + let pluginDriver: any PluginDatabaseDriver // The Vault lease this driver signed in with. Its database user goes away when it ends. private let credentialLease: VaultLeaseHold? private let connectionDeadline: ConnectionDeadline @@ -59,8 +59,9 @@ final class PluginDriverAdapter: DatabaseDriver, SchemaSwitchable, DatabaseRepor var sessionLexicalState: PluginSessionLexicalState? { pluginDriver.sessionLexicalState } var parameterStyle: ParameterStyle { pluginDriver.parameterStyle } - /// The underlying plugin driver, exposed for DDL schema generation delegation. - var schemaPluginDriver: any PluginDatabaseDriver { pluginDriver } + var plugin: (any PluginDatabaseDriver)? { pluginDriver } + + var sessionQueryTimeoutSeconds: Int? { effectiveQueryTimeoutSeconds } var queryBuildingPluginDriver: (any PluginDatabaseDriver)? { if state.withLock({ $0.buildsBrowseQueries }) { return pluginDriver } @@ -1020,93 +1021,10 @@ final class PluginDriverAdapter: DatabaseDriver, SchemaSwitchable, DatabaseRepor // MARK: - Database Switching - func switchDatabase(to database: String) async throws { - try await pluginDriver.switchDatabase(to: database) - } - var currentDatabase: String? { pluginDriver.currentDatabase } - // MARK: - DDL Schema Generation - - func generateAddColumnSQL(table: String, column: PluginColumnDefinition) -> String? { - pluginDriver.generateAddColumnSQL(table: table, column: column) - } - - func generateModifyColumnSQL( - table: String, - oldColumn: PluginColumnDefinition, - newColumn: PluginColumnDefinition - ) -> String? { - pluginDriver.generateModifyColumnSQL(table: table, oldColumn: oldColumn, newColumn: newColumn) - } - - func generateDropColumnSQL(table: String, columnName: String) -> String? { - pluginDriver.generateDropColumnSQL(table: table, columnName: columnName) - } - - func generateAddIndexSQL(table: String, index: PluginIndexDefinition) -> String? { - pluginDriver.generateAddIndexSQL(table: table, index: index) - } - - func generateDropIndexSQL(table: String, indexName: String) -> String? { - pluginDriver.generateDropIndexSQL(table: table, indexName: indexName) - } - - func generateAddForeignKeySQL(table: String, fk: PluginForeignKeyDefinition) -> String? { - pluginDriver.generateAddForeignKeySQL(table: table, fk: fk) - } - - func generateDropForeignKeySQL(table: String, constraintName: String) -> String? { - pluginDriver.generateDropForeignKeySQL(table: table, constraintName: constraintName) - } - - func generateModifyPrimaryKeySQL(table: String, oldColumns: [String], newColumns: [String], constraintName: String?) -> [String]? { - pluginDriver.generateModifyPrimaryKeySQL(table: table, oldColumns: oldColumns, newColumns: newColumns, constraintName: constraintName) - } - - func generateMoveColumnSQL(table: String, column: PluginColumnDefinition, afterColumn: String?) -> String? { - pluginDriver.generateMoveColumnSQL(table: table, column: column, afterColumn: afterColumn) - } - - /// Routed to the session driver rather than through `withMetadataDriver`. A rebuild plan reads - /// the catalog of the database this session is on, and a pooled driver is a second connection - /// that an embedded engine answers from a different database entirely. - func generateColumnReorderPlan( - table: String, - schema: String?, - columns: [PluginColumnDefinition], - desiredOrder: [String] - ) async throws -> PluginColumnReorderPlan? { - try await pluginDriver.generateColumnReorderPlan( - table: table, - schema: schema, - columns: columns, - desiredOrder: desiredOrder - ) - } - - func generateTableRebuildPlan( - table: String, - schema: String?, - respecification: PluginTableRespecification - ) async throws -> PluginColumnReorderPlan? { - try await pluginDriver.generateTableRebuildPlan( - table: table, - schema: schema, - respecification: respecification - ) - } - - func columnReorderSchemaFingerprint(table: String, schema: String?) async throws -> String? { - try await pluginDriver.columnReorderSchemaFingerprint(table: table, schema: schema) - } - - func generateCreateTableSQL(definition: PluginCreateTableDefinition) -> String? { - pluginDriver.generateCreateTableSQL(definition: definition) - } - // MARK: - Definition SQL (clipboard copy) func generateColumnDefinitionSQL(column: PluginColumnDefinition) -> String? { @@ -1149,39 +1067,6 @@ final class PluginDriverAdapter: DatabaseDriver, SchemaSwitchable, DatabaseRepor SQLDDLFallbackPolicy.allowsGeneratedDDL(for: connection.type) } - /// Which of these objects this connection has a drop or truncate statement for. - /// - /// Resolved per object rather than per engine, because a plugin answers per object: Typesense - /// has a statement for a collection and none for anything else, and Elasticsearch has none for - /// an index name carrying a wildcard. Every menu that offers either operation asks this, so the - /// answer and the statement it leads to come from one place. - func tableOperationEligibility( - for refs: some Collection, - isReadOnly: Bool - ) -> TableOperationEligibility.Context { - guard !isReadOnly else { return .unavailable } - var droppable: Set = [] - var truncatable: Set = [] - for ref in refs { - if dropObjectStatement( - name: ref.table.name, - objectType: TableObjectKeyword.forDDL(ref.table.type), - schema: ref.qualifyingSchema, - cascade: false - ) != nil { - droppable.insert(ref) - } - if truncateTableStatements( - table: ref.table.name, schema: ref.qualifyingSchema, cascade: false - ) != nil { - truncatable.insert(ref) - } - } - return TableOperationEligibility.Context( - droppable: droppable, truncatable: truncatable, isReadOnly: false - ) - } - func foreignKeyDisableStatements() -> [String]? { pluginDriver.foreignKeyDisableStatements() } @@ -1275,12 +1160,6 @@ final class PluginDriverAdapter: DatabaseDriver, SchemaSwitchable, DatabaseRepor pluginDriver.alterSequenceStatement(for: sequence, settings: settings) } - // MARK: - All Tables Metadata SQL - - func allTablesMetadataSQL(schema: String?) -> String? { - pluginDriver.allTablesMetadataSQL(schema: schema) - } - // MARK: - View Templates func createViewTemplate() -> String? { diff --git a/apple/TablePro/Core/Plugins/StreamingQueryExportDataSource.swift b/apple/TablePro/Core/Plugins/StreamingQueryExportDataSource.swift index fa822d1bba..8b3490625d 100644 --- a/apple/TablePro/Core/Plugins/StreamingQueryExportDataSource.swift +++ b/apple/TablePro/Core/Plugins/StreamingQueryExportDataSource.swift @@ -38,11 +38,8 @@ final class StreamingQueryExportDataSource: PluginExportDataSource, @unchecked S } func streamRows(table: String, databaseName: String) -> AsyncThrowingStream { - guard let adapter = driver as? PluginDriverAdapter else { - return AsyncThrowingStream { $0.finish(throwing: PluginExportError.exportFailed("No plugin driver available")) } - } let rowCut = rowCut - let rows = adapter.streamRows(query: query, safeModeIsReadOnly: safeModeIsReadOnly) + let rows = driver.streamRows(query: query, safeModeIsReadOnly: safeModeIsReadOnly) return ExportRowCut.reporting(rows, engineCeiling: nil) { limit in rowCut.withLock { $0 = limit } } @@ -53,11 +50,8 @@ final class StreamingQueryExportDataSource: PluginExportDataSource, @unchecked S } func streamExportRows(table: String, databaseName: String) -> AsyncThrowingStream { - guard let adapter = driver as? PluginDriverAdapter else { - return AsyncThrowingStream { $0.finish(throwing: PluginExportError.exportFailed("No plugin driver available")) } - } let rowCut = rowCut - let rows = adapter.streamExportRows(query: query, safeModeIsReadOnly: safeModeIsReadOnly) + let rows = driver.streamExportRows(query: query, safeModeIsReadOnly: safeModeIsReadOnly) return ExportRowCut.reporting(rows, engineCeiling: nil) { limit in rowCut.withLock { $0 = limit } } diff --git a/apple/TablePro/Core/RoutineDebugging/MainContentCoordinator+RoutineDebugging.swift b/apple/TablePro/Core/RoutineDebugging/MainContentCoordinator+RoutineDebugging.swift index 606b8dc891..236b464973 100644 --- a/apple/TablePro/Core/RoutineDebugging/MainContentCoordinator+RoutineDebugging.swift +++ b/apple/TablePro/Core/RoutineDebugging/MainContentCoordinator+RoutineDebugging.swift @@ -12,8 +12,8 @@ extension MainContentCoordinator { private var routineDebugger: (any PluginDatabaseDriver & PluginRoutineDebugging)? { guard AppModuleSettings.shared.isEnabled(.routineDebugger), connection.type.supportsConnectionPooling, - let adapter = services.databaseManager.driver(for: connectionId) as? PluginDriverAdapter, - let debugger = adapter.schemaPluginDriver as? any PluginDatabaseDriver & PluginRoutineDebugging, + let debugger = services.databaseManager.driver(for: connectionId)?.plugin + as? any PluginDatabaseDriver & PluginRoutineDebugging, debugger.canDebugRoutines else { return nil } return debugger @@ -206,8 +206,7 @@ extension MainContentCoordinator { nonisolated private static func metadataDebugger( _ driver: DatabaseDriver ) throws -> any PluginDatabaseDriver & PluginRoutineDebugging { - guard let adapter = driver as? PluginDriverAdapter, - let debugger = adapter.schemaPluginDriver as? any PluginDatabaseDriver & PluginRoutineDebugging + guard let debugger = driver.plugin as? any PluginDatabaseDriver & PluginRoutineDebugging else { throw RoutineDebugError.unsupported } return debugger } diff --git a/apple/TablePro/Core/RoutineDebugging/RoutineDebugSessionSource.swift b/apple/TablePro/Core/RoutineDebugging/RoutineDebugSessionSource.swift index 6ae474e555..36e34d2873 100644 --- a/apple/TablePro/Core/RoutineDebugging/RoutineDebugSessionSource.swift +++ b/apple/TablePro/Core/RoutineDebugging/RoutineDebugSessionSource.swift @@ -120,11 +120,11 @@ extension RoutineDebugSessionSource { await RoutineDebugSessions.shared.admits(connectionId, generation: generation) }) { let driver = try await open(scope, Self.queryTimeoutSeconds) - guard let adapter = driver as? PluginDriverAdapter else { + guard let plugin = driver.plugin else { driver.disconnect() throw RoutineDebugError.unsupported } - return RoutineDebugDriverHandle(driver: adapter.schemaPluginDriver) { adapter.disconnect() } + return RoutineDebugDriverHandle(driver: plugin) { driver.disconnect() } } } diff --git a/apple/TablePro/Core/SchemaTracking/CreateTableStatementComposer.swift b/apple/TablePro/Core/SchemaTracking/CreateTableStatementComposer.swift index 32bbab5f40..242bbb97d5 100644 --- a/apple/TablePro/Core/SchemaTracking/CreateTableStatementComposer.swift +++ b/apple/TablePro/Core/SchemaTracking/CreateTableStatementComposer.swift @@ -42,7 +42,7 @@ enum CreateTableStatementComposer { return CreateTableStatements(statements: [], issues: issues, tableName: definition.tableName) } - guard let createTable = driver.generateCreateTableStatements(definition: definition), !createTable.isEmpty else { + guard let createTable = driver.generateCreateTableStatements(definition: definition, schema: schema), !createTable.isEmpty else { issues.append(SchemaDraftIssue( section: .columns, row: nil, message: String(localized: "This database cannot create a table from the visual editor.") @@ -52,7 +52,7 @@ enum CreateTableStatementComposer { var statements = createTable for (position, index) in plan.indexes.enumerated() where !refusedIndexes.contains(position) { - guard let sql = driver.generateAddIndexSQL(table: definition.tableName, index: index) else { + guard let sql = driver.generateAddIndexSQL(table: definition.tableName, schema: schema, index: index) else { issues.append(SchemaDraftIssue( section: .indexes, row: plan.indexRow(at: position), message: String(localized: "Create Table cannot add an index on this database.") @@ -63,7 +63,9 @@ enum CreateTableStatementComposer { } for (position, constraint) in plan.checkConstraints.enumerated() { - guard let sql = driver.generateAddCheckConstraintSQL(table: definition.tableName, constraint: constraint) else { + guard let sql = driver.generateAddCheckConstraintSQL( + table: definition.tableName, schema: schema, constraint: constraint + ) else { issues.append(SchemaDraftIssue( section: .checkConstraints, row: plan.checkConstraintRow(at: position), message: String(localized: "Create Table cannot add a check constraint on this database.") diff --git a/apple/TablePro/Core/SchemaTracking/SchemaStatementGenerator.swift b/apple/TablePro/Core/SchemaTracking/SchemaStatementGenerator.swift index 73082f022b..ac766c1db4 100644 --- a/apple/TablePro/Core/SchemaTracking/SchemaStatementGenerator.swift +++ b/apple/TablePro/Core/SchemaTracking/SchemaStatementGenerator.swift @@ -373,7 +373,7 @@ struct SchemaStatementGenerator { // MARK: - Column Operations private func generateAddColumn(_ column: EditableColumnDefinition) -> SchemaStatement? { - guard let sql = pluginDriver.generateAddColumnSQL(table: tableName, column: column.toPlugin()) else { + guard let sql = pluginDriver.generateAddColumnSQL(table: tableName, schema: schema, column: column.toPlugin()) else { return nil } return SchemaStatement(sql: sql, description: "Add column '\(column.name)'", isDestructive: false) @@ -382,6 +382,7 @@ struct SchemaStatementGenerator { private func generateModifyColumn(old: EditableColumnDefinition, new: EditableColumnDefinition) -> SchemaStatement? { guard let sql = pluginDriver.generateModifyColumnSQL( table: tableName, + schema: schema, oldColumn: old.toPlugin(), newColumn: new.toPlugin() ) else { @@ -395,7 +396,7 @@ struct SchemaStatementGenerator { } private func generateDeleteColumn(_ column: EditableColumnDefinition) -> SchemaStatement? { - guard let sql = pluginDriver.generateDropColumnSQL(table: tableName, columnName: column.name) else { + guard let sql = pluginDriver.generateDropColumnSQL(table: tableName, schema: schema, columnName: column.name) else { return nil } return SchemaStatement(sql: sql, description: "Drop column '\(column.name)'", isDestructive: true) @@ -404,7 +405,7 @@ struct SchemaStatementGenerator { // MARK: - Index Operations private func generateAddIndex(_ index: EditableIndexDefinition) -> SchemaStatement? { - guard let sql = pluginDriver.generateAddIndexSQL(table: tableName, index: index.toPlugin()) else { + guard let sql = pluginDriver.generateAddIndexSQL(table: tableName, schema: schema, index: index.toPlugin()) else { return nil } return SchemaStatement(sql: sql, description: "Add index '\(index.name)'", isDestructive: false) @@ -416,11 +417,12 @@ struct SchemaStatementGenerator { } private func modifyIndexSQL(old: EditableIndexDefinition, new: EditableIndexDefinition) -> String? { - pluginDriver.generateModifyIndexSQL(table: tableName, oldIndexName: old.name, newIndex: new.toPlugin()) + pluginDriver.generateModifyIndexSQL( + table: tableName, schema: schema, oldIndexName: old.name, newIndex: new.toPlugin()) } private func generateDeleteIndex(_ index: EditableIndexDefinition) -> SchemaStatement? { - guard let sql = pluginDriver.generateDropIndexSQL(table: tableName, indexName: index.name) else { + guard let sql = pluginDriver.generateDropIndexSQL(table: tableName, schema: schema, indexName: index.name) else { return nil } return SchemaStatement(sql: sql, description: "Drop index '\(index.name)'", isDestructive: false) @@ -431,6 +433,7 @@ struct SchemaStatementGenerator { private func generateAddForeignKey(_ fk: EditableForeignKeyDefinition) -> SchemaStatement? { guard let sql = pluginDriver.generateAddForeignKeySQL( table: tableName, + schema: schema, fk: fk.toPlugin() ) else { return nil @@ -439,8 +442,8 @@ struct SchemaStatementGenerator { } private func generateModifyForeignKey(old: EditableForeignKeyDefinition, new: EditableForeignKeyDefinition) -> [SchemaStatement] { - guard let dropSql = pluginDriver.generateDropForeignKeySQL(table: tableName, constraintName: old.name), - let addSql = pluginDriver.generateAddForeignKeySQL(table: tableName, fk: new.toPlugin()) else { + guard let dropSql = pluginDriver.generateDropForeignKeySQL(table: tableName, schema: schema, constraintName: old.name), + let addSql = pluginDriver.generateAddForeignKeySQL(table: tableName, schema: schema, fk: new.toPlugin()) else { return [] } return [ @@ -450,7 +453,7 @@ struct SchemaStatementGenerator { } private func generateDeleteForeignKey(_ fk: EditableForeignKeyDefinition) -> SchemaStatement? { - guard let sql = pluginDriver.generateDropForeignKeySQL(table: tableName, constraintName: fk.name) else { + guard let sql = pluginDriver.generateDropForeignKeySQL(table: tableName, schema: schema, constraintName: fk.name) else { return nil } return SchemaStatement(sql: sql, description: "Drop foreign key '\(fk.name)'", isDestructive: false) @@ -460,7 +463,7 @@ struct SchemaStatementGenerator { private func generateAddCheckConstraint(_ constraint: EditableCheckConstraintDefinition) -> SchemaStatement? { guard let sql = pluginDriver.generateAddCheckConstraintSQL( - table: tableName, constraint: constraint.toPlugin() + table: tableName, schema: schema, constraint: constraint.toPlugin() ) else { return nil } @@ -478,7 +481,7 @@ struct SchemaStatementGenerator { ) -> [SchemaStatement] { if old.expression == new.expression, old.name != new.name, let renameSql = pluginDriver.generateRenameCheckConstraintSQL( - table: tableName, from: old.name, to: new.name + table: tableName, schema: schema, from: old.name, to: new.name ) { return [SchemaStatement( sql: renameSql, @@ -487,8 +490,8 @@ struct SchemaStatementGenerator { )] } - guard let dropSql = pluginDriver.generateDropCheckConstraintSQL(table: tableName, constraintName: old.name), - let addSql = pluginDriver.generateAddCheckConstraintSQL(table: tableName, constraint: new.toPlugin()) + guard let dropSql = pluginDriver.generateDropCheckConstraintSQL(table: tableName, schema: schema, constraintName: old.name), + let addSql = pluginDriver.generateAddCheckConstraintSQL(table: tableName, schema: schema, constraint: new.toPlugin()) else { return [] } @@ -504,7 +507,7 @@ struct SchemaStatementGenerator { private func generateDeleteCheckConstraint(_ constraint: EditableCheckConstraintDefinition) -> SchemaStatement? { guard let sql = pluginDriver.generateDropCheckConstraintSQL( - table: tableName, constraintName: constraint.name + table: tableName, schema: schema, constraintName: constraint.name ) else { return nil } @@ -555,7 +558,7 @@ struct SchemaStatementGenerator { private func generateModifyPrimaryKey(old: [String], new: [String]) -> [SchemaStatement] { guard let sqls = pluginDriver.generateModifyPrimaryKeySQL( - table: tableName, oldColumns: old, newColumns: new, constraintName: primaryKeyConstraintName + table: tableName, schema: schema, oldColumns: old, newColumns: new, constraintName: primaryKeyConstraintName ) else { return [] } diff --git a/apple/TablePro/Core/Services/Export/BulkReadTimeout.swift b/apple/TablePro/Core/Services/Export/BulkReadTimeout.swift index 64245263cb..33cde76265 100644 --- a/apple/TablePro/Core/Services/Export/BulkReadTimeout.swift +++ b/apple/TablePro/Core/Services/Export/BulkReadTimeout.swift @@ -38,7 +38,7 @@ enum BulkReadTimeout { } static func restoredSeconds(for driver: DatabaseDriver) async -> Int { - if let adapter = driver as? PluginDriverAdapter { return adapter.effectiveQueryTimeoutSeconds } + if let seconds = driver.sessionQueryTimeoutSeconds { return seconds } let configured = driver.connection.queryTimeoutSeconds return await MainActor.run { ConnectionTimeoutPolicy.effectiveQueryTimeoutSeconds( diff --git a/apple/TablePro/Core/Services/Export/ExportObjectLoader.swift b/apple/TablePro/Core/Services/Export/ExportObjectLoader.swift index 460ba767b5..6b4ecdcff1 100644 --- a/apple/TablePro/Core/Services/Export/ExportObjectLoader.swift +++ b/apple/TablePro/Core/Services/Export/ExportObjectLoader.swift @@ -48,7 +48,7 @@ internal enum ExportObjectLoader { return ExportObjectItem(name: table.name, databaseName: request.containerName, kind: kind) } - guard let pluginDriver = (driver as? PluginDriverAdapter)?.schemaPluginDriver else { return items } + guard let pluginDriver = driver.plugin else { return items } if request.kinds.contains(.routine) { items += await loadRoutines(schema: request.schema, container: request.containerName, driver: pluginDriver) diff --git a/apple/TablePro/Core/Services/Export/ExportService.swift b/apple/TablePro/Core/Services/Export/ExportService.swift index 3fdee14f15..cbb422ff52 100644 --- a/apple/TablePro/Core/Services/Export/ExportService.swift +++ b/apple/TablePro/Core/Services/Export/ExportService.swift @@ -86,7 +86,7 @@ final class ExportService: ObservableObject { ) { self.driver = driver self.databaseType = databaseType - self.effectiveQueryTimeoutSeconds = (driver as? PluginDriverAdapter)?.effectiveQueryTimeoutSeconds + self.effectiveQueryTimeoutSeconds = driver.sessionQueryTimeoutSeconds ?? ConnectionTimeoutPolicy.effectiveQueryTimeoutSeconds( configuredSeconds: driver.connection.queryTimeoutSeconds, globalSeconds: AppSettingsManager.shared.general.queryTimeoutSeconds @@ -103,7 +103,7 @@ final class ExportService: ObservableObject { self.driver = driver self.databaseType = databaseType self.effectiveQueryTimeoutSeconds = driver.map { driver in - (driver as? PluginDriverAdapter)?.effectiveQueryTimeoutSeconds + driver.sessionQueryTimeoutSeconds ?? ConnectionTimeoutPolicy.effectiveQueryTimeoutSeconds( configuredSeconds: driver.connection.queryTimeoutSeconds, globalSeconds: AppSettingsManager.shared.general.queryTimeoutSeconds diff --git a/apple/TablePro/Core/Services/Export/TableTransferService.swift b/apple/TablePro/Core/Services/Export/TableTransferService.swift index 2e4806418c..e1cb8fd6fe 100644 --- a/apple/TablePro/Core/Services/Export/TableTransferService.swift +++ b/apple/TablePro/Core/Services/Export/TableTransferService.swift @@ -386,7 +386,7 @@ final class TableTransferService: ObservableObject { if let supplied = request.columnMapping[object.name], !supplied.isEmpty { return supplied } - guard let pluginDriver = (destinationDriver as? PluginDriverAdapter)?.schemaPluginDriver else { + guard let pluginDriver = destinationDriver.plugin else { throw TableTransferError.targetMissing(table: object.name) } let destinationColumns: [String] diff --git a/apple/TablePro/Core/Services/Query/MetadataConnectionPool.swift b/apple/TablePro/Core/Services/Query/MetadataConnectionPool.swift index 29dfc758d7..aadd0555eb 100644 --- a/apple/TablePro/Core/Services/Query/MetadataConnectionPool.swift +++ b/apple/TablePro/Core/Services/Query/MetadataConnectionPool.swift @@ -829,7 +829,7 @@ final class MetadataConnectionPool { } static func switchDatabase(_ driver: DatabaseDriver, to database: String, timeoutSeconds: Double?) async throws { - guard let adapter = driver as? PluginDriverAdapter else { + guard let plugin = driver.plugin else { throw DatabaseError.unsupportedOperation } try await bounded( @@ -837,7 +837,7 @@ final class MetadataConnectionPool { timeoutSeconds: timeoutSeconds, timeoutMessage: String(format: String(localized: "Switching to database '%@' timed out."), database) ) { - try await adapter.switchDatabase(to: database) + try await plugin.switchDatabase(to: database) } } diff --git a/apple/TablePro/Core/Services/Query/TableListingLoader.swift b/apple/TablePro/Core/Services/Query/TableListingLoader.swift index 241da84d9f..5d2261dc75 100644 --- a/apple/TablePro/Core/Services/Query/TableListingLoader.swift +++ b/apple/TablePro/Core/Services/Query/TableListingLoader.swift @@ -5,6 +5,7 @@ import Foundation import os +import TableProPluginKit /// Reads one container's table listing over a metadata connection, the way the sidebar reads the /// tables themselves. @@ -25,13 +26,12 @@ internal struct TableListingLoader: Sendable { let slot = slot do { let result = try await provider.withMetadataDriver(scope: scope) { driver in - let adapter = driver as? PluginDriverAdapter let container = AllTablesListing.container(slot: slot, scope: scope) { value in - adapter?.escapeStringLiteral(value) ?? value + driver.escapeStringLiteral(value) } guard let statement = AllTablesListing.statement( databaseType: databaseType, - pluginListing: adapter?.allTablesMetadataSQL(schema: container) + pluginListing: driver.plugin?.allTablesMetadataSQL(schema: container) ) else { throw TableListingError.unavailable } diff --git a/apple/TablePro/Models/ClickHouse/ClickHousePartInfo.swift b/apple/TablePro/Models/ClickHouse/ClickHousePartInfo.swift deleted file mode 100644 index afe2544e04..0000000000 --- a/apple/TablePro/Models/ClickHouse/ClickHousePartInfo.swift +++ /dev/null @@ -1,17 +0,0 @@ -// -// ClickHousePartInfo.swift -// TablePro -// - -import Foundation - -struct ClickHousePartInfo: Identifiable { - let id = UUID() - let partition: String - let partitionId: String - let name: String - let rows: UInt64 - let bytesOnDisk: UInt64 - let modificationTime: String - let active: Bool -} diff --git a/apple/TablePro/ViewModels/SidebarViewModel.swift b/apple/TablePro/ViewModels/SidebarViewModel.swift index 3dee78e01d..e921ad64ba 100644 --- a/apple/TablePro/ViewModels/SidebarViewModel.swift +++ b/apple/TablePro/ViewModels/SidebarViewModel.swift @@ -389,10 +389,8 @@ final class SidebarViewModel: ObservableObject { private func tableOperationEligibility( for targets: [DatabaseTreeTableRef] ) -> TableOperationEligibility.Context? { - guard let adapter = DatabaseManager.shared.driver(for: connectionId) as? PluginDriverAdapter else { - return nil - } - return adapter.tableOperationEligibility(for: targets, isReadOnly: false) + guard let driver = DatabaseManager.shared.driver(for: connectionId) else { return nil } + return driver.tableOperationEligibility(for: targets, isReadOnly: false) } private func unstage(_ targets: [DatabaseTreeTableRef], from queue: inout Set) { diff --git a/apple/TablePro/Views/Export/ExportTreeBuilder.swift b/apple/TablePro/Views/Export/ExportTreeBuilder.swift index 7f0681e3db..aa5608c184 100644 --- a/apple/TablePro/Views/Export/ExportTreeBuilder.swift +++ b/apple/TablePro/Views/Export/ExportTreeBuilder.swift @@ -134,7 +134,7 @@ struct ExportDriverMetadataReader: ExportMetadataReading { func columnNames(table: String, schema: String?) async -> [String] { do { return try await withDriver(workload: .interactive) { driver in - guard let pluginDriver = (driver as? PluginDriverAdapter)?.schemaPluginDriver else { return [] } + guard let pluginDriver = driver.plugin else { return [] } return try await pluginDriver.fetchColumns(table: table, schema: schema).map(\.name) } } catch { diff --git a/apple/TablePro/Views/Export/TableTransferSheet.swift b/apple/TablePro/Views/Export/TableTransferSheet.swift index becf16b958..51c8975d58 100644 --- a/apple/TablePro/Views/Export/TableTransferSheet.swift +++ b/apple/TablePro/Views/Export/TableTransferSheet.swift @@ -395,7 +395,7 @@ struct TableTransferSheet: View { return try await DatabaseManager.shared.withMetadataDriver( scope: scope, workload: .interactive ) { driver in - guard let pluginDriver = (driver as? PluginDriverAdapter)?.schemaPluginDriver else { return [] } + guard let pluginDriver = driver.plugin else { return [] } return try await pluginDriver.fetchColumns(table: table, schema: schema).map(\.name) } } catch { diff --git a/apple/TablePro/Views/Main/Extensions/MainContentCoordinator+DatabaseFileChanges.swift b/apple/TablePro/Views/Main/Extensions/MainContentCoordinator+DatabaseFileChanges.swift index 6ca180a9ce..f1b391c48e 100644 --- a/apple/TablePro/Views/Main/Extensions/MainContentCoordinator+DatabaseFileChanges.swift +++ b/apple/TablePro/Views/Main/Extensions/MainContentCoordinator+DatabaseFileChanges.swift @@ -4,6 +4,7 @@ // import Foundation +import TableProPluginKit // Every commit rewrites a database file, so a file event alone says nothing about the catalog. The engine's // schema token does: the catalog reloads only when it moved, or when the engine has none. @@ -25,7 +26,7 @@ internal struct SchemaChangeTokenGate: Equatable { extension MainContentCoordinator { func refreshTablesIfSchemaChanged() async { let token = try? await services.databaseManager.withBrowseMetadataDriver(connectionId: connectionId) { driver in - try await (driver as? PluginDriverAdapter)?.schemaChangeToken() + try await driver.plugin?.schemaChangeToken() } guard schemaTokenGate.admits(token) else { return } DatabaseTreeMetadataService.shared.markListsStale(connectionId: connectionId) diff --git a/apple/TablePro/Views/Main/Extensions/MainContentCoordinator+Navigation.swift b/apple/TablePro/Views/Main/Extensions/MainContentCoordinator+Navigation.swift index c66b07c690..656c3898b5 100644 --- a/apple/TablePro/Views/Main/Extensions/MainContentCoordinator+Navigation.swift +++ b/apple/TablePro/Views/Main/Extensions/MainContentCoordinator+Navigation.swift @@ -464,7 +464,7 @@ extension MainContentCoordinator { /// Nil when the engine has no listing, which is when the sidebar leaves the command out. func allTablesListing() -> String? { let pluginListing = DatabaseManager.shared.driver(for: connectionId).flatMap { driver in - (driver as? PluginDriverAdapter)?.allTablesMetadataSQL(schema: allTablesContainer(driver)) + driver.plugin?.allTablesMetadataSQL(schema: allTablesContainer(driver)) } return AllTablesListing.statement(databaseType: connection.type, pluginListing: pluginListing) } diff --git a/apple/TablePro/Views/Main/Extensions/MainContentCoordinator+TableOperations.swift b/apple/TablePro/Views/Main/Extensions/MainContentCoordinator+TableOperations.swift index b19b9b1670..dc2c166f5e 100644 --- a/apple/TablePro/Views/Main/Extensions/MainContentCoordinator+TableOperations.swift +++ b/apple/TablePro/Views/Main/Extensions/MainContentCoordinator+TableOperations.swift @@ -8,8 +8,8 @@ import Foundation extension MainContentCoordinator { private var tableOperationBuilder: TableOperationSQLBuilder { TableOperationSQLBuilder( - adapterProvider: { - DatabaseManager.shared.driver(for: self.connectionId) as? PluginDriverAdapter + driverProvider: { + DatabaseManager.shared.driver(for: self.connectionId) } ) } diff --git a/apple/TablePro/Views/Main/MainContentCommandActions+DatabaseTools.swift b/apple/TablePro/Views/Main/MainContentCommandActions+DatabaseTools.swift index c7f4fd3344..44b5865418 100644 --- a/apple/TablePro/Views/Main/MainContentCommandActions+DatabaseTools.swift +++ b/apple/TablePro/Views/Main/MainContentCommandActions+DatabaseTools.swift @@ -57,8 +57,8 @@ extension MainContentCommandActions { var supportsUserManagement: Bool { guard let connectionId = coordinator?.connectionId, - let adapter = DatabaseManager.shared.driver(for: connectionId) as? PluginDriverAdapter + let plugin = DatabaseManager.shared.driver(for: connectionId)?.plugin else { return false } - return adapter.schemaPluginDriver.capabilities.contains(.userManagement) + return plugin.capabilities.contains(.userManagement) } } diff --git a/apple/TablePro/Views/Main/MainContentCommandActions.swift b/apple/TablePro/Views/Main/MainContentCommandActions.swift index 2c04094af5..33a92b20ed 100644 --- a/apple/TablePro/Views/Main/MainContentCommandActions.swift +++ b/apple/TablePro/Views/Main/MainContentCommandActions.swift @@ -521,9 +521,9 @@ final class MainContentCommandActions: ObservableObject { private var tableOperationEligibility: TableOperationEligibility.Context { guard let coordinator, - let adapter = DatabaseManager.shared.driver(for: coordinator.connectionId) as? PluginDriverAdapter + let driver = DatabaseManager.shared.driver(for: coordinator.connectionId) else { return .unavailable } - return adapter.tableOperationEligibility( + return driver.tableOperationEligibility( for: selectedTables.wrappedValue, isReadOnly: coordinator.safeModeLevel.blocksAllWrites ) diff --git a/apple/TablePro/Views/Main/MainContentCoordinator.swift b/apple/TablePro/Views/Main/MainContentCoordinator.swift index 6d5c189348..b2c8de1b9e 100644 --- a/apple/TablePro/Views/Main/MainContentCoordinator.swift +++ b/apple/TablePro/Views/Main/MainContentCoordinator.swift @@ -1173,8 +1173,7 @@ final class MainContentCoordinator: ObservableObject { return (nil, false) } let editorLanguage = services.pluginManager.editorLanguage(for: connection.type) - let pluginBuildsBrowse = (services.databaseManager.driver(for: connectionId) as? PluginDriverAdapter)? - .queryBuildingPluginDriver != nil + let pluginBuildsBrowse = services.databaseManager.driver(for: connectionId)?.queryBuildingPluginDriver != nil // Plugin-built browse or non-SQL: no table from query text; a tab's stored name or a pipeline `_id` can name another collection. let usesNoSQLBrowsing = editorLanguage != .sql || pluginBuildsBrowse if tab.tabType != .table, usesNoSQLBrowsing { diff --git a/apple/TablePro/Views/Sidebar/DatabaseTreeOutlineCoordinator+Menu.swift b/apple/TablePro/Views/Sidebar/DatabaseTreeOutlineCoordinator+Menu.swift index b0bbb8a0b4..473b7f0d85 100644 --- a/apple/TablePro/Views/Sidebar/DatabaseTreeOutlineCoordinator+Menu.swift +++ b/apple/TablePro/Views/Sidebar/DatabaseTreeOutlineCoordinator+Menu.swift @@ -161,10 +161,8 @@ extension DatabaseTreeOutlineCoordinator: NSMenuDelegate { private func tableOperationEligibility(candidates: Set) -> TableOperationEligibility.Context { - guard let adapter = DatabaseManager.shared.driver(for: connectionId) as? PluginDriverAdapter else { - return .unavailable - } - return adapter.tableOperationEligibility( + guard let driver = DatabaseManager.shared.driver(for: connectionId) else { return .unavailable } + return driver.tableOperationEligibility( for: candidates, isReadOnly: mainCoordinator?.safeModeLevel.blocksAllWrites ?? false ) diff --git a/apple/TablePro/Views/Structure/ClickHousePartsView.swift b/apple/TablePro/Views/Structure/StoragePartsView.swift similarity index 75% rename from apple/TablePro/Views/Structure/ClickHousePartsView.swift rename to apple/TablePro/Views/Structure/StoragePartsView.swift index f95d50739e..73931f5a74 100644 --- a/apple/TablePro/Views/Structure/ClickHousePartsView.swift +++ b/apple/TablePro/Views/Structure/StoragePartsView.swift @@ -1,5 +1,5 @@ // -// ClickHousePartsView.swift +// StoragePartsView.swift // TablePro // @@ -8,13 +8,13 @@ import SwiftUI import TableProPluginKit import TableProSQLGrammar -internal struct ClickHousePartsAlert: Equatable { +internal struct StoragePartsAlert: Equatable { let title: String let message: String } // A failed or refused action never replaces the list it acted on; only a load with nothing shown does. -internal struct ClickHousePartsPaneState { +internal struct StoragePartsPaneState { internal enum Display: Equatable { case loading case loadFailed(String) @@ -22,10 +22,10 @@ internal struct ClickHousePartsPaneState { case parts } - private(set) var parts: [ClickHousePartInfo] = [] + private(set) var parts: [PluginStoragePart] = [] private(set) var isLoading = true private(set) var loadError: String? - var alert: ClickHousePartsAlert? + var alert: StoragePartsAlert? var display: Display { guard parts.isEmpty else { return .parts } @@ -38,7 +38,7 @@ internal struct ClickHousePartsPaneState { loadError = nil } - mutating func finishLoad(_ parts: [ClickHousePartInfo]) { + mutating func finishLoad(_ parts: [PluginStoragePart]) { self.parts = parts isLoading = false } @@ -46,7 +46,7 @@ internal struct ClickHousePartsPaneState { mutating func failLoad(_ message: String) { isLoading = false guard parts.isEmpty else { - alert = ClickHousePartsAlert(title: String(localized: "Couldn't Read the Parts"), message: message) + alert = StoragePartsAlert(title: String(localized: "Couldn't Read the Parts"), message: message) return } loadError = message @@ -54,12 +54,12 @@ internal struct ClickHousePartsPaneState { mutating func actionEnded(_ failure: GatedOperationFailure, title: String) { guard let message = failure.message else { return } - alert = ClickHousePartsAlert(title: title, message: message) + alert = StoragePartsAlert(title: title, message: message) } } -struct ClickHousePartsView: View { - private static let logger = Logger(subsystem: "com.TablePro", category: "ClickHousePartsView") +struct StoragePartsView: View { + private static let logger = Logger(subsystem: "com.TablePro", category: "StoragePartsView") let tableName: String @@ -67,10 +67,10 @@ struct ClickHousePartsView: View { let connection: DatabaseConnection let reloadToken: Int - @State private var pane = ClickHousePartsPaneState() + @State private var pane = StoragePartsPaneState() @State private var loadedToken: Int? - @StateObject private var grid = StructureListGridModel(accessibilityLabel: StructurePane.parts.displayName) - @StateObject private var selection = StructureListSelection() + @StateObject private var grid = StructureListGridModel(accessibilityLabel: StructurePane.parts.displayName) + @StateObject private var selection = StructureListSelection() var body: some View { VStack(spacing: 0) { @@ -174,44 +174,33 @@ struct ClickHousePartsView: View { ] } - static func gridRow(for part: ClickHousePartInfo) -> StructureListRow { + // A part's name is unique within its table, active or not. + static func gridRow(for part: PluginStoragePart) -> StructureListRow { StructureListRow( - id: part.id, + id: part.name, values: [ part.partition, part.name, part.rows.formatted(.number.grouping(.automatic)), ByteSizeFormatting.string(bytes: part.bytesOnDisk), part.modificationTime, - part.active ? "YES" : "NO", + part.isActive ? "YES" : "NO", ], - spokenValues: [activeColumn: part.active ? String(localized: "Active") : String(localized: "Inactive")] - ) - } - - // Column order is ClickHousePartStatements.parts. - internal static func part(from row: [PluginCellValue]) -> ClickHousePartInfo? { - guard let name = row[safe: 2]?.asText else { return nil } - return ClickHousePartInfo( - partition: row[safe: 0]?.asText ?? "", - partitionId: row[safe: 1]?.asText ?? "", - name: name, - rows: row[safe: 3]?.asText.flatMap { UInt64($0) } ?? 0, - bytesOnDisk: row[safe: 4]?.asText.flatMap { UInt64($0) } ?? 0, - modificationTime: row[safe: 5]?.asText ?? "", - active: row[safe: 6]?.asText == "1" + spokenValues: [activeColumn: part.isActive ? String(localized: "Active") : String(localized: "Inactive")] ) } // MARK: - Actions + private var storageParts: (any PluginStorageParts)? { + DatabaseManager.shared.driver(for: scope.connectionId)?.plugin as? any PluginStorageParts + } + private func optimizeTable() { Task { @MainActor in - guard let driver = DatabaseManager.shared.driver(for: scope.connectionId) else { return } + guard let sql = storageParts?.mergePartsStatement(table: tableName, database: scope.database) else { return } await run( - ClickHousePartStatements.optimize( - database: scope.database, table: tableName, quote: driver.quoteIdentifier - ), + sql, description: String(localized: "Optimize Table"), failureTitle: String(localized: "Couldn't Optimize Table"), kind: .maintenance @@ -233,15 +222,12 @@ struct ClickHousePartsView: View { ) guard confirmed else { return } - guard let driver = DatabaseManager.shared.driver(for: scope.connectionId) else { return } + guard let storageParts else { return } let failureTitle = String(localized: "Couldn't Drop Partition") - guard let sql = ClickHousePartStatements.dropPartition( - database: scope.database, - table: tableName, - partitionId: part.partitionId, - quote: driver.quoteIdentifier + guard let sql = storageParts.dropPartitionStatement( + table: tableName, database: scope.database, partitionId: part.partitionId ) else { - pane.alert = ClickHousePartsAlert(title: failureTitle, message: Self.unusablePartitionIdMessage) + pane.alert = StoragePartsAlert(title: failureTitle, message: Self.unusablePartitionIdMessage) return } guard await run( @@ -265,15 +251,12 @@ struct ClickHousePartsView: View { ) guard confirmed else { return } - guard let driver = DatabaseManager.shared.driver(for: scope.connectionId) else { return } + guard let storageParts else { return } let failureTitle = String(localized: "Couldn't Detach Partition") - guard let sql = ClickHousePartStatements.detachPartition( - database: scope.database, - table: tableName, - partitionId: part.partitionId, - quote: driver.quoteIdentifier + guard let sql = storageParts.detachPartitionStatement( + table: tableName, database: scope.database, partitionId: part.partitionId ) else { - pane.alert = ClickHousePartsAlert(title: failureTitle, message: Self.unusablePartitionIdMessage) + pane.alert = StoragePartsAlert(title: failureTitle, message: Self.unusablePartitionIdMessage) return } guard await run( @@ -328,13 +311,13 @@ struct ClickHousePartsView: View { return true } - private func selectedPart() -> ClickHousePartInfo? { + private func selectedPart() -> PluginStoragePart? { Self.selectedPart(of: selection.ids, in: pane.parts) } - internal static func selectedPart(of selectedIDs: Set, in parts: [ClickHousePartInfo]) -> ClickHousePartInfo? { + internal static func selectedPart(of selectedIDs: Set, in parts: [PluginStoragePart]) -> PluginStoragePart? { guard selectedIDs.count == 1, let selectedId = selectedIDs.first else { return nil } - return parts.first { $0.id == selectedId } + return parts.first { $0.name == selectedId } } // MARK: - Data Loading @@ -351,14 +334,15 @@ struct ClickHousePartsView: View { let scope = scope let tableName = tableName do { - let result = try await DatabaseManager.shared.withMetadataDriver(scope: scope) { driver in - try await driver.execute(query: ClickHousePartStatements.parts( - database: scope.database, table: tableName, escape: driver.escapeStringLiteral - )) + let parts = try await DatabaseManager.shared.withMetadataDriver(scope: scope) { driver in + guard let storageParts = driver.plugin as? any PluginStorageParts else { + throw DatabaseError.unsupportedOperation + } + return try await storageParts.fetchStorageParts(table: tableName, database: scope.database) } guard !Task.isCancelled else { return } selection.ids = [] - pane.finishLoad(result.rows.compactMap(Self.part(from:))) + pane.finishLoad(parts) loadedToken = token } catch { guard !Task.isCancelled else { return } diff --git a/apple/TablePro/Views/Structure/StructureColumnReorderHandler.swift b/apple/TablePro/Views/Structure/StructureColumnReorderHandler.swift index a2121b2986..5189ae79df 100644 --- a/apple/TablePro/Views/Structure/StructureColumnReorderHandler.swift +++ b/apple/TablePro/Views/Structure/StructureColumnReorderHandler.swift @@ -89,10 +89,10 @@ enum StructureColumnReorderHandler { route: DatabaseManager.shared.executionRoute(for: scope), cancellation: .untracked ) { driver in - guard let adapter = driver as? PluginDriverAdapter else { + guard let plugin = driver.plugin else { throw ReorderError.notSupported } - let plan = try await adapter.generateColumnReorderPlan( + let plan = try await plugin.generateColumnReorderPlan( table: tableName, schema: schema, columns: columns, @@ -101,7 +101,7 @@ enum StructureColumnReorderHandler { guard let plan, !plan.statements.isEmpty else { throw ReorderError.sqlGenerationFailed } - let fingerprint = try? await adapter.columnReorderSchemaFingerprint( + let fingerprint = try? await plugin.columnReorderSchemaFingerprint( table: tableName, schema: schema ) return (plan, fingerprint) diff --git a/apple/TablePro/Views/Structure/StructureEditingSession.swift b/apple/TablePro/Views/Structure/StructureEditingSession.swift index 5e4cd04c59..73a17d0778 100644 --- a/apple/TablePro/Views/Structure/StructureEditingSession.swift +++ b/apple/TablePro/Views/Structure/StructureEditingSession.swift @@ -75,7 +75,7 @@ internal final class StructureEditingSession: ObservableObject { switch pane { case .definition, .ddl: true case .triggers: connection.type.supportsTriggers - case .parts: connection.type == .clickhouse + case .parts: serverSupport.offersStorageParts } } } diff --git a/apple/TablePro/Views/Structure/StructureRebuildPlanRunner.swift b/apple/TablePro/Views/Structure/StructureRebuildPlanRunner.swift index 8eaa7cd55f..5cf42a52f5 100644 --- a/apple/TablePro/Views/Structure/StructureRebuildPlanRunner.swift +++ b/apple/TablePro/Views/Structure/StructureRebuildPlanRunner.swift @@ -68,8 +68,7 @@ enum StructureRebuildPlanRunner { route: DatabaseManager.shared.executionRoute(for: scope), cancellation: .untracked ) { driver in - guard let adapter = driver as? PluginDriverAdapter else { return nil } - return try? await adapter.columnReorderSchemaFingerprint(table: tableName, schema: scope.schema) + try? await driver.plugin?.columnReorderSchemaFingerprint(table: tableName, schema: scope.schema) } } @@ -138,8 +137,8 @@ enum StructureRebuildPlanRunner { cancellation: .protectedWrite ) { driver in if let expectedFingerprint, - let adapter = driver as? PluginDriverAdapter, - let current = try? await adapter.columnReorderSchemaFingerprint( + let plugin = driver.plugin, + let current = try? await plugin.columnReorderSchemaFingerprint( table: tableName, schema: scope.schema ), current != expectedFingerprint { diff --git a/apple/TablePro/Views/Structure/StructureServerSupport.swift b/apple/TablePro/Views/Structure/StructureServerSupport.swift index 7029f3f3d5..bff57309b8 100644 --- a/apple/TablePro/Views/Structure/StructureServerSupport.swift +++ b/apple/TablePro/Views/Structure/StructureServerSupport.swift @@ -15,16 +15,20 @@ struct StructureServerSupport: Equatable, Sendable { /// 10.2.1 accept a `CHECK` clause and discard it. let checkConstraintRefusal: String? + let offersStorageParts: Bool + static let unrestricted = StructureServerSupport(unsupportedColumnFields: [], unsupportedIndexTypes: []) init( unsupportedColumnFields: Set, unsupportedIndexTypes: Set, - checkConstraintRefusal: String? = nil + checkConstraintRefusal: String? = nil, + offersStorageParts: Bool = false ) { self.unsupportedColumnFields = unsupportedColumnFields self.unsupportedIndexTypes = Set(unsupportedIndexTypes.map { $0.uppercased() }) self.checkConstraintRefusal = checkConstraintRefusal + self.offersStorageParts = offersStorageParts } init(driver: (any DatabaseDriver)?) { @@ -35,7 +39,8 @@ struct StructureServerSupport: Equatable, Sendable { self.init( unsupportedColumnFields: driver.unsupportedStructureColumnFields, unsupportedIndexTypes: driver.unsupportedIndexTypes, - checkConstraintRefusal: driver.checkConstraintRefusal + checkConstraintRefusal: driver.checkConstraintRefusal, + offersStorageParts: driver.plugin is any PluginStorageParts ) } diff --git a/apple/TablePro/Views/Structure/StructureTableRebuildHandler.swift b/apple/TablePro/Views/Structure/StructureTableRebuildHandler.swift index e9909116b1..e0d7700c56 100644 --- a/apple/TablePro/Views/Structure/StructureTableRebuildHandler.swift +++ b/apple/TablePro/Views/Structure/StructureTableRebuildHandler.swift @@ -125,15 +125,14 @@ enum StructureTableRebuildHandler { route: DatabaseManager.shared.executionRoute(for: scope), cancellation: .untracked ) { driver in - guard let adapter = driver as? PluginDriverAdapter else { throw RebuildError.planFailed } - guard let plan = try await adapter.generateTableRebuildPlan( + guard let pluginDriver = driver.plugin else { throw RebuildError.planFailed } + guard let plan = try await pluginDriver.generateTableRebuildPlan( table: tableName, schema: schema, respecification: respecification ) else { throw RebuildError.notRebuildable(tableName) } - let pluginDriver = adapter.schemaPluginDriver /// An index or a check constraint is its own object, created after the table exists, so /// it rides at the end of the same transaction rather than forcing a second one. A drop @@ -143,7 +142,7 @@ enum StructureTableRebuildHandler { .generate(changes: partitionTrailing) .map(\.sql) - let fingerprint = try? await adapter.columnReorderSchemaFingerprint( + let fingerprint = try? await pluginDriver.columnReorderSchemaFingerprint( table: tableName, schema: schema ) return (plan.appending(statements: trailing), fingerprint) diff --git a/apple/TablePro/Views/Structure/TableStructureView.swift b/apple/TablePro/Views/Structure/TableStructureView.swift index 3ca0325335..f637e35956 100644 --- a/apple/TablePro/Views/Structure/TableStructureView.swift +++ b/apple/TablePro/Views/Structure/TableStructureView.swift @@ -102,7 +102,7 @@ struct TableStructureView: View { onRetry: { session.retry(.ddl) } ) case .parts: - ClickHousePartsView( + StoragePartsView( tableName: session.tableName, scope: session.scope, connection: session.connection, diff --git a/apple/TableProTests/Core/Compare/SchemaSyncScriptBuilderTests.swift b/apple/TableProTests/Core/Compare/SchemaSyncScriptBuilderTests.swift index 08291e640a..f678f0e42e 100644 --- a/apple/TableProTests/Core/Compare/SchemaSyncScriptBuilderTests.swift +++ b/apple/TableProTests/Core/Compare/SchemaSyncScriptBuilderTests.swift @@ -70,7 +70,7 @@ final class SchemaSyncScriptBuilderTests: XCTestCase { override func setUp() { super.setUp() driver = StubSyncDriver() - builder = SchemaSyncScriptBuilder(targetDriver: driver, targetDatabaseType: .mysql) + builder = SchemaSyncScriptBuilder(targetDriver: driver, targetDatabaseType: .mysql, targetSchema: nil) } override func tearDown() { @@ -122,7 +122,7 @@ final class SchemaSyncScriptBuilderTests: XCTestCase { let operations: [SchemaSyncOperation] = [.alterTable(name: "visits", schema: nil, changes: [change])] let mysql = try builder.build(operations: operations, foreignKeysByTable: [:]) - let postgres = try SchemaSyncScriptBuilder(targetDriver: driver, targetDatabaseType: .postgresql) + let postgres = try SchemaSyncScriptBuilder(targetDriver: driver, targetDatabaseType: .postgresql, targetSchema: nil) .build(operations: operations, foreignKeysByTable: [:]) XCTAssertTrue(mysql.first?.hazards.contains { $0.kind == .lossyTypeChange } == true) @@ -295,7 +295,7 @@ final class SchemaSyncScriptBuilderTests: XCTestCase { /// Sent as one text, Oracle refuses a table and its index with ORA-03405 and creates neither. func testATableAndItsIndexGoOutAsTheStatementsTheDriverWrote() throws { driver.createTableStatements = ["CREATE TABLE \"T\" (\n \"A\" NUMBER\n)", "CREATE INDEX \"I\" ON \"T\" (\"A\")"] - let statements = try SchemaSyncScriptBuilder(targetDriver: driver, targetDatabaseType: .oracle) + let statements = try SchemaSyncScriptBuilder(targetDriver: driver, targetDatabaseType: .oracle, targetSchema: nil) .build(operations: [.createTable(snapshot("T"))], foreignKeysByTable: [:]) XCTAssertEqual(statements.map(\.sql), driver.createTableStatements) @@ -313,7 +313,7 @@ final class SchemaSyncScriptBuilderTests: XCTestCase { onUpdate: nil, charset: nil, extra: nil, isPrimaryKey: false ) } - let statements = try SchemaSyncScriptBuilder(targetDriver: driver, targetDatabaseType: .oracle).build( + let statements = try SchemaSyncScriptBuilder(targetDriver: driver, targetDatabaseType: .oracle, targetSchema: nil).build( operations: [.alterTable(name: "T", schema: nil, changes: [.modifyColumn(old: column("A"), new: column("B"))])], foreignKeysByTable: [:] ) diff --git a/apple/TableProTests/Core/Compare/SchemaSyncTargetSchemaTests.swift b/apple/TableProTests/Core/Compare/SchemaSyncTargetSchemaTests.swift new file mode 100644 index 0000000000..0ae18457f1 --- /dev/null +++ b/apple/TableProTests/Core/Compare/SchemaSyncTargetSchemaTests.swift @@ -0,0 +1,62 @@ +import Foundation +@testable import TablePro +import TableProPluginKit +import Testing + +private final class SchemaQualifyingDriver: PluginDriverStub, @unchecked Sendable { + var supportsSchemas: Bool { true } + var supportsTransactions: Bool { true } + var currentSchema: String? { "session" } + + private func qualified(_ table: String, _ schema: String?) -> String { + "\(schema ?? "session").\(table)" + } + + func generateCreateTableStatements(definition: PluginCreateTableDefinition, schema: String?) -> [String]? { + ["CREATE TABLE \(qualified(definition.tableName, schema))"] + } + + func generateAddColumnSQL(table: String, schema: String?, column: PluginColumnDefinition) -> String? { + "ALTER TABLE \(qualified(table, schema)) ADD \(column.name)" + } + + func generateAddIndexSQL(table: String, schema: String?, index: PluginIndexDefinition) -> String? { + "CREATE INDEX \(index.name) ON \(qualified(table, schema))" + } +} + +struct SchemaSyncTargetSchemaTests { + private let driver = SchemaQualifyingDriver() + + @Test("Create and alter name the target's schema, not the source snapshot's or the session's") + func statementsNameTheTargetSchema() throws { + let builder = SchemaSyncScriptBuilder(targetDriver: driver, targetDatabaseType: .postgresql, targetSchema: "archive") + let source = TableStructureSnapshot( + name: "orders", schema: "sales", columns: [TestFixtures.makeEditableColumn(isPrimaryKey: true)] + ) + let statements = try builder.build( + operations: [ + .createTable(source), + .alterTable( + name: "customers", schema: "sales", + changes: [.addColumn(TestFixtures.makeEditableColumn(name: "note", dataType: "TEXT"))] + ) + ], + foreignKeysByTable: [:] + ) + + let sql = statements.map(\.sql) + #expect(sql == ["CREATE TABLE archive.orders", "ALTER TABLE archive.customers ADD note"]) + } + + @Test("A Structure save names its scope's schema") + func generatorNamesItsSchema() throws { + let generator = SchemaStatementGenerator(tableName: "orders", schema: "sales", pluginDriver: driver) + let sql = try generator.generate(changes: [ + .addColumn(TestFixtures.makeEditableColumn(name: "note", dataType: "TEXT")), + .addIndex(TestFixtures.makeEditableIndex(name: "orders_note", columns: ["note"])) + ]).map(\.sql) + + #expect(sql == ["ALTER TABLE sales.orders ADD note;", "CREATE INDEX orders_note ON sales.orders;"]) + } +} diff --git a/apple/TableProTests/Core/Database/DatabaseManagerTests.swift b/apple/TableProTests/Core/Database/DatabaseManagerTests.swift index 10989dcb28..8ea2cf5727 100644 --- a/apple/TableProTests/Core/Database/DatabaseManagerTests.swift +++ b/apple/TableProTests/Core/Database/DatabaseManagerTests.swift @@ -256,7 +256,7 @@ struct DatabaseManagerQueryTimeoutHandoffTests { do { try await DatabaseManager.shared.ensureConnected(connection) if let adapter = DatabaseManager.shared.driver(for: connection.id) as? PluginDriverAdapter, - let pluginDriver = adapter.schemaPluginDriver as? FakeMSSQLPluginDriver { + let pluginDriver = adapter.pluginDriver as? FakeMSSQLPluginDriver { #expect(pluginDriver.applyQueryTimeoutValues == [expected]) #expect(DatabaseManager.shared.session(for: connection.id)?.effectiveQueryTimeoutSeconds == expected) } else { diff --git a/apple/TableProTests/Core/Database/TableOperationSQLBuilderTests.swift b/apple/TableProTests/Core/Database/TableOperationSQLBuilderTests.swift index 8e90842aac..e73a423619 100644 --- a/apple/TableProTests/Core/Database/TableOperationSQLBuilderTests.swift +++ b/apple/TableProTests/Core/Database/TableOperationSQLBuilderTests.swift @@ -57,19 +57,19 @@ struct TableOperationSQLBuilderTests { private func makeForeignKeyBuilder() -> TableOperationSQLBuilder { let connection = DatabaseConnection(name: "Test", type: .mysql) let adapter = PluginDriverAdapter(connection: connection, pluginDriver: StubForeignKeyDriver()) - return TableOperationSQLBuilder(adapterProvider: { adapter }) + return TableOperationSQLBuilder(driverProvider: { adapter }) } private func makeBuilder() -> TableOperationSQLBuilder { let connection = DatabaseConnection(name: "Test", type: .postgresql) let adapter = PluginDriverAdapter(connection: connection, pluginDriver: StubDropDriver()) - return TableOperationSQLBuilder(adapterProvider: { adapter }) + return TableOperationSQLBuilder(driverProvider: { adapter }) } private func makeNonSQLBuilder() -> TableOperationSQLBuilder { let connection = DatabaseConnection(name: "Test", type: .elasticsearch) let adapter = PluginDriverAdapter(connection: connection, pluginDriver: StubDropDriver()) - return TableOperationSQLBuilder(adapterProvider: { adapter }) + return TableOperationSQLBuilder(driverProvider: { adapter }) } /// Skipping it instead would run the rest of the plan while the coordinator still recorded diff --git a/apple/TableProTests/Core/Plugins/DatabaseDriverPluginSurfaceTests.swift b/apple/TableProTests/Core/Plugins/DatabaseDriverPluginSurfaceTests.swift new file mode 100644 index 0000000000..54e10c8faf --- /dev/null +++ b/apple/TableProTests/Core/Plugins/DatabaseDriverPluginSurfaceTests.swift @@ -0,0 +1,53 @@ +import Foundation +@testable import TablePro +import TableProPluginKit +import Testing + +private final class SurfaceStubDriver: PluginDriverStub, @unchecked Sendable { + var supportsSchemas: Bool { false } + var supportsTransactions: Bool { false } + var currentSchema: String? { nil } + + func dropObjectStatement(name: String, objectType: String, schema: String?, cascade: Bool) -> String? { + "DROP \(objectType) \(name)" + } + + func truncateTableStatements(table: String, schema: String?, cascade: Bool) -> [String]? { + ["TRUNCATE \(table)"] + } +} + +// A member the adapter declares with a different type than the protocol's would not witness it, and every call +// through `DatabaseDriver` would take the default instead. +@MainActor +struct DatabaseDriverPluginSurfaceTests { + @Test("Through the protocol, the adapter answers with its plugin, its timeout and its statements") + func adapterWitnessesTheSurface() async throws { + let plugin = SurfaceStubDriver() + let driver: any DatabaseDriver = PluginDriverAdapter( + connection: TestFixtures.makeConnection(type: .postgresql), + pluginDriver: plugin, + effectiveQueryTimeoutSeconds: 42 + ) + + #expect(driver.plugin === plugin) + #expect(driver.sessionQueryTimeoutSeconds == 42) + #expect(driver.dropObjectStatement(name: "t", objectType: "TABLE", schema: nil, cascade: false) == "DROP TABLE t") + #expect(driver.truncateTableStatements(table: "t", schema: nil, cascade: false) == ["TRUNCATE t"]) + for try await _ in driver.streamRows(query: "SELECT 1", safeModeIsReadOnly: false) {} + } + + @Test("A driver that wraps no plugin has no plugin, no session timeout and no table statements") + func driverWithoutAPluginAnswersNothing() async { + let driver: any DatabaseDriver = MockDatabaseDriver() + let ref = TestFixtures.makeTableRef(name: "t") + + #expect(driver.plugin == nil) + #expect(driver.sessionQueryTimeoutSeconds == nil) + #expect(driver.dropObjectStatement(name: "t", objectType: "TABLE", schema: nil, cascade: false) == nil) + #expect(driver.tableOperationEligibility(for: [ref], isReadOnly: false).droppable.isEmpty) + await #expect(throws: DatabaseError.self) { + for try await _ in driver.streamRows(query: "SELECT 1", safeModeIsReadOnly: false) {} + } + } +} diff --git a/apple/TableProTests/Core/SchemaTracking/SchemaOperationRefusalTests.swift b/apple/TableProTests/Core/SchemaTracking/SchemaOperationRefusalTests.swift index 22637772ec..a40ea30b21 100644 --- a/apple/TableProTests/Core/SchemaTracking/SchemaOperationRefusalTests.swift +++ b/apple/TableProTests/Core/SchemaTracking/SchemaOperationRefusalTests.swift @@ -359,7 +359,7 @@ struct SchemaOperationRefusalTests { @Test("Schema sync refuses to create a table the target cannot hold, naming table and reason") func schemaSyncRefusesCreateTable() { let snapshot = TableStructureSnapshot(name: "orders", columns: [column("total", generated: true)]) - let builder = SchemaSyncScriptBuilder(targetDriver: legacyDriver(), targetDatabaseType: .postgresql) + let builder = SchemaSyncScriptBuilder(targetDriver: legacyDriver(), targetDatabaseType: .postgresql, targetSchema: nil) do { _ = try builder.build(operations: [.createTable(snapshot)], foreignKeysByTable: [:]) Issue.record("expected a refusal") @@ -371,7 +371,7 @@ struct SchemaOperationRefusalTests { @Test("Schema sync refuses to add a column the target cannot hold") func schemaSyncRefusesAlterTable() { - let builder = SchemaSyncScriptBuilder(targetDriver: legacyDriver(), targetDatabaseType: .postgresql) + let builder = SchemaSyncScriptBuilder(targetDriver: legacyDriver(), targetDatabaseType: .postgresql, targetSchema: nil) do { _ = try builder.build( operations: [.alterTable(name: "orders", schema: nil, changes: [.addColumn(column("total", generated: true))])], diff --git a/apple/TableProTests/Views/Structure/ClickHousePartsGridTests.swift b/apple/TableProTests/Views/Structure/StoragePartsGridTests.swift similarity index 50% rename from apple/TableProTests/Views/Structure/ClickHousePartsGridTests.swift rename to apple/TableProTests/Views/Structure/StoragePartsGridTests.swift index fde04c7c82..c6da621062 100644 --- a/apple/TableProTests/Views/Structure/ClickHousePartsGridTests.swift +++ b/apple/TableProTests/Views/Structure/StoragePartsGridTests.swift @@ -1,5 +1,5 @@ // -// ClickHousePartsGridTests.swift +// StoragePartsGridTests.swift // TableProTests // @@ -9,23 +9,23 @@ import TableProPluginKit import Testing @MainActor -struct ClickHousePartsGridTests { - private let part = ClickHousePartInfo( +struct StoragePartsGridTests { + private let part = PluginStoragePart( partition: "202601", partitionId: "202601", name: "202601_1_4_1", rows: 1_234_567, bytesOnDisk: 5_242_880, modificationTime: "2026-01-05 10:00:00", - active: true + isActive: true ) @Test("Each part fills the six columns the parts list has always shown") func rowCarriesEveryColumn() { - let row = ClickHousePartsView.gridRow(for: part) + let row = StoragePartsView.gridRow(for: part) - #expect(ClickHousePartsView.columnTitles.count == row.values.count) - #expect(row.id == part.id) + #expect(StoragePartsView.columnTitles.count == row.values.count) + #expect(row.id == part.name) #expect(row.values[0] == "202601") #expect(row.values[1] == "202601_1_4_1") #expect(row.values[2] == UInt64(1_234_567).formatted(.number.grouping(.automatic))) @@ -36,60 +36,60 @@ struct ClickHousePartsGridTests { @Test("An inactive part reads NO") func inactivePart() { - let inactive = ClickHousePartInfo( - partition: "", partitionId: "", name: "p", rows: 0, bytesOnDisk: 0, modificationTime: "", active: false + let inactive = PluginStoragePart( + partition: "", partitionId: "", name: "p", rows: 0, bytesOnDisk: 0, modificationTime: "", isActive: false ) - #expect(ClickHousePartsView.gridRow(for: inactive).values.last == "NO") + #expect(StoragePartsView.gridRow(for: inactive).values.last == "NO") } @Test("Active reads aloud as Active or Inactive rather than YES or NO") func activeIsSpokenByName() { - let inactive = ClickHousePartInfo( - partition: "", partitionId: "", name: "p", rows: 0, bytesOnDisk: 0, modificationTime: "", active: false + let inactive = PluginStoragePart( + partition: "", partitionId: "", name: "p", rows: 0, bytesOnDisk: 0, modificationTime: "", isActive: false ) - let active = ClickHousePartsView.activeColumn + let active = StoragePartsView.activeColumn - #expect(ClickHousePartsView.columnTitles[active] == String(localized: "Active")) - #expect(ClickHousePartsView.gridRow(for: part).spokenValues == [active: String(localized: "Active")]) - #expect(ClickHousePartsView.gridRow(for: inactive).spokenValues == [active: String(localized: "Inactive")]) + #expect(StoragePartsView.columnTitles[active] == String(localized: "Active")) + #expect(StoragePartsView.gridRow(for: part).spokenValues == [active: String(localized: "Active")]) + #expect(StoragePartsView.gridRow(for: inactive).spokenValues == [active: String(localized: "Inactive")]) } @Test("Each column keeps the minimum width the parts list has always given it") func minimumWidths() { - #expect(ClickHousePartsView.columnMinimumWidths == [80, 100, 60, 60, 100, 50]) - #expect(ClickHousePartsView.columnMinimumWidths.count == ClickHousePartsView.columnTitles.count) - #expect(zip(ClickHousePartsView.columnMinimumWidths, ClickHousePartsView.columnWidths).allSatisfy { $0 <= $1 }) + #expect(StoragePartsView.columnMinimumWidths == [80, 100, 60, 60, 100, 50]) + #expect(StoragePartsView.columnMinimumWidths.count == StoragePartsView.columnTitles.count) + #expect(zip(StoragePartsView.columnMinimumWidths, StoragePartsView.columnWidths).allSatisfy { $0 <= $1 }) } @Test("Drop and Detach act on the one selected part, and on none while several are selected") func selectedPartition() { - let other = ClickHousePartInfo( + let other = PluginStoragePart( partition: "202602", partitionId: "202602", name: "202602_1_1_0", rows: 1, bytesOnDisk: 1, - modificationTime: "", active: true + modificationTime: "", isActive: true ) let parts = [part, other] - #expect(ClickHousePartsView.selectedPart(of: [other.id], in: parts)?.id == other.id) - #expect(ClickHousePartsView.selectedPart(of: [part.id, other.id], in: parts)?.id == nil) - #expect(ClickHousePartsView.selectedPart(of: [], in: parts)?.id == nil) - #expect(ClickHousePartsView.selectedPart(of: [UUID()], in: parts)?.id == nil) + #expect(StoragePartsView.selectedPart(of: [other.name], in: parts)?.name == other.name) + #expect(StoragePartsView.selectedPart(of: [part.name, other.name], in: parts) == nil) + #expect(StoragePartsView.selectedPart(of: [], in: parts) == nil) + #expect(StoragePartsView.selectedPart(of: ["missing"], in: parts) == nil) } @Test("A selected grid row names its own part") func selectedRowResolvesToItsPart() throws { - let other = ClickHousePartInfo( + let other = PluginStoragePart( partition: "202602", partitionId: "202602", name: "202602_1_1_0", rows: 1, bytesOnDisk: 1, - modificationTime: "", active: true + modificationTime: "", isActive: true ) let parts = [part, other] - let grid = StructureListGridModel() - var selected: Set = [] + let grid = StructureListGridModel() + var selected: Set = [] grid.onSelect = { selected = $0 } grid.load( - columns: ClickHousePartsView.columnTitles, - rows: parts.map(ClickHousePartsView.gridRow(for:)), - defaultWidths: ClickHousePartsView.columnWidths, - minimumWidths: ClickHousePartsView.columnMinimumWidths, + columns: StoragePartsView.columnTitles, + rows: parts.map(StoragePartsView.gridRow(for:)), + defaultWidths: StoragePartsView.columnWidths, + minimumWidths: StoragePartsView.columnMinimumWidths, databaseType: .clickhouse, sortState: nil ) @@ -97,56 +97,32 @@ struct ClickHousePartsGridTests { grid.model.selectRows([second]) - #expect(grid.id(for: second) == other.id) - #expect(selected == [other.id]) - #expect(ClickHousePartsView.selectedPart(of: selected, in: parts)?.partition == "202602") + #expect(grid.id(for: second) == other.name) + #expect(selected == [other.name]) + #expect(StoragePartsView.selectedPart(of: selected, in: parts)?.partition == "202602") #expect(grid.model.rowID(at: 2) == nil) } - @Test("A parts row keeps the partition ID a statement names beside the value the grid shows") - func rowCarriesThePartitionId() throws { - let row: [PluginCellValue] = [ - "(202401,'eu')", - "c1f8e6e2a7b04d4c9e1f0a2b3c4d5e6f", - "c1f8e6e2a7b04d4c9e1f0a2b3c4d5e6f_1_1_0", - "12", - "4096", - "2026-01-05 10:00:00", - "1", - ] - - let parsed = try #require(ClickHousePartsView.part(from: row)) - - #expect(parsed.partition == "(202401,'eu')") - #expect(parsed.partitionId == "c1f8e6e2a7b04d4c9e1f0a2b3c4d5e6f") - #expect(parsed.name == "c1f8e6e2a7b04d4c9e1f0a2b3c4d5e6f_1_1_0") - #expect(parsed.rows == 12) - #expect(parsed.bytesOnDisk == 4096) - #expect(parsed.modificationTime == "2026-01-05 10:00:00") - #expect(parsed.active) - #expect(ClickHousePartsView.gridRow(for: parsed).values[0] == "(202401,'eu')") - } - // The pane used to swap the list and its toolbar for the error text until the tab was refreshed. @Test("A refused or failed action keeps the parts list and its toolbar on screen") func actionFailureKeepsTheList() { - var pane = ClickHousePartsPaneState() + var pane = StoragePartsPaneState() pane.beginLoad() pane.finishLoad([part]) pane.actionEnded(.refused("Safe Mode is read-only"), title: "Couldn't Drop Partition") #expect(pane.display == .parts) - #expect(pane.alert == ClickHousePartsAlert(title: "Couldn't Drop Partition", message: "Safe Mode is read-only")) + #expect(pane.alert == StoragePartsAlert(title: "Couldn't Drop Partition", message: "Safe Mode is read-only")) pane.alert = nil pane.actionEnded(.failed("Wrong partition value"), title: "Couldn't Detach Partition") #expect(pane.display == .parts) - #expect(pane.alert == ClickHousePartsAlert(title: "Couldn't Detach Partition", message: "Wrong partition value")) + #expect(pane.alert == StoragePartsAlert(title: "Couldn't Detach Partition", message: "Wrong partition value")) } @Test("A Cancel at the gate's confirmation shows nothing") func cancelIsQuiet() { - var pane = ClickHousePartsPaneState() + var pane = StoragePartsPaneState() pane.finishLoad([part]) pane.actionEnded( @@ -160,7 +136,7 @@ struct ClickHousePartsGridTests { @Test("A load that fails with nothing shown offers Try Again, and a reload that fails keeps the list") func loadFailure() { - var pane = ClickHousePartsPaneState() + var pane = StoragePartsPaneState() #expect(pane.display == .loading) pane.failLoad("Connection refused") diff --git a/apple/TableProTests/Views/Structure/StructureAvailabilityTests.swift b/apple/TableProTests/Views/Structure/StructureAvailabilityTests.swift index 55605cb377..a6ac0eba0a 100644 --- a/apple/TableProTests/Views/Structure/StructureAvailabilityTests.swift +++ b/apple/TableProTests/Views/Structure/StructureAvailabilityTests.swift @@ -17,6 +17,10 @@ struct StructureAvailabilityTests { checkConstraintRefusal: "Check constraints need MySQL 8.0.16 or later." ) + private static let storageParts = StructureServerSupport( + unsupportedColumnFields: [], unsupportedIndexTypes: [], offersStorageParts: true + ) + private let suite: EphemeralDefaults init() throws { @@ -118,19 +122,25 @@ struct StructureAvailabilityTests { #expect(!makeSession(.redis).availablePanes.contains(.triggers)) } - @Test("Parts is ClickHouse only, and the server refusal does not reach it") - func partsIsClickHouseOnly() { - let clickhouse = makeSession(.clickhouse) - #expect(clickhouse.availablePanes.contains(.parts)) - #expect(!makeSession(.mysql).availablePanes.contains(.parts)) + @Test("Parts follows the driver's storage parts, whatever the engine") + func partsFollowsTheDriver() { + let session = makeSession(.clickhouse) + #expect(!session.availablePanes.contains(.parts)) - clickhouse.serverSupport = Self.legacyMySQL - #expect(clickhouse.availablePanes.contains(.parts)) + session.serverSupport = Self.storageParts + #expect(session.availablePanes.contains(.parts)) + + session.pane = .parts + session.serverSupport = Self.legacyMySQL + #expect(!session.availablePanes.contains(.parts)) + #expect(session.pane == .definition) } @Test("Panes keep one order: Definition, Triggers, DDL, Parts") func panesKeepTheirOrder() { #expect(makeSession(.mysql).availablePanes == [.definition, .triggers, .ddl]) - #expect(makeSession(.clickhouse).availablePanes == [.definition, .ddl, .parts]) + let clickhouse = makeSession(.clickhouse) + clickhouse.serverSupport = Self.storageParts + #expect(clickhouse.availablePanes == [.definition, .ddl, .parts]) } } diff --git a/apple/TableProTests/Views/Structure/StructureListGridAccessibilityTests.swift b/apple/TableProTests/Views/Structure/StructureListGridAccessibilityTests.swift index 7910b8ae10..1b00a5a27e 100644 --- a/apple/TableProTests/Views/Structure/StructureListGridAccessibilityTests.swift +++ b/apple/TableProTests/Views/Structure/StructureListGridAccessibilityTests.swift @@ -108,18 +108,15 @@ struct StructureListGridAccessibilityTests { DataGridAccessibility.isActive = true defer { DataGridAccessibility.isActive = false } let parts = [true, false].map { active in - ClickHousePartInfo( - partition: "202601", partitionId: "202601", name: "p", rows: 1, bytesOnDisk: 1, modificationTime: "", - active: active + PluginStoragePart( + partition: "202601", partitionId: "202601", name: "p\(active)", rows: 1, bytesOnDisk: 1, + modificationTime: "", isActive: active ) } - let rows = parts.map { part in - let row = ClickHousePartsView.gridRow(for: part) - return StructureListRow(id: part.id.uuidString, values: row.values, spokenValues: row.spokenValues) - } - let grid = MountedStructureList(columns: ClickHousePartsView.columnTitles, rows: rows) + let rows = parts.map(StoragePartsView.gridRow(for:)) + let grid = MountedStructureList(columns: StoragePartsView.columnTitles, rows: rows) defer { grid.tearDown() } - let active = ClickHousePartsView.activeColumn + let active = StoragePartsView.activeColumn #expect(grid.drawn(row: 0, dataColumn: active) == "YES") #expect(try grid.spoken(row: 0, dataColumn: active) == String(localized: "Active")) diff --git a/apple/TableProTests/Views/Structure/StructureServerSupportTests.swift b/apple/TableProTests/Views/Structure/StructureServerSupportTests.swift index 915945b6c2..5c924b0468 100644 --- a/apple/TableProTests/Views/Structure/StructureServerSupportTests.swift +++ b/apple/TableProTests/Views/Structure/StructureServerSupportTests.swift @@ -40,6 +40,19 @@ private final class DefaultStructureStubDriver: PluginDriverStub, @unchecked Sen } } +private final class StoragePartsStubDriver: PluginDriverStub, PluginStorageParts, @unchecked Sendable { + var supportsSchemas: Bool { false } + var supportsTransactions: Bool { false } + var currentSchema: String? { nil } + var serverVersion: String? { nil } + + func ping() async throws {} + func fetchStorageParts(table: String, database: String) async throws -> [PluginStoragePart] { [] } + func mergePartsStatement(table: String, database: String) -> String? { nil } + func dropPartitionStatement(table: String, database: String, partitionId: String) -> String? { nil } + func detachPartitionStatement(table: String, database: String, partitionId: String) -> String? { nil } +} + @MainActor struct StructureServerSupportTests { private static let additionalFields: Set = [ @@ -169,4 +182,18 @@ struct StructureServerSupportTests { #expect(StructureServerSupport(driver: adapter) == .unrestricted) #expect(StructureServerSupport(driver: nil) == .unrestricted) } + + @Test("Parts is offered only for a driver whose plugin answers for its storage parts") + func storagePartsFollowThePlugin() { + let parts = PluginDriverAdapter( + connection: DatabaseConnection(name: "Test", type: .postgresql), + pluginDriver: StoragePartsStubDriver() + ) + let plain = PluginDriverAdapter( + connection: DatabaseConnection(name: "Test", type: .clickhouse), + pluginDriver: DefaultStructureStubDriver() + ) + #expect(StructureServerSupport(driver: parts).offersStorageParts) + #expect(!StructureServerSupport(driver: plain).offersStorageParts) + } } diff --git a/apple/changelog.d/4294.fixed.md b/apple/changelog.d/4294.fixed.md new file mode 100644 index 0000000000..871adb9d6d --- /dev/null +++ b/apple/changelog.d/4294.fixed.md @@ -0,0 +1 @@ +Renaming a SQL Server column failed, or renamed the wrong one, when a schema or table name held a dot or a bracket.