corrected logic

Author: nikhilsinhaparseable

src/handlers/http/query.rs

@@ -100,8 +100,10 @@ pub async fn query(req: HttpRequest, query_request: Query) -> Result<HttpRespons
     let table_name = query
         .first_table_name()
         .ok_or_else(|| QueryError::MalformedQuery("No table name found in query"))?;
-    let time = Instant::now();
 
+    user_auth_for_query(&permissions, &tables)?;
+
+    let time = Instant::now();
     if let Some(column_name) = query.is_logical_plan_count_without_filters() {
         let date_bin_request = DateBinRequest {
             stream: table_name.clone(),
@@ -127,9 +129,6 @@ pub async fn query(req: HttpRequest, query_request: Query) -> Result<HttpRespons
 
         return Ok(HttpResponse::Ok().json(response));
     }
-
-    user_auth_for_query(&permissions, &tables)?;
-
     let (records, fields) = query.execute(table_name.clone()).await?;
 
     let response = QueryResponse {

src/query/mod.rs

@@ -217,22 +217,22 @@ impl Query {
         };
 
         // Ensure the input of the Aggregate is a TableScan and there is exactly one expression: SELECT COUNT(*)
-        if !matches!(&**input, LogicalPlan::TableScan { .. }) || expr.len() == 1 {
+        if !matches!(&**input, LogicalPlan::TableScan { .. }) || expr.len() != 1 {
             return None;
         }
 
         // Check if the expression is a column or an alias for COUNT(*)
         match &expr[0] {
             // Direct column check
-            Expr::Column(Column { name, .. }) if name == "count(*)" => Some(name),
+            Expr::Column(Column { name, .. }) if name.to_lowercase() == "count(*)" => Some(name),
             // Alias for COUNT(*)
             Expr::Alias(Alias {
                 expr: inner_expr,
                 name: alias_name,
                 ..
             }) => {
                 if let Expr::Column(Column { name, .. }) = &**inner_expr {
-                    if name == "count(*)" {
+                    if name.to_lowercase() == "count(*)" {
                         return Some(alias_name);
                     }
                 }