From 44ae0ba29b465da5c3fc3fbbd1c823194dfe334a Mon Sep 17 00:00:00 2001 From: "J. King" Date: Thu, 7 Dec 2017 18:17:16 -0500 Subject: [PATCH] Collate synthetic subscription title column; fixes #127 --- UPGRADING | 7 +++++++ lib/Database.php | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/UPGRADING b/UPGRADING index 5dd4f3b8..df9448cc 100644 --- a/UPGRADING +++ b/UPGRADING @@ -8,6 +8,13 @@ When upgrading between any two versions of The Arsse, the following are usually - Check for any changes to sample systemd unit or other init files - If installing from source, update dependencies with `composer install -o --no-dev` + +Upgrading from 0.2.0 to 0.2.1 +============================= + +- The database schema has changed from rev2 to rev3; if upgrading the database manually, apply the 2.sql file + + Upgrading from 0.1.x to 0.2.0 ============================= diff --git a/lib/Database.php b/lib/Database.php index 85cb955b..fdede552 100644 --- a/lib/Database.php +++ b/lib/Database.php @@ -536,7 +536,7 @@ class Database { join arsse_feeds on feed = arsse_feeds.id left join topmost on folder=f_id" ); - $q->setOrder("pinned desc, title"); + $q->setOrder("pinned desc, title collate nocase"); // define common table expressions $q->setCTE("user(user)", "SELECT ?", "str", $user); // the subject user; this way we only have to pass it to prepare() once // topmost folders belonging to the user