From a600f6b718ab81efeda1fce68e5f817c3f23504a Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <dev@bernhard-posselt.com>
Date: Thu, 6 Nov 2014 15:49:16 +0100
Subject: try to fix delete older than threshold so we can test it properly

---
 appinfo/application.php | 11 ++---------
 appinfo/database.xml    |  3 ++-
 appinfo/info.xml        |  2 +-
 3 files changed, 5 insertions(+), 11 deletions(-)

(limited to 'appinfo')

diff --git a/appinfo/application.php b/appinfo/application.php
index 8716feac9..5c1978459 100644
--- a/appinfo/application.php
+++ b/appinfo/application.php
@@ -43,8 +43,8 @@ use \OCA\News\Service\ItemService;
 
 use \OCA\News\Db\FolderMapper;
 use \OCA\News\Db\FeedMapper;
+use \OCA\News\Db\ItemMapper;
 use \OCA\News\Db\StatusFlag;
-use \OCA\News\Db\MapperFactory;
 
 use \OCA\News\Utility\OPMLExporter;
 use \OCA\News\Utility\Updater;
@@ -230,13 +230,6 @@ class Application extends App {
         /**
          * Mappers
          */
-        $container->registerService('MapperFactory', function($c) {
-            return new MapperFactory(
-                $c->query('DatabaseType'),
-                $c->query('Db')
-            );
-        });
-
         $container->registerService('FolderMapper', function($c) {
             return new FolderMapper(
                 $c->query('Db')
@@ -250,7 +243,7 @@ class Application extends App {
         });
 
         $container->registerService('ItemMapper', function($c) {
-            return $c->query('MapperFactory')->getItemMapper(
+            return new ItemMapper(
                 $c->query('Db')
             );
         });
diff --git a/appinfo/database.xml b/appinfo/database.xml
index f7a95746e..688d04547 100644
--- a/appinfo/database.xml
+++ b/appinfo/database.xml
@@ -252,7 +252,8 @@
                 <name>status</name>
                 <type>integer</type>
                 <length>8</length>
-                <notnull>false</notnull>
+                <default>0</default>
+                <notnull>true</notnull>
             </field>
             <field>
                 <name>last_modified</name>
diff --git a/appinfo/info.xml b/appinfo/info.xml
index d3ea13c0c..45e6cde33 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -4,7 +4,7 @@
     <name>News</name>
     <description>An RSS/Atom feed reader. Requires ownCloud backgroundjobs or an updater script to be enabled to update your feeds. See the README.md in the apps top directory</description>
     <licence>AGPL</licence>
-    <version>3.999.4</version>
+    <version>3.999.5</version>
     <require>7.0.3</require>
     <author>Bernhard Posselt, Alessandro Cosentino, Jan-Christoph Borchardt</author>
 </info>
-- 
cgit v1.2.3