[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 9e65cebba73fed9eb7c14ce572c60fa0e9fd8a2c
Author: Daniele Ricci <daniele.athome at gmail.com>
Date:   Tue Oct 26 09:28:28 2010 +0200

    opimd: delete MessageSent=1 as well in upgrade script
    
    Signed-off-by: Daniele Ricci <daniele.athome at gmail.com>

diff --git a/framework/subsystems/opimd/db/upgrade-2.1.sql b/framework/subsystems/opimd/db/upgrade-2.1.sql
index e1efabb..fa71071 100644
--- a/framework/subsystems/opimd/db/upgrade-2.1.sql
+++ b/framework/subsystems/opimd/db/upgrade-2.1.sql
@@ -1,5 +1,5 @@
 -- delete deprecated MessageRead values
-DELETE FROM messages_boolean WHERE field_name = 'MessageRead' AND value = '1';
+DELETE FROM messages_boolean WHERE (field_name = 'MessageRead' or field_name = 'MessageSent')  AND value = 1;
 -- invert MessageRead and MessageSent to be used as New
 UPDATE messages_boolean SET value = NOT value WHERE field_name = 'MessageRead' OR field_name = 'MessageSent';
 -- rename MessageRead and MessageSent to New
diff --git a/tools/update-db-2.1.sql b/tools/update-db-2.1.sql
deleted file mode 100644
index 4fd68ac..0000000
--- a/tools/update-db-2.1.sql
+++ /dev/null
@@ -1,6 +0,0 @@
--- delete deprecated MessageRead values
-DELETE FROM messages_boolean WHERE field_name = 'MessageRead' AND value = '1';
--- invert MessageRead and MessageSent to be used as New
-UPDATE messages_boolean SET value = NOT value WHERE field_name = 'MessageRead' OR field_name = 'MessageSent';
--- rename MessageRead and MessageSent to New
-UPDATE messages_boolean SET field_name = 'New' WHERE field_name = 'MessageRead' OR field_name = 'MessageSent';

-- 
FSO frameworkd Debian packaging