Merge pull request fossar#299 from seanrand/nested-subquery-fix

Fix update.php failing with MySQL (fossar#298)
seanrand · Apr 28, 2013 · 18166f1 · 18166f1
2 parents 46cb4e7 + bf8b501
commit 18166f1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/daos/mysql/Items.php b/daos/mysql/Items.php
@@ -150,9 +150,8 @@ public function exists($uid) {
      * @param DateTime $date date to delete all items older than this value [optional]
      */
     public function cleanup(\DateTime $date = NULL) {
-        \F3::get('db')->exec('DELETE FROM items WHERE id IN (
-                                SELECT items.id FROM items LEFT JOIN sources
-                                ON items.source=sources.id WHERE sources.id IS NULL)');
+        \F3::get('db')->exec('DELETE FROM items USING items LEFT JOIN sources
+                                ON items.source=sources.id WHERE sources.id IS NULL');
         if ($date !== NULL)
             \F3::get('db')->exec('DELETE FROM items WHERE starred=0 AND datetime<:date',
                     array(':date' => $date->format('Y-m-d').' 00:00:00'));

diff --git a/daos/sqlite/Items.php b/daos/sqlite/Items.php
@@ -13,4 +13,20 @@
  */
 // class Items extends Database {
 class Items extends \daos\mysql\Items {
+
+    /**
+     * cleanup orphaned and old items
+     *
+     * @return void
+     * @param DateTime $date date to delete all items older than this value [optional]
+     */
+    public function cleanup(\DateTime $date = NULL) {
+        \F3::get('db')->exec('DELETE FROM items WHERE id IN (
+                                SELECT items.id FROM items LEFT JOIN sources
+                                ON items.source=sources.id WHERE sources.id IS NULL)');
+        if ($date !== NULL)
+            \F3::get('db')->exec('DELETE FROM items WHERE starred=0 AND datetime<:date',
+                    array(':date' => $date->format('Y-m-d').' 00:00:00'));
+    }
+
 }