Add COLLATE NOCASE to sort queries

annda · annda · commit f0be5277609f · 2023-11-15T20:24:29.000+01:00
Fixes cosmocode#616
diff --git a/types/AbstractBaseType.php b/types/AbstractBaseType.php
@@ -426,7 +426,7 @@ public function select(QueryBuilder $QB, $tablealias, $colname, $alias)
      */
     public function sort(QueryBuilder $QB, $tablealias, $colname, $order)
     {
-        $QB->addOrderBy("$tablealias.$colname $order");
+        $QB->addOrderBy("$tablealias.$colname COLLATE NOCASE $order");
     }
 
     /**
diff --git a/types/Page.php b/types/Page.php
@@ -149,7 +149,7 @@ public function sort(QueryBuilder $QB, $tablealias, $colname, $order)
 
         $rightalias = $QB->generateTableAlias();
         $QB->addLeftJoin($tablealias, 'titles', $rightalias, "$tablealias.$colname = $rightalias.pid");
-        $QB->addOrderBy("$rightalias.title $order");
+        $QB->addOrderBy("$rightalias.title COLLATE NOCASE $order");
         $QB->addOrderBy("$tablealias.$colname $order");
     }
 

Original file line number	Diff line number	Diff line change
`@@ -426,7 +426,7 @@ public function select(QueryBuilder $QB, $tablealias, $colname, $alias)`
`426`	`426`	`*/`
`427`	`427`	`public function sort(QueryBuilder $QB, $tablealias, $colname, $order)`
`428`	`428`	`{`
`429`		`- $QB->addOrderBy("$tablealias.$colname $order");`
	`429`	`+ $QB->addOrderBy("$tablealias.$colname COLLATE NOCASE $order");`
`430`	`430`	`}`
`431`	`431`
`432`	`432`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ public function sort(QueryBuilder $QB, $tablealias, $colname, $order)`
`149`	`149`
`150`	`150`	`$rightalias = $QB->generateTableAlias();`
`151`	`151`	`$QB->addLeftJoin($tablealias, 'titles', $rightalias, "$tablealias.$colname = $rightalias.pid");`
`152`		`- $QB->addOrderBy("$rightalias.title $order");`
	`152`	`+ $QB->addOrderBy("$rightalias.title COLLATE NOCASE $order");`
`153`	`153`	`$QB->addOrderBy("$tablealias.$colname $order");`
`154`	`154`	`}`
`155`	`155`