Skip to content

Commit

Permalink
PostgreSQL compatibility issue #437
Browse files Browse the repository at this point in the history
  • Loading branch information
@Rello
Rello committed Sep 1, 2019
1 parent a53f946 commit 252856c
Showing 1 changed file with 15 additions and 15 deletions.
30 changes: 15 additions & 15 deletions lib/Controller/CategoryController.php
View file
Expand Up @@ -186,13 +186,13 @@ public function getCategoryItemCovers($category, $categoryId)
$whereMatching = array('Artist' => '`AT`.`artist_id`', 'Genre' => '`AT`.`genre_id`', 'Album' => '`AB`.`id`', 'Album Artist' => '`AB`.`artist_id`', 'Year' => '`AT`.`year`', 'Folder' => '`AT`.`folder_id`');

$aPlaylists = array();
$SQL = 'SELECT `AB`.`id` , `AB`.`name`, LOWER(`AB`.`name`) AS `lower` , `AA`.`id` AS `art`, (CASE WHEN `AB`.`cover` IS NOT NULL THEN `AB`.`id` ELSE "" END) AS `cid`';
$SQL = 'SELECT `AB`.`id` , `AB`.`name`, LOWER(`AB`.`name`) AS `lower` , `AA`.`id` AS `art`, (CASE WHEN `AB`.`cover` IS NOT NULL THEN `AB`.`id` ELSE NULL END) AS `cid`';
$SQL .= ' FROM `*PREFIX*audioplayer_tracks` `AT`';
$SQL .= ' LEFT JOIN `*PREFIX*audioplayer_artists` `AA` ON `AT`.`artist_id` = `AA`.`id`';
$SQL .= ' LEFT JOIN `*PREFIX*audioplayer_albums` `AB` ON `AT`.`album_id` = `AB`.`id`';
$SQL .= ' LEFT JOIN `*PREFIX*audioplayer_albums` `AB` ON `AB`.`id` = `AT`.`album_id`';
$SQL .= ' LEFT JOIN `*PREFIX*audioplayer_artists` `AA` ON `AA`.`id` = `AB`.`artist_id`';
$SQL .= ' WHERE `AT`.`user_id` = ? ';
if ($categoryId) $SQL .= 'AND ' . $whereMatching[$category] . '= ?';
$SQL .= ' GROUP BY `AB`.`id` ORDER BY LOWER(`AB`.`name`) ASC';
$SQL .= ' GROUP BY `AB`.`id`, `AA`.`id` ORDER BY LOWER(`AB`.`name`) ASC';

if (isset($SQL)) {
$stmt = $this->db->prepare($SQL);
Expand Down Expand Up @@ -287,14 +287,14 @@ private function getTracksDetails($category, $categoryId)
$SQL = null;
$favorite = false;
$aTracks = array();
$SQL_select = 'SELECT `AT`.`id`, `AT`.`title` AS `cl1`, `AA`.`name` AS `cl2`, `AB`.`name` AS `cl3`, `AT`.`length` AS `len`, `AT`.`file_id` AS `fid`, `AT`.`mimetype` AS `mim`, (CASE WHEN `AB`.`cover` IS NOT NULL THEN `AB`.`id` ELSE "" END) AS `cid`, LOWER(`AB`.`name`) AS `lower`';
$SQL_select = 'SELECT `AT`.`id`, `AT`.`title` AS `cl1`, `AA`.`name` AS `cl2`, `AB`.`name` AS `cl3`, `AT`.`length` AS `len`, `AT`.`file_id` AS `fid`, `AT`.`mimetype` AS `mim`, (CASE WHEN `AB`.`cover` IS NOT NULL THEN `AB`.`id` ELSE NULL END) AS `cid`, LOWER(`AB`.`name`) AS `lower`';
$SQL_from = ' FROM `*PREFIX*audioplayer_tracks` `AT`
LEFT JOIN `*PREFIX*audioplayer_artists` `AA` ON `AT`.`artist_id` = `AA`.`id`
LEFT JOIN `*PREFIX*audioplayer_albums` `AB` ON `AT`.`album_id` = `AB`.`id`';
$SQL_order = ' ORDER BY LOWER(`AB`.`name`) ASC, `AT`.`disc` ASC, `AT`.`number` ASC';

if ($category === 'Artist') {
$SQL_select = 'SELECT `AT`.`id`, `AT`.`title` AS `cl1`, `AB`.`name` AS `cl2`, `AT`.`year` AS `cl3`, `AT`.`length` AS `len`, `AT`.`file_id` AS `fid`, `AT`.`mimetype` AS `mim`, (CASE WHEN `AB`.`cover` IS NOT NULL THEN `AB`.`id` ELSE "" END) AS `cid`, LOWER(`AB`.`name`) AS `lower`';
$SQL_select = 'SELECT `AT`.`id`, `AT`.`title` AS `cl1`, `AB`.`name` AS `cl2`, `AT`.`year` AS `cl3`, `AT`.`length` AS `len`, `AT`.`file_id` AS `fid`, `AT`.`mimetype` AS `mim`, (CASE WHEN `AB`.`cover` IS NOT NULL THEN `AB`.`id` ELSE NULL END) AS `cid`, LOWER(`AB`.`name`) AS `lower`';
$SQL = $SQL_select . $SQL_from .
'WHERE `AT`.`artist_id` = ? AND `AT`.`user_id` = ?' .
$SQL_order;
Expand All @@ -311,7 +311,7 @@ private function getTracksDetails($category, $categoryId)
'WHERE `AT`.`id` > ? AND `AT`.`user_id` = ?' .
$SQL_order;
} elseif ($category === 'Playlist' AND $categoryId === 'X1') { // Favorites
$SQL = 'SELECT `AT`.`id` , `AT`.`title` AS `cl1`,`AA`.`name` AS `cl2`, `AB`.`name` AS `cl3`,`AT`.`length` AS `len`, `AT`.`file_id` AS `fid`, `AT`.`mimetype` AS `mim`, (CASE WHEN `AB`.`cover` IS NOT NULL THEN `AB`.`id` ELSE "" END) AS `cid`, LOWER(`AT`.`title`) AS `lower`' .
$SQL = 'SELECT `AT`.`id` , `AT`.`title` AS `cl1`,`AA`.`name` AS `cl2`, `AB`.`name` AS `cl3`,`AT`.`length` AS `len`, `AT`.`file_id` AS `fid`, `AT`.`mimetype` AS `mim`, (CASE WHEN `AB`.`cover` IS NOT NULL THEN `AB`.`id` ELSE NULL END) AS `cid`, LOWER(`AT`.`title`) AS `lower`' .
$SQL_from .
'WHERE `AT`.`id` <> ? AND `AT`.`user_id` = ?' .
' ORDER BY LOWER(`AT`.`title`) ASC';
Expand Down Expand Up @@ -355,7 +355,7 @@ private function getTracksDetails($category, $categoryId)
'WHERE `AT`.`folder_id` = ? AND `AT`.`user_id` = ?' .
$SQL_order;
} elseif ($category === 'Album') {
$SQL_select = 'SELECT `AT`.`id`, `AT`.`title` AS `cl1`, `AA`.`name` AS `cl2`, `AT`.`length` AS `len`, `AT`.`disc` AS `dsc`, `AT`.`file_id` AS `fid`, `AT`.`mimetype` AS `mim`, (CASE WHEN `AB`.`cover` IS NOT NULL THEN `AB`.`id` ELSE "" END) AS `cid`, LOWER(`AT`.`title`) AS `lower`,`AT`.`number` AS `num`';
$SQL_select = 'SELECT `AT`.`id`, `AT`.`title` AS `cl1`, `AA`.`name` AS `cl2`, `AT`.`length` AS `len`, `AT`.`disc` AS `dsc`, `AT`.`file_id` AS `fid`, `AT`.`mimetype` AS `mim`, (CASE WHEN `AB`.`cover` IS NOT NULL THEN `AB`.`id` ELSE NULL END) AS `cid`, LOWER(`AT`.`title`) AS `lower`,`AT`.`number` AS `num`';
$SQL = $SQL_select . $SQL_from .
'WHERE `AB`.`id` = ? AND `AB`.`user_id` = ?' .
' ORDER BY `AT`.`disc` ASC, `AT`.`number` ASC';
Expand All @@ -376,13 +376,13 @@ private function getTracksDetails($category, $categoryId)
$row['cl3'] = $row['dsc'] . '-' . $row['num'];
}
array_splice($row, 8, 1);
$nodes = $this->rootFolder->getUserFolder($this->userId)->getById($row['fid']);
$file = array_shift($nodes);
if ($file === null) {
$this->logger->debug('removed/unshared file found => remove '.$row['fid'], array('app' => 'audioplayer'));
$this->DBController->deleteFromDB($row['fid'], $this->userId);
continue;
}
//$nodes = $this->rootFolder->getUserFolder($this->userId)->getById($row['fid']);
//$file = array_shift($nodes);
//if ($file === null) {
// $this->logger->debug('removed/unshared file found => remove '.$row['fid'], array('app' => 'audioplayer'));
// $this->DBController->deleteFromDB($row['fid'], $this->userId);
// continue;
//}
if (is_array($favorites) AND in_array($row['fid'], $favorites)) {
$row['fav'] = 't';
}
Expand Down

0 comments on commit 252856c

Please sign in to comment.