Persons are deleted now when a conference is removed.

diff --git a/BUGS b/BUGS
index 4a4ba56cc69bdb8eb08e9fd472b4757d0eedba20..befad2cd4faee290af6dc22b4375aaf515611f23 100644 (file)
--- a/BUGS
+++ b/BUGS
@@ -4,7 +4,9 @@ We don't have a bug tracking system yet, therefore this file contains known bugs
 -------------------------------------------------------------------
 BugId: 1
 Title: Persons are not deleted when deleting a conference.
 -------------------------------------------------------------------
 BugId: 1
 Title: Persons are not deleted when deleting a conference.

+Status: Fixed.

 -------------------------------------------------------------------
 BugId: 2
 Title: SQL injections possible.
 -------------------------------------------------------------------
 BugId: 2
 Title: SQL injections possible.

+Status: 

 -------------------------------------------------------------------
 -------------------------------------------------------------------

diff --git a/src/sql/sqlengine.cpp b/src/sql/sqlengine.cpp
index c214218f5ee650dc2f13539fca2391e60b295360..9b2948b3780be613a045d1891db8b0e4d09ff155 100644 (file)
--- a/src/sql/sqlengine.cpp
+++ b/src/sql/sqlengine.cpp
@@ -348,9 +348,10 @@ void SqlEngine::deleteConference(int id)
     execQueryWithParameter(db, "DELETE FROM EVENT_ROOM WHERE xid_conference = :xid_conference", params);
     execQueryWithParameter(db, "DELETE FROM EVENT_PERSON WHERE xid_conference = :xid_conference", params);
     execQueryWithParameter(db, "DELETE FROM EVENT WHERE xid_conference = :xid_conference", params);
     execQueryWithParameter(db, "DELETE FROM EVENT_ROOM WHERE xid_conference = :xid_conference", params);
     execQueryWithParameter(db, "DELETE FROM EVENT_PERSON WHERE xid_conference = :xid_conference", params);
     execQueryWithParameter(db, "DELETE FROM EVENT WHERE xid_conference = :xid_conference", params);

+    execQueryWithParameter(db, "DELETE FROM ROOM WHERE xid_conference = :xid_conference", params);
+    execQueryWithParameter(db, "DELETE FROM PERSON WHERE xid_conference = :xid_conference", params);
+    execQueryWithParameter(db, "DELETE FROM TRACK WHERE xid_conference = :xid_conference", params);

     execQueryWithParameter(db, "DELETE FROM CONFERENCE WHERE id = :xid_conference", params);
     execQueryWithParameter(db, "DELETE FROM CONFERENCE WHERE id = :xid_conference", params);

-    execQuery(db, "DELETE FROM ROOM WHERE NOT EXISTS(SELECT * FROM EVENT_ROOM WHERE xid_room = ROOM.id)");
-    execQuery(db, "DELETE FROM PERSON WHERE NOT EXISTS(SELECT * FROM EVENT_PERSON WHERE xid_person = PERSON.id)");

 
     commitTransaction();
 }
 
     commitTransaction();
 }