# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1465080062 -7200
# Node ID 9c254032288d1af75be539644da4f893946f9380
# Parent  9feaee690f44af6d3dd7e205f7de44b4e404832d
Updated references to now-removed tables and directories.

diff -r 9feaee690f44 -r 9c254032288d imiptools/stores/database/common.py
--- a/imiptools/stores/database/common.py	Sun Jun 05 00:12:28 2016 +0200
+++ b/imiptools/stores/database/common.py	Sun Jun 05 00:41:02 2016 +0200
@@ -825,7 +825,7 @@
         "Return a list of quotas."
 
         query = "select distinct quota from (" \
-                "select quota from quota_freebusy " \
+                "select distinct store_user as quota from freebusy_other " \
                 "union all select quota from quota_limits" \
                 ") as quotas"
         self.cursor.execute(query)
@@ -840,7 +840,7 @@
 
         query, values = self.get_query(
             "select distinct user_group from (" \
-            "select user_group from quota_freebusy :condition " \
+            "select distinct other as user_group from freebusy_other :condition " \
             "union all select user_group from quota_delegates :condition" \
             ") as users",
             columns, values)
diff -r 9feaee690f44 -r 9c254032288d imiptools/stores/file.py
--- a/imiptools/stores/file.py	Sun Jun 05 00:12:28 2016 +0200
+++ b/imiptools/stores/file.py	Sun Jun 05 00:41:02 2016 +0200
@@ -787,21 +787,8 @@
 
     # Quota and user identity/group discovery.
 
-    def get_quotas(self):
-
-        "Return a list of quotas."
-
-        return listdir(self.store_dir)
-
-    def get_quota_users(self, quota):
-
-        "Return a list of quota users for 'quota'."
-
-        filename = self.get_object_in_store(quota, "journal")
-        if not filename or not isdir(filename):
-            return []
-
-        return list(set(self.get_delegates(quota)).union(listdir(filename)))
+    get_quotas = Store.get_users
+    get_quota_users = Store.get_freebusy_others
 
     # Delegate information for the quota.