fix(structure): replace macOS 14.4 conditional trigger columns with a 14.0-safe Enabled column variant

Author: datlechin

CHANGELOG.md

@@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- The table structure view has a Triggers tab for MySQL, MariaDB, PostgreSQL, SQLite, SQL Server, Oracle, libSQL, and Cloudflare D1. It lists each trigger with its timing, event, and (where the engine reports them) orientation, enabled state, and condition, with a filter field and sortable columns. Selecting a trigger shows its full definition in a read-only syntax-highlighted viewer. (#1695)
+- The table structure view has a Triggers tab for MySQL, MariaDB, PostgreSQL, SQLite, SQL Server, Oracle, libSQL, and Cloudflare D1. It lists each trigger with its timing and event (plus enabled state where the engine reports it), with a filter field and sortable columns. Selecting a trigger shows its full definition in a read-only syntax-highlighted viewer. (#1695)
 - Traditional Chinese (繁體中文) language in Settings > General with full UI translation
 
 ### Fixed

Plugins/OracleDriverPlugin/OraclePlugin.swift

@@ -491,24 +491,23 @@ final class OraclePluginDriver: PluginDatabaseDriver, @unchecked Sendable {
             } else {
                 timing = "AFTER"
             }
-            let orientation = triggerType.contains("EACH ROW") ? "ROW" : "STATEMENT"
+            let isRowLevel = triggerType.contains("EACH ROW")
             let enabled = (row[safe: 3]?.asText ?? "").uppercased() == "ENABLED"
             let whenClause = row[safe: 4]?.asText
             let quotedName = "\"\(name.replacingOccurrences(of: "\"", with: "\"\""))\""
             let quotedTable = "\"\(table.replacingOccurrences(of: "\"", with: "\"\""))\""
-            let forEach = orientation == "ROW" ? " FOR EACH ROW" : ""
+            let forEach = isRowLevel ? " FOR EACH ROW" : ""
+            let whenLine = (whenClause?.isEmpty == false) ? "\n    WHEN (\(whenClause ?? ""))" : ""
             let statement = """
                 CREATE OR REPLACE TRIGGER \(quotedName)
-                    \(timing) \(event) ON \(quotedTable)\(forEach)
+                    \(timing) \(event) ON \(quotedTable)\(forEach)\(whenLine)
                 """
             return PluginTriggerInfo(
                 name: name,
                 timing: timing,
                 event: event,
                 statement: statement,
-                enabled: enabled,
-                orientation: orientation,
-                whenClause: whenClause
+                enabled: enabled
             )
         }
     }

Plugins/PostgreSQLDriverPlugin/PostgreSQLPluginDriver.swift

@@ -307,9 +307,7 @@ final class PostgreSQLPluginDriver: LibPQBackedDriver, @unchecked Sendable {
                      WHEN (t.tgtype & 16) != 0 THEN 'DELETE'
                      WHEN (t.tgtype & 32) != 0 THEN 'TRUNCATE'
                      ELSE '' END AS event,
-                CASE WHEN (t.tgtype & 1) = 1 THEN 'ROW' ELSE 'STATEMENT' END AS orientation,
                 t.tgenabled <> 'D' AS enabled,
-                pg_get_expr(t.tgqual, t.tgrelid) AS when_clause,
                 pg_get_triggerdef(t.oid) AS definition
             FROM pg_catalog.pg_trigger t
             JOIN pg_catalog.pg_class c ON c.oid = t.tgrelid
@@ -321,20 +319,18 @@ final class PostgreSQLPluginDriver: LibPQBackedDriver, @unchecked Sendable {
             """
         let result = try await execute(query: query)
         let triggers: [PluginTriggerInfo] = result.rows.compactMap { row -> PluginTriggerInfo? in
-            guard row.count >= 7,
+            guard row.count >= 5,
                   let name = row[0].asText,
                   let timing = row[1].asText,
                   let event = row[2].asText,
-                  let definition = row[6].asText
+                  let definition = row[4].asText
             else { return nil }
             return PluginTriggerInfo(
                 name: name,
                 timing: timing,
                 event: event,
                 statement: definition,
-                enabled: row[4].asText == "t",
-                orientation: row[3].asText,
-                whenClause: row[5].asText
+                enabled: row[3].asText == "t"
             )
         }
         Self.logger.info("[trigger] postgres fetchTriggers schema=\(resolvedSchema, privacy: .public) table=\(table, privacy: .public) rows=\(result.rows.count) parsed=\(triggers.count)")

Plugins/TableProPluginKit/PluginTriggerInfo.swift

@@ -13,34 +13,18 @@ public struct PluginTriggerInfo: Codable, Sendable {
     public let event: String
     public let statement: String
     public let enabled: Bool?
-    public let orientation: String?
-    public let whenClause: String?
 
     public init(
         name: String,
         timing: String,
         event: String,
         statement: String,
-        enabled: Bool? = nil,
-        orientation: String? = nil,
-        whenClause: String? = nil
+        enabled: Bool? = nil
     ) {
         self.name = name
         self.timing = timing
         self.event = event
         self.statement = statement
         self.enabled = enabled
-        self.orientation = orientation
-        self.whenClause = whenClause
-    }
-
-    @_disfavoredOverload
-    public init(
-        name: String,
-        timing: String,
-        event: String,
-        statement: String
-    ) {
-        self.init(name: name, timing: timing, event: event, statement: statement, enabled: nil, orientation: nil, whenClause: nil)
     }
 }

TablePro/Core/Plugins/PluginDriverAdapter.swift

@@ -259,9 +259,7 @@ final class PluginDriverAdapter: DatabaseDriver, SchemaSwitchable {
                 timing: trigger.timing,
                 event: trigger.event,
                 statement: trigger.statement,
-                enabled: trigger.enabled,
-                orientation: trigger.orientation,
-                whenClause: trigger.whenClause
+                enabled: trigger.enabled
             )
         }
     }

TablePro/Models/Query/QueryResult.swift

@@ -224,25 +224,19 @@ struct TriggerInfo: Identifiable, Hashable {
     let event: String
     let statement: String
     let enabled: Bool?
-    let orientation: String?
-    let whenClause: String?
 
     init(
         name: String,
         timing: String,
         event: String,
         statement: String,
-        enabled: Bool? = nil,
-        orientation: String? = nil,
-        whenClause: String? = nil
+        enabled: Bool? = nil
     ) {
         self.name = name
         self.timing = timing
         self.event = event
         self.statement = statement
         self.enabled = enabled
-        self.orientation = orientation
-        self.whenClause = whenClause
     }
 }
 

TablePro/Views/Structure/TriggerDetailView.swift

@@ -72,50 +72,52 @@ private struct TriggerListPane: View {
     @Bindable var state: TriggerInspectorState
 
     private var showEnabled: Bool { triggers.contains { $0.enabled != nil } }
-    private var showOrientation: Bool { triggers.contains { !($0.orientation ?? "").isEmpty } }
-    private var showWhen: Bool { triggers.contains { !($0.whenClause ?? "").isEmpty } }
 
     var body: some View {
         VStack(spacing: 0) {
             NativeSearchField(text: $state.searchText, placeholder: String(localized: "Filter"))
                 .padding(.horizontal, 8)
                 .padding(.vertical, 6)
             Divider()
+            table
+        }
+    }
+
+    @ViewBuilder
+    private var table: some View {
+        if showEnabled {
             Table(state.displayed(triggers), selection: $state.selectedID, sortOrder: $state.sortOrder) {
                 TableColumn(String(localized: "Name"), value: \.name)
                     .width(min: 140, ideal: 220)
                 TableColumn(String(localized: "Timing"), value: \.timing)
                     .width(min: 70, ideal: 90)
                 TableColumn(String(localized: "Event"), value: \.event)
                     .width(min: 90, ideal: 150)
-                if showOrientation {
-                    TableColumn(String(localized: "For Each")) { trigger in
-                        Text(trigger.orientation ?? "")
-                    }
-                    .width(min: 70, ideal: 90)
-                }
-                if showEnabled {
-                    TableColumn(String(localized: "Enabled")) { trigger in
-                        if let enabled = trigger.enabled {
-                            Image(systemName: enabled ? "checkmark.circle.fill" : "xmark.circle")
-                                .foregroundStyle(enabled ? Color.green : Color.secondary)
-                                .accessibilityLabel(enabled
-                                    ? String(localized: "Enabled")
-                                    : String(localized: "Disabled"))
-                        }
-                    }
-                    .width(min: 60, ideal: 70)
-                }
-                if showWhen {
-                    TableColumn(String(localized: "When")) { trigger in
-                        Text(trigger.whenClause ?? "")
-                            .foregroundStyle(.secondary)
-                    }
-                    .width(min: 100, ideal: 180)
+                TableColumn(String(localized: "Enabled")) { trigger in
+                    enabledIndicator(trigger)
                 }
+                .width(min: 60, ideal: 70)
+            }
+        } else {
+            Table(state.displayed(triggers), selection: $state.selectedID, sortOrder: $state.sortOrder) {
+                TableColumn(String(localized: "Name"), value: \.name)
+                    .width(min: 140, ideal: 240)
+                TableColumn(String(localized: "Timing"), value: \.timing)
+                    .width(min: 70, ideal: 90)
+                TableColumn(String(localized: "Event"), value: \.event)
+                    .width(min: 90, ideal: 160)
             }
         }
     }
+
+    @ViewBuilder
+    private func enabledIndicator(_ trigger: TriggerInfo) -> some View {
+        if let enabled = trigger.enabled {
+            Image(systemName: enabled ? "checkmark.circle.fill" : "xmark.circle")
+                .foregroundStyle(enabled ? Color.green : Color.secondary)
+                .accessibilityLabel(enabled ? String(localized: "Enabled") : String(localized: "Disabled"))
+        }
+    }
 }
 
 private struct TriggerDetailPane: View {

TableProTests/Core/Database/TriggerInfoMappingTests.swift

@@ -69,9 +69,7 @@ struct TriggerInfoMappingTests {
                 timing: "AFTER",
                 event: "INSERT OR UPDATE",
                 statement: "CREATE TRIGGER trg_audit ...",
-                enabled: false,
-                orientation: "ROW",
-                whenClause: "new.id IS NOT NULL"
+                enabled: false
             )
         ]
         let connection = DatabaseConnection(name: "Test", type: .postgresql)
@@ -85,26 +83,20 @@ struct TriggerInfoMappingTests {
         #expect(trigger.event == "INSERT OR UPDATE")
         #expect(trigger.statement == "CREATE TRIGGER trg_audit ...")
         #expect(trigger.enabled == false)
-        #expect(trigger.orientation == "ROW")
-        #expect(trigger.whenClause == "new.id IS NOT NULL")
     }
 
-    @Test("PluginTriggerInfo carries optional metadata through Codable")
-    func codableRoundTripWithMetadata() throws {
+    @Test("PluginTriggerInfo carries enabled state through Codable")
+    func codableRoundTripWithEnabled() throws {
         let original = PluginTriggerInfo(
             name: "trg_check",
             timing: "BEFORE",
             event: "UPDATE",
             statement: "CREATE TRIGGER trg_check ...",
-            enabled: true,
-            orientation: "STATEMENT",
-            whenClause: "new.amount > 0"
+            enabled: true
         )
         let data = try JSONEncoder().encode(original)
         let decoded = try JSONDecoder().decode(PluginTriggerInfo.self, from: data)
         #expect(decoded.enabled == true)
-        #expect(decoded.orientation == "STATEMENT")
-        #expect(decoded.whenClause == "new.amount > 0")
     }
 }
 

docs/features/table-structure.mdx

@@ -166,11 +166,9 @@ The Triggers tab lists the table's triggers and shows the full definition of the
 | **Name** | Trigger name |
 | **Timing** | BEFORE, AFTER, or INSTEAD OF |
 | **Event** | INSERT, UPDATE, DELETE (PostgreSQL can combine events, such as INSERT OR UPDATE) |
-| **For Each** | ROW or STATEMENT (shown when the engine reports it) |
 | **Enabled** | Whether the trigger is enabled (PostgreSQL, SQL Server, Oracle) |
-| **When** | The trigger's WHEN condition, where present |
 
-Select a trigger to see its full definition in a syntax-highlighted viewer with **Copy** and **Open in Editor** buttons. The definition is the `CREATE TRIGGER` statement (MySQL and MariaDB reconstruct it from the body; PostgreSQL uses `pg_get_triggerdef`; SQLite, libSQL, and Cloudflare D1 read the stored statement; SQL Server uses `OBJECT_DEFINITION`).
+Select a trigger to see its full definition in a syntax-highlighted viewer with **Copy** and **Open in Editor** buttons. The definition is the `CREATE TRIGGER` statement, which includes the orientation (FOR EACH ROW/STATEMENT) and any WHEN condition. MySQL and MariaDB reconstruct it from the body; PostgreSQL uses `pg_get_triggerdef`; SQLite, libSQL, and Cloudflare D1 read the stored statement; SQL Server uses `OBJECT_DEFINITION`.
 
 <Note>
 Available for MySQL, MariaDB, PostgreSQL, SQLite, SQL Server, Oracle, libSQL, and Cloudflare D1. The tab is hidden for databases that do not expose triggers. Oracle shows trigger metadata only; the body is not retrieved.