The cached query type must replace the default query.

diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Base.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Base.php
index 98529c7..99c23ec 100644 (file)
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Base.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Base.php
@@ -69,7 +69,9 @@ implements Horde_Kolab_Storage
             $this->_master,
             $this->_factory
         );
-        $this->_factory->createListQuery('Base', $list);
+        $list->registerQuery(
+            'Base', $this->_factory->createListQuery('Base', $list)
+        );
         return $list;
     }
 

diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Decorator/Cache.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Decorator/Cache.php
index d9327a0..c3155eb 100644 (file)
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Decorator/Cache.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Decorator/Cache.php
@@ -81,8 +81,11 @@ implements Horde_Kolab_Storage
             $this->_storage->getList(),
             $list_cache
         );
-        $this->_factory->createListQuery(
-            'Cache', $list, array('cache' => $list_cache)
+        $list->registerQuery(
+            'Base',
+            $this->_factory->createListQuery(
+                'Cache', $list, array('cache' => $list_cache)
+            )
         );
         return $list;
     }

diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Factory.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Factory.php
index 53a9306..65db2fe 100644 (file)
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Factory.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Factory.php
@@ -184,7 +184,6 @@ class Horde_Kolab_Storage_Factory
         } else {
             throw new Horde_Kolab_Storage_Exception(sprintf('No such query "%s"!', $name));
         }
-        $list->registerQuery($name, $query);
         return $query;
     }
 

diff --git a/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/List/BaseTest.php b/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/List/BaseTest.php
index ff3f320..f2224a4 100644 (file)
--- a/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/List/BaseTest.php
+++ b/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/List/BaseTest.php
@@ -110,6 +110,7 @@ extends Horde_Kolab_Storage_TestCase
             'Horde_Kolab_Storage_Stub_FactoryQuery',
             $list
         );
+        $list->registerQuery('Horde_Kolab_Storage_Stub_FactoryQuery', $query);
         $this->assertInstanceOf(
             'Horde_Kolab_Storage_Stub_FactoryQuery',
             $list->getQuery('Horde_Kolab_Storage_Stub_FactoryQuery')

diff --git a/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/List/Decorator/CacheTest.php b/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/List/Decorator/CacheTest.php
index cb5169a..2e630ab 100644 (file)
--- a/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/List/Decorator/CacheTest.php
+++ b/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/List/Decorator/CacheTest.php
@@ -347,7 +347,8 @@ extends Horde_Kolab_Storage_TestCase
                 $cache
             )
         );
-        $factory->createListQuery('Base', $list);
+        $query = $factory->createListQuery('Base', $list);
+        $list->registerQuery('Base', $query);
         $this->assertInstanceOf(
             'Horde_Kolab_Storage_Query',
             $list->getQuery('Base')

diff --git a/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/List/Decorator/LogTest.php b/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/List/Decorator/LogTest.php
index 0462885..cff207a 100644 (file)
--- a/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/List/Decorator/LogTest.php
+++ b/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/List/Decorator/LogTest.php
@@ -84,7 +84,8 @@ extends Horde_Kolab_Storage_TestCase
             $this->getNullList($factory),
             $this->getMockLogger()
         );
-        $factory->createListQuery('Base', $list);
+        $query = $factory->createListQuery('Base', $list);
+        $list->registerQuery('Base', $query);
         $this->assertInstanceOf(
             'Horde_Kolab_Storage_Query',
             $list->getQuery('Base')