diff options
| author | bastei <bastei@users.noreply.github.com> | 2013-09-06 17:49:17 +0200 |
|---|---|---|
| committer | bastei <bastei@users.noreply.github.com> | 2013-09-06 17:49:17 +0200 |
| commit | 7a68ae03e3347e5c37879f1d21854eafdb868804 (patch) | |
| tree | e8221d61b82d4f7d165745950de7e3ce2e55c337 /tests | |
| parent | a051d38df9094ccb6cac8e62587d08c477cd09df (diff) | |
| parent | 3a85eeade3ef2ddf464b1e13a3c9640d581eb492 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/unit/db/ItemMapperTest.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/unit/db/ItemMapperTest.php b/tests/unit/db/ItemMapperTest.php index fe1de517a..1dbe13cca 100644 --- a/tests/unit/db/ItemMapperTest.php +++ b/tests/unit/db/ItemMapperTest.php @@ -342,10 +342,10 @@ class ItemMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility { $row = array('feed_id' => 30, 'size' => 11); - $sql2 = 'DELETE FROM `*PREFIX*news_items` `items` ' . + $sql2 = 'DELETE FROM `*PREFIX*news_items` ' . 'WHERE NOT ((`status` & ?) > 0) ' . 'AND `feed_id` = ? ' . - 'ORDER BY `items`.`id` ASC'; + 'ORDER BY `id` ASC'; $params2 = array($status, 30); |