From 731dbac7d399928f4e1137031689796b0721c75e Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Sun, 20 Sep 2015 14:57:59 +0200 Subject: postgres: Fix multiple queries using MySQL syntax Signed-off-by: Florian Pritz --- application/models/mmultipaste.php | 12 ++++++------ application/service/files.php | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'application') diff --git a/application/models/mmultipaste.php b/application/models/mmultipaste.php index f80105ec9..0185e8c7f 100644 --- a/application/models/mmultipaste.php +++ b/application/models/mmultipaste.php @@ -65,7 +65,7 @@ class Mmultipaste extends CI_Model { $sql = ' SELECT url_id - FROM `'.$this->db->dbprefix.'multipaste` + FROM '.$this->db->dbprefix.'multipaste WHERE url_id = ? LIMIT 1'; $query = $this->db->query($sql, array($id)); @@ -124,7 +124,7 @@ class Mmultipaste extends CI_Model { { return $this->db->query(" SELECT user_id - FROM `".$this->db->dbprefix."multipaste` + FROM ".$this->db->dbprefix."multipaste WHERE url_id = ? ", array($id))->row_array()["user_id"]; } @@ -133,7 +133,7 @@ class Mmultipaste extends CI_Model { { return $this->db->query(" SELECT url_id, user_id, date - FROM `".$this->db->dbprefix."multipaste` + FROM ".$this->db->dbprefix."multipaste WHERE url_id = ? ", array($id))->row_array(); } @@ -144,8 +144,8 @@ class Mmultipaste extends CI_Model { $query = $this->db->query(" SELECT mfm.file_url_id - FROM `".$this->db->dbprefix."multipaste_file_map` mfm - JOIN `".$this->db->dbprefix."multipaste` m ON m.multipaste_id = mfm.multipaste_id + FROM ".$this->db->dbprefix."multipaste_file_map mfm + JOIN ".$this->db->dbprefix."multipaste m ON m.multipaste_id = mfm.multipaste_id WHERE m.url_id = ? ORDER BY mfm.sort_order ", array($url_id))->result_array(); @@ -162,7 +162,7 @@ class Mmultipaste extends CI_Model { { $query = $this->db->query(" SELECT multipaste_id - FROM `".$this->db->dbprefix."multipaste` + FROM ".$this->db->dbprefix."multipaste WHERE url_id = ? ", array($url_id)); diff --git a/application/service/files.php b/application/service/files.php index adc62c7dc..c65660b75 100644 --- a/application/service/files.php +++ b/application/service/files.php @@ -31,12 +31,12 @@ class files { } $total_size = $CI->db->query(" - SELECT coalesce(sum(filesize), 0) sum + SELECT coalesce(sum(sub.filesize), 0) sum FROM ( - SELECT DISTINCT `".$CI->db->dbprefix."file_storage`.id, filesize - FROM `".$CI->db->dbprefix."file_storage` - JOIN `".$CI->db->dbprefix."files` ON `".$CI->db->dbprefix."file_storage`.id = `".$CI->db->dbprefix."files`.file_storage_id - WHERE user = ? + SELECT DISTINCT fs.id, filesize + FROM ".$CI->db->dbprefix."file_storage fs + JOIN ".$CI->db->dbprefix."files f ON fs.id = f.file_storage_id + WHERE f.user = ? ) sub ", array($user))->row_array(); -- cgit v1.2.3-24-g4f1b