multiple filters

src/codeblocks/processSqlBlock/helpers/buildSqlQuery.ts

@@ -4,8 +4,6 @@ export function buildSqlQuery(params: SqlParams): { query: string; queryParams:
     const { 
         table, 
         columns,
-        keyColumn,
-        value,
         dateColumn,
         startDate,
         endDate,
@@ -23,10 +21,19 @@ export function buildSqlQuery(params: SqlParams): { query: string; queryParams:
     const queryParams: any[] = [];
     const conditions: string[] = [];
 
-    // Add key-value condition if provided
+    // Handle multiple filters
-    if (keyColumn && value !== undefined) {
+    if (filterColumn && filterValue) {
-        conditions.push(`"${keyColumn}" = ?`);
+        const filterColumns = Array.isArray(filterColumn) ? filterColumn : [filterColumn];
-        queryParams.push(value);
+        const filterValues = Array.isArray(filterValue) ? filterValue : [filterValue];
+
+        if (filterColumns.length !== filterValues.length) {
+            throw new Error('Number of filter columns must match number of filter values');
+        }
+
+        filterColumns.forEach((col, index) => {
+            conditions.push(`"${col}" = ?`);
+            queryParams.push(filterValues[index]);
+        });
     }
 
     // Add date range conditions if provided
@@ -40,13 +47,7 @@ export function buildSqlQuery(params: SqlParams): { query: string; queryParams:
             queryParams.push(endDate);
         }
     }
-
+    
-    // Add filter condition if provided
-    if (filterColumn && filterValue !== undefined) {
-        conditions.push(`"${filterColumn}" = ?`);
-        queryParams.push(filterValue);
-    }
-
     // Build the query
     let query = `SELECT ${selectCols} FROM "${table}"`;
     

src/codeblocks/processSqlBlock/helpers/parseSqlParams.ts

@@ -17,6 +17,10 @@ export function parseSqlParams(source: string): SqlParams | null {
                 case 'columns':
                     params.columns = val.split(',').map(c => c.trim()).join(', ');
                     break;
+                case 'filterColumn':
+                case 'filterValue':
+                    params[key] = val.split(',').map(v => v.trim());
+                    break;
                 case 'limit':
                     const limitNum = parseInt(val);
                     if (!isNaN(limitNum)) params.limit = limitNum;
@@ -27,15 +31,19 @@ export function parseSqlParams(source: string): SqlParams | null {
                     }
                     break;
                 case 'table':
-                case 'keyColumn':
+                    params.table = val;
-                case 'value':
+                    break;
                 case 'dateColumn':
+                    params.dateColumn = val;
+                    break;
                 case 'startDate':
+                    params.startDate = val;
+                    break;
                 case 'endDate':
-                case 'filterColumn':
+                    params.endDate = val;
-                case 'filterValue':
+                    break;
                 case 'orderBy':
-                    params[key] = val;
+                    params.orderBy = val;
                     break;
             }
         }

src/codeblocks/processSqlBlock/helpers/validateTable.ts

@@ -33,11 +33,19 @@ export async function validateTable(db: any, params: SqlParams) {
     }
 
     // Validate filterColumn if specified
-    if (params.filterColumn && !availableColumns.includes(params.filterColumn)) {
+    if (params.filterColumn) {
-        return {
+        const filterColumns = Array.isArray(params.filterColumn) 
-            message: `Filter column "${params.filterColumn}" does not exist in table "${params.table}".`,
+            ? params.filterColumn 
-            availableColumns
+            : [params.filterColumn];
-        };
+            
+        for (const col of filterColumns) {
+            if (!availableColumns.includes(col)) {
+                return {
+                    message: `Filter column "${col}" does not exist in table "${params.table}".`,
+                    availableColumns
+                };
+            }
+        }
     }
 
     // Validate orderBy if specified

src/codeblocks/processSqlBlock/index.ts

@@ -16,15 +16,15 @@ export async function processSqlBlock(dbService: DBService, source: string, el:
         el.createEl("p", { text: "Example usage:" });
         el.createEl("pre", { 
             text: `table: tasks
-columns: title, status, dueDate
+    columns: title, status
-dateColumn: dueDate
+    filterColumn: status, priority
-startDate: 2024-01-01
+    filterValue: active, high
-endDate: 2024-12-31
+    dateColumn: dueDate
-filterColumn: status
+    startDate: 2024-01-01
-filterValue: active
+    endDate: 2024-12-31
-limit: 10
+    limit: 10
-orderBy: dueDate
+    orderBy: dueDate
-orderDirection: asc`
+    orderDirection: asc`
         });
         return;
     }

src/codeblocks/processSqlBlock/types.ts

@@ -6,8 +6,8 @@ export interface SqlParams {
     dateColumn?: string;
     startDate?: string;
     endDate?: string;
-    filterColumn?: string;
+    filterColumn?: string | string[];
-    filterValue?: string;
+    filterValue?: string | string[];
     orderBy?: string;
     orderDirection?: string;
     limit?: number;