Skip to content

Commit f31b672

Browse files
committed
fix: ordinamento tabelle
1 parent 3172f2a commit f31b672

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

src/Util/Query.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,6 @@ public static function getQuery($structure, $search = [], $order = [], $limit =
246246
}
247247

248248
if (isset($total['order_by'][$column_index])) {
249-
// Rimozione ORDER BY esistente in modo più efficiente
250-
$query = preg_replace('/\s+ORDER\s+BY\s+.+$/i', '', $query);
251249
$order_clause = $total['order_by'][$column_index];
252250

253251
// Determina la clausola di ordinamento da usare
@@ -267,7 +265,8 @@ public static function getQuery($structure, $search = [], $order = [], $limit =
267265

268266
// Applica l'ordinamento solo se abbiamo una clausola valida
269267
if (!empty($final_order_clause)) {
270-
$query = preg_replace('/\s+ORDER\s+BY\s+.*$/is', '', $query);
268+
// Rimozione ORDER BY esistente con regex più robusta
269+
$query = preg_replace('/\s+ORDER\s+BY\s+[^)]*$/is', '', $query);
271270
$query .= ' ORDER BY '.$final_order_clause.' '.$direction;
272271
}
273272
}

0 commit comments

Comments
 (0)