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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed

- SSH tunnels no longer pin a CPU core after the connection drops. A dropped tunnel is now detected and torn down instead of spinning in its relay loop. (#1769)
- SQL Server table browsing and edits now use the active schema when opening objects outside `dbo`. (#1774)

## [0.53.0] - 2026-06-25

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,16 @@ public enum MSSQLSchemaQueries {
return bracketed(schema: schema, table: table)
}

public static func resolvedObjectSchema(_ schema: String?, currentSchema: String?) -> String? {
if let schema, !schema.isEmpty {
return schema
}
guard let currentSchema, !currentSchema.isEmpty else {
return nil
}
return currentSchema
}

public static func browse(
schema: String?,
table: String,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,20 @@ final class MSSQLSchemaQueriesTests: XCTestCase {
XCTAssertEqual(MSSQLSchemaQueries.qualifiedName(schema: "", table: "routeCache"), "[routeCache]")
}

func testResolvedObjectSchemaPrefersExplicitSchema() {
XCTAssertEqual(MSSQLSchemaQueries.resolvedObjectSchema("audit", currentSchema: "sales"), "audit")
}

func testResolvedObjectSchemaFallsBackToCurrentSchema() {
XCTAssertEqual(MSSQLSchemaQueries.resolvedObjectSchema(nil, currentSchema: "sales"), "sales")
XCTAssertEqual(MSSQLSchemaQueries.resolvedObjectSchema("", currentSchema: "sales"), "sales")
}

func testResolvedObjectSchemaReturnsNilWhenBothSchemasAreBlank() {
XCTAssertNil(MSSQLSchemaQueries.resolvedObjectSchema(nil, currentSchema: nil))
XCTAssertNil(MSSQLSchemaQueries.resolvedObjectSchema("", currentSchema: ""))
}

func testBrowseQualifiesNonDefaultSchema() {
let sql = MSSQLSchemaQueries.browse(
schema: "sales", table: "routeCache",
Expand All @@ -143,6 +157,18 @@ final class MSSQLSchemaQueriesTests: XCTestCase {
)
}

func testBrowseUsesResolvedCurrentSchema() {
let schema = MSSQLSchemaQueries.resolvedObjectSchema(nil, currentSchema: "sales")
let sql = MSSQLSchemaQueries.browse(
schema: schema, table: "routeCache",
orderByClause: "ORDER BY (SELECT NULL)", offset: 0, limit: 200
)
XCTAssertEqual(
sql,
"SELECT * FROM [sales].[routeCache] ORDER BY (SELECT NULL) OFFSET 0 ROWS FETCH NEXT 200 ROWS ONLY"
)
}

func testBrowseWithoutSchemaStaysUnqualified() {
let sql = MSSQLSchemaQueries.browse(
schema: nil, table: "routeCache",
Expand Down
10 changes: 7 additions & 3 deletions Plugins/MSSQLDriverPlugin/MSSQLPlugin.swift
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ final class MSSQLPluginDriver: PluginDatabaseDriver, @unchecked Sendable {
deletedRowIndices: Set<Int>,
insertedRowIndices: Set<Int>
) -> [(statement: String, parameters: [PluginCellValue])]? {
let qualifiedTable = MSSQLSchemaQueries.qualifiedName(schema: schema, table: table)
let qualifiedTable = MSSQLSchemaQueries.qualifiedName(schema: resolvedObjectSchema(schema), table: table)
var statements: [(statement: String, parameters: [PluginCellValue])] = []

var deleteChanges: [PluginRowChange] = []
Expand Down Expand Up @@ -598,7 +598,7 @@ final class MSSQLPluginDriver: PluginDatabaseDriver, @unchecked Sendable {
sortColumns: sortColumns, columns: columns, quoteIdentifier: mssqlQuoteIdentifier
) ?? "ORDER BY (SELECT NULL)"
return MSSQLSchemaQueries.browse(
schema: schema, table: table, orderByClause: orderBy, offset: offset, limit: limit
schema: resolvedObjectSchema(schema), table: table, orderByClause: orderBy, offset: offset, limit: limit
)
}

Expand Down Expand Up @@ -640,7 +640,7 @@ final class MSSQLPluginDriver: PluginDatabaseDriver, @unchecked Sendable {
sortColumns: sortColumns, columns: columns, quoteIdentifier: mssqlQuoteIdentifier
) ?? "ORDER BY (SELECT NULL)"
return MSSQLSchemaQueries.filtered(
schema: schema, table: table, whereClause: whereClause,
schema: resolvedObjectSchema(schema), table: table, whereClause: whereClause,
orderByClause: orderBy, offset: offset, limit: limit
)
}
Expand All @@ -651,6 +651,10 @@ final class MSSQLPluginDriver: PluginDatabaseDriver, @unchecked Sendable {
quoteIdentifier(identifier)
}

private func resolvedObjectSchema(_ schema: String?) -> String? {
MSSQLSchemaQueries.resolvedObjectSchema(schema, currentSchema: _currentSchema)
}

private func mssqlEscapeValue(_ value: String) -> String {
let trimmed = value.trimmingCharacters(in: .whitespaces)
if trimmed.caseInsensitiveCompare("NULL") == .orderedSame { return "NULL" }
Expand Down
Loading