Merge pull request #345 from datlechin/fix/341-filtering

datlechin · web-flow · commit ea306b2512a1 · 2026-03-16T20:46:30.000+07:00
fix: generate WHERE clauses for SQL database filters and quick search
diff --git a/TablePro.xcodeproj/project.pbxproj b/TablePro.xcodeproj/project.pbxproj
@@ -35,6 +35,7 @@
 		5ACE00012F4F000000000006 /* CodeEditTextView in Frameworks */ = {isa = PBXBuildFile; productRef = 5ACE00012F4F000000000007 /* CodeEditTextView */; };
 		5ACE00012F4F00000000000A /* Sparkle in Frameworks */ = {isa = PBXBuildFile; productRef = 5ACE00012F4F000000000009 /* Sparkle */; };
 		5ACE00012F4F00000000000D /* MarkdownUI in Frameworks */ = {isa = PBXBuildFile; productRef = 5ACE00012F4F00000000000C /* MarkdownUI */; };
+		5AEA8B302F6808270040461A /* EtcdDriverPlugin.tableplugin in Copy Plug-Ins */ = {isa = PBXBuildFile; fileRef = 5AEA8B2A2F6808270040461A /* EtcdDriverPlugin.tableplugin */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		5AEA8B422F6808CA0040461A /* EtcdStatementGenerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5AEA8B402F6808CA0040461A /* EtcdStatementGenerator.swift */; };
 		5AEA8B432F6808CA0040461A /* EtcdPlugin.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5AEA8B3D2F6808CA0040461A /* EtcdPlugin.swift */; };
 		5AEA8B442F6808CA0040461A /* EtcdCommandParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5AEA8B3B2F6808CA0040461A /* EtcdCommandParser.swift */; };
@@ -116,6 +117,13 @@
 			remoteGlobalIDString = 5A86C000000000000;
 			remoteInfo = SQLExport;
 		};
+		5AEA8B312F6808270040461A /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 5A1091BF2EF17EDC0055EA7C /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 5AEA8B292F6808270040461A;
+			remoteInfo = EtcdDriverPlugin;
+		};
 		5ABCC5AB2F43856700EAF3FC /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 5A1091BF2EF17EDC0055EA7C /* Project object */;
@@ -145,6 +153,7 @@
 				5A86A000D00000000 /* CSVExport.tableplugin in Copy Plug-Ins */,
 				5A86B000D00000000 /* JSONExport.tableplugin in Copy Plug-Ins */,
 				5A86C000D00000000 /* SQLExport.tableplugin in Copy Plug-Ins */,
+				5AEA8B302F6808270040461A /* EtcdDriverPlugin.tableplugin in Copy Plug-Ins */,
 			);
 			name = "Copy Plug-Ins";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -651,6 +660,7 @@
 		5A1091BE2EF17EDC0055EA7C = {
 			isa = PBXGroup;
 			children = (
+				5AEA8B412F6808CA0040461A /* EtcdDriverPlugin */,
 				5AEA8B412F6808CA0040461A /* Plugins/EtcdDriverPlugin */,
 				5A1091C92EF17EDC0055EA7C /* TablePro */,
 				5A860000500000000 /* Plugins/TableProPluginKit */,
@@ -704,6 +714,7 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
+		5AEA8B412F6808CA0040461A /* EtcdDriverPlugin */ = {
 		5AEA8B412F6808CA0040461A /* Plugins/EtcdDriverPlugin */ = {
 			isa = PBXGroup;
 			children = (
@@ -760,6 +771,7 @@
 				5A86A000C00000000 /* PBXTargetDependency */,
 				5A86B000C00000000 /* PBXTargetDependency */,
 				5A86C000C00000000 /* PBXTargetDependency */,
+				5AEA8B322F6808270040461A /* PBXTargetDependency */,
 			);
 			fileSystemSynchronizedGroups = (
 				5A1091C92EF17EDC0055EA7C /* TablePro */,
@@ -1618,6 +1630,11 @@
 			target = 5A86C000000000000 /* SQLExport */;
 			targetProxy = 5A86C000B00000000 /* PBXContainerItemProxy */;
 		};
+		5AEA8B322F6808270040461A /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 5AEA8B292F6808270040461A /* EtcdDriverPlugin */;
+			targetProxy = 5AEA8B312F6808270040461A /* PBXContainerItemProxy */;
+		};
 		5ABCC5AC2F43856700EAF3FC /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 5A1091C62EF17EDC0055EA7C /* TablePro */;
diff --git a/TablePro/Core/Database/FilterSQLGenerator.swift b/TablePro/Core/Database/FilterSQLGenerator.swift
@@ -38,6 +38,30 @@ struct FilterSQLGenerator {
         return conditions.joined(separator: separator)
     }
 
+    /// Generate WHERE clause for quick search across multiple columns
+    func generateQuickSearchWhereClause(searchText: String, columns: [String]) -> String {
+        let conditions = generateQuickSearchConditions(searchText: searchText, columns: columns)
+        guard !conditions.isEmpty else { return "" }
+        return "WHERE (\(conditions))"
+    }
+
+    /// Generate OR-joined LIKE conditions for quick search (without WHERE keyword)
+    func generateQuickSearchConditions(searchText: String, columns: [String]) -> String {
+        guard !searchText.isEmpty, !columns.isEmpty else { return "" }
+        let escapedValue = escapeLikeWildcards(searchText)
+        let pattern = "%\(escapedValue)%"
+        let quotedPattern = escapeSQLQuote(pattern)
+        let escape = likeEscapeClause
+        // CAST to TEXT for databases like PostgreSQL where LIKE on non-text columns fails
+        let needsCast = dialect.regexSyntax == .tilde
+        let conditions = columns.map { column in
+            let quoted = quoteIdentifierFn(column)
+            let target = needsCast ? "CAST(\(quoted) AS TEXT)" : quoted
+            return "\(target) LIKE '\(quotedPattern)'\(escape)"
+        }
+        return conditions.joined(separator: " OR ")
+    }
+
     /// Generate a single filter condition
     func generateCondition(from filter: TableFilter) -> String? {
         guard filter.isValid else { return nil }
diff --git a/TablePro/Core/Services/Query/TableQueryBuilder.swift b/TablePro/Core/Services/Query/TableQueryBuilder.swift
@@ -15,17 +15,20 @@ struct TableQueryBuilder {
 
     private let databaseType: DatabaseType
     private var pluginDriver: (any PluginDatabaseDriver)?
+    private let dialect: SQLDialectDescriptor?
     private let dialectQuote: (String) -> String
 
     // MARK: - Initialization
 
     init(
         databaseType: DatabaseType,
         pluginDriver: (any PluginDatabaseDriver)? = nil,
+        dialect: SQLDialectDescriptor? = nil,
         dialectQuote: ((String) -> String)? = nil
     ) {
         self.databaseType = databaseType
         self.pluginDriver = pluginDriver
+        self.dialect = dialect
         self.dialectQuote = dialectQuote ?? { name in
             let escaped = name.replacingOccurrences(of: "\"", with: "\"\"")
             return "\"\(escaped)\""
@@ -69,7 +72,7 @@ struct TableQueryBuilder {
             query += " \(orderBy)"
         }
 
-        query += " LIMIT \(limit) OFFSET \(offset)"
+        query += " \(buildPaginationClause(limit: limit, offset: offset))"
         return query
     }
 
@@ -97,7 +100,23 @@ struct TableQueryBuilder {
         }
 
         let quotedTable = quote(tableName)
-        return "SELECT * FROM \(quotedTable) LIMIT \(limit) OFFSET \(offset)"
+        var query = "SELECT * FROM \(quotedTable)"
+
+        if let dialect {
+            let activeFilters = filters.filter { $0.isEnabled }
+            let filterGen = FilterSQLGenerator(dialect: dialect, quoteIdentifier: dialectQuote)
+            let whereClause = filterGen.generateWhereClause(from: activeFilters, logicMode: logicMode)
+            if !whereClause.isEmpty {
+                query += " \(whereClause)"
+            }
+        }
+
+        if let orderBy = buildOrderByClause(sortState: sortState, columns: columns) {
+            query += " \(orderBy)"
+        }
+
+        query += " \(buildPaginationClause(limit: limit, offset: offset))"
+        return query
     }
 
     func buildQuickSearchQuery(
@@ -119,7 +138,22 @@ struct TableQueryBuilder {
         }
 
         let quotedTable = quote(tableName)
-        return "SELECT * FROM \(quotedTable) LIMIT \(limit) OFFSET \(offset)"
+        var query = "SELECT * FROM \(quotedTable)"
+
+        if let dialect {
+            let filterGen = FilterSQLGenerator(dialect: dialect, quoteIdentifier: dialectQuote)
+            let searchWhere = filterGen.generateQuickSearchWhereClause(searchText: searchText, columns: columns)
+            if !searchWhere.isEmpty {
+                query += " \(searchWhere)"
+            }
+        }
+
+        if let orderBy = buildOrderByClause(sortState: sortState, columns: columns) {
+            query += " \(orderBy)"
+        }
+
+        query += " \(buildPaginationClause(limit: limit, offset: offset))"
+        return query
     }
 
     func buildCombinedQuery(
@@ -149,7 +183,34 @@ struct TableQueryBuilder {
         }
 
         let quotedTable = quote(tableName)
-        return "SELECT * FROM \(quotedTable) LIMIT \(limit) OFFSET \(offset)"
+        var query = "SELECT * FROM \(quotedTable)"
+
+        if let dialect {
+            let activeFilters = filters.filter { $0.isEnabled }
+            let filterGen = FilterSQLGenerator(dialect: dialect, quoteIdentifier: dialectQuote)
+            var whereParts: [String] = []
+
+            let filterConditions = filterGen.generateConditions(from: activeFilters, logicMode: logicMode)
+            if !filterConditions.isEmpty {
+                whereParts.append("(\(filterConditions))")
+            }
+
+            let searchConditions = filterGen.generateQuickSearchConditions(searchText: searchText, columns: searchColumns)
+            if !searchConditions.isEmpty {
+                whereParts.append("(\(searchConditions))")
+            }
+
+            if !whereParts.isEmpty {
+                query += " WHERE \(whereParts.joined(separator: " AND "))"
+            }
+        }
+
+        if let orderBy = buildOrderByClause(sortState: sortState, columns: columns) {
+            query += " \(orderBy)"
+        }
+
+        query += " \(buildPaginationClause(limit: limit, offset: offset))"
+        return query
     }
 
     func buildSortedQuery(
@@ -213,6 +274,13 @@ struct TableQueryBuilder {
 
     // MARK: - Private Helpers
 
+    private func buildPaginationClause(limit: Int, offset: Int) -> String {
+        if let dialect, dialect.paginationStyle == .offsetFetch {
+            return "OFFSET \(offset) ROWS FETCH NEXT \(limit) ROWS ONLY"
+        }
+        return "LIMIT \(limit) OFFSET \(offset)"
+    }
+
     private func sortColumnsAsTuples(_ sortState: SortState?) -> [(columnIndex: Int, ascending: Bool)] {
         sortState?.columns.compactMap { sortCol -> (columnIndex: Int, ascending: Bool)? in
             guard sortCol.columnIndex >= 0 else { return nil }
diff --git a/TablePro/Views/Main/Extensions/MainContentCoordinator+Pagination.swift b/TablePro/Views/Main/Extensions/MainContentCoordinator+Pagination.swift
@@ -100,24 +100,11 @@ extension MainContentCoordinator {
         }
     }
 
-    /// Reload current page data
     private func reloadCurrentPage() {
         guard let tabIndex = tabManager.selectedTabIndex,
-              tabIndex < tabManager.tabs.count,
-              let tableName = tabManager.tabs[tabIndex].tableName else { return }
-
-        let tab = tabManager.tabs[tabIndex]
-        let pagination = tab.pagination
-
-        let newQuery = queryBuilder.buildBaseQuery(
-            tableName: tableName,
-            sortState: tab.sortState,
-            columns: tab.resultColumns,
-            limit: pagination.pageSize,
-            offset: pagination.currentOffset
-        )
+              tabIndex < tabManager.tabs.count else { return }
 
-        tabManager.tabs[tabIndex].query = newQuery
+        rebuildTableQuery(at: tabIndex)
         runQuery()
     }
 }
diff --git a/TablePro/Views/Main/MainContentCoordinator.swift b/TablePro/Views/Main/MainContentCoordinator.swift
@@ -232,11 +232,11 @@ final class MainContentCoordinator {
         self.filterStateManager = filterStateManager
         self.columnVisibilityManager = columnVisibilityManager
         self.toolbarState = toolbarState
+        let dialect = PluginManager.shared.sqlDialect(for: connection.type)
         self.queryBuilder = TableQueryBuilder(
             databaseType: connection.type,
-            dialectQuote: quoteIdentifierFromDialect(
-                PluginManager.shared.sqlDialect(for: connection.type)
-            )
+            dialect: dialect,
+            dialectQuote: quoteIdentifierFromDialect(dialect)
         )
         self.persistence = TabPersistenceCoordinator(connectionId: connection.id)
 
diff --git a/TableProTests/Core/Services/TableQueryBuilderFilterTests.swift b/TableProTests/Core/Services/TableQueryBuilderFilterTests.swift
