query passthrough (#18)

* passthrough

* flight passthrough

* Secure pass-through

---------

Co-authored-by: qxip <qxip@mini-ams.local>

Author: lmangani

querier/flightsql.go

@@ -146,23 +146,8 @@ func (s *FlightSQLServer) GetFlightInfo(ctx context.Context, desc *flight.Flight
 				}
 			}
 
-			// Parse the query to extract time range
-			parsed, err := s.queryClient.ParseQuery(query, dbName)
-			if err != nil {
-				log.Printf("Failed to parse query: %v", err)
-				return nil, fmt.Errorf("failed to parse query: %w", err)
-			}
-
-			// Find relevant files based on the parsed query
-			files, err := s.queryClient.FindRelevantFiles(ctx, parsed.DbName, parsed.Measurement, parsed.TimeRange)
-			if err != nil {
-				log.Printf("Failed to find relevant files: %v", err)
-				return nil, fmt.Errorf("failed to find relevant files: %w", err)
-			}
-			log.Printf("Found %d relevant files for query", len(files))
-
-			// Execute the query using our existing QueryClient
-			results, err := s.queryClient.Query(ctx, query, parsed.DbName) // Use the parsed database name
+			// Use QueryClient.Query which now handles all fallback logic
+			results, err := s.queryClient.Query(ctx, query, dbName)
 			if err != nil {
 				log.Printf("Query execution failed: %v", err)
 				return nil, fmt.Errorf("failed to execute query: %w", err)

querier/queryClient.go

@@ -670,7 +670,52 @@ func (c *QueryClient) Query(ctx context.Context, query, dbName string) ([]map[st
 	// Parse the query
 	parsed, err := c.ParseQuery(query, dbName)
 	if err != nil {
-		return nil, err
+		// Fallback: Directly execute the query in DuckDB if ParseQuery fails
+		// Set DuckDB safety option to disable external access
+		if _, errSet := c.DB.Exec("SET enable_external_access = false;"); errSet != nil {
+		    return nil, fmt.Errorf("failed to disable external access: %v", errSet)
+		}
+		if _, errSet := c.DB.Exec("SET lock_configuration = true;"); errSet != nil {
+		    return nil, fmt.Errorf("failed to lock configuration: %v", errSet)
+		}
+		
+		stmt, err2 := c.DB.Prepare(query)
+		if err2 != nil {
+			return nil, fmt.Errorf("failed to prepare query: %v", err2)
+		}
+		defer stmt.Close()
+
+		rows, err2 := stmt.Query()
+		if err2 != nil {
+			return nil, fmt.Errorf("query execution failed: %v", err2)
+		}
+		defer rows.Close()
+
+		columns, err2 := rows.Columns()
+		if err2 != nil {
+			return nil, fmt.Errorf("failed to get columns: %v", err2)
+		}
+
+		var result []map[string]interface{}
+		for rows.Next() {
+			values := make([]interface{}, len(columns))
+			valuePtrs := make([]interface{}, len(columns))
+			for i := range values {
+				valuePtrs[i] = &values[i]
+			}
+			if err := rows.Scan(valuePtrs...); err != nil {
+				return nil, fmt.Errorf("error scanning row: %v", err)
+			}
+			row := make(map[string]interface{})
+			for i, col := range columns {
+				row[col] = values[i]
+			}
+			result = append(result, row)
+		}
+		if err := rows.Err(); err != nil {
+			return nil, fmt.Errorf("error iterating rows: %v", err)
+		}
+		return result, nil
 	}
 
 	// Find relevant files