[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, debian, updated. upstream/0.9.5.5-717-g0f98819

[Daniele Ricci]

The following commit has been merged in the debian branch:
commit b689af954aa54795ece456df5dffec58789c2016
Author: Daniele Ricci <daniele.athome at gmail.com>
Date:   Fri Oct 15 17:05:30 2010 +0200

    PIM.Messages: final fixes for messages New switch
    
    Signed-off-by: Daniele Ricci <daniele.athome at gmail.com>

diff --git a/framework/subsystems/opimd/db_handler.py b/framework/subsystems/opimd/db_handler.py
index 471e4b7..04ea24e 100644
--- a/framework/subsystems/opimd/db_handler.py
+++ b/framework/subsystems/opimd/db_handler.py
@@ -162,7 +162,7 @@ class DbHandler(object):
                 cur.execute("insert into info values(?, ?)", ('version', _SQLITE_DATABASE_VERSION))
                 self.con.commit()
             elif version_info[0] != _SQLITE_DATABASE_VERSION:
-                raise Exception("Database version mismatch, needed %s, current is %s" % (_SQLITE_DATABASE_VERSION, version_info[0]));
+                raise Exception("Database version mismatch, needed %s, current is %s" % (_SQLITE_DATABASE_VERSION, version_info[0]))
 
             cur.close()
         
diff --git a/framework/subsystems/opimd/pimd_messages.py b/framework/subsystems/opimd/pimd_messages.py
index 10e0b13..a4c91f3 100644
--- a/framework/subsystems/opimd/pimd_messages.py
+++ b/framework/subsystems/opimd/pimd_messages.py
@@ -131,24 +131,24 @@ class QueryManager(DBusFBObject):
 
         db_prefix = self.db_handler.db_prefix
         query['sql'] = """
-SELECT m.messages_id messages_id,
+SELECT m.""" + db_prefix + """_id """ + db_prefix + """_id,
     (
-        SELECT count(*) FROM messages_phonenumber
+        SELECT count(*) FROM """ + db_prefix + """_phonenumber
         WHERE field_name = 'Peer'
         and value = p1.value
     ) TotalCount,
     (
         SELECT count(*) FROM
             (
-            messages_boolean b
+            """ + db_prefix + """_boolean b
             OUTER LEFT JOIN
-            messages_phonenumber p
-            ON b.messages_id = p.messages_id AND
+            """ + db_prefix + """_phonenumber p
+            ON b.""" + db_prefix + """_id = p.""" + db_prefix + """_id AND
             b.field_name = 'New'
             )
             OUTER LEFT JOIN
-            messages_text x
-            ON b.messages_id = x.messages_id
+            """ + db_prefix + """_text x
+            ON b.""" + db_prefix + """_id = x.""" + db_prefix + """_id
             AND x.field_name = 'Direction'
             WHERE
             b.value = '1' AND
@@ -156,23 +156,23 @@ SELECT m.messages_id messages_id,
             p.field_name = 'Peer' AND p.value = p1.value
     ) UnreadCount
     FROM (
-        messages m
+        """ + db_prefix + """ m
         JOIN
-        messages_date t
-        USING (messages_id)
-    ) JOIN messages_phonenumber p1
-        USING (messages_id)
+        """ + db_prefix + """_date t
+        USING (""" + db_prefix + """_id)
+    ) JOIN """ + db_prefix + """_phonenumber p1
+        USING (""" + db_prefix + """_id)
 
     WHERE t.field_name = 'Timestamp' AND
     t.value IN (
         SELECT max(timestamp) timestamp FROM (
         (
-        SELECT date_t.messages_id AS messages_id, date_t.value AS timestamp FROM
-            messages_date AS date_t
+        SELECT date_t.""" + db_prefix + """_id AS """ + db_prefix + """_id, date_t.value AS timestamp FROM
+            """ + db_prefix + """_date AS date_t
         WHERE date_t.field_name = 'Timestamp'
         ) res_t
-        JOIN messages_phonenumber num_t ON
-            res_t.messages_id = num_t.messages_id AND num_t.field_name = 'Peer'
+        JOIN """ + db_prefix + """_phonenumber num_t ON
+            res_t.""" + db_prefix + """_id = num_t.""" + db_prefix + """_id AND num_t.field_name = 'Peer'
         )
         GROUP BY num_t.value
     )

-- 
FSO frameworkd Debian packaging