[Lsb-messages] /var/www/bzr/lsb/devel/dbadmin r290: Fix issue with commands moved from one module to another

[Denis Silakov]

------------------------------------------------------------
revno: 290
committer: Denis Silakov <denis.silakov at rosalab.ru>
branch nick: dbadmin
timestamp: Thu 2013-09-12 15:59:09 +0400
message:
  Fix issue with commands moved from one module to another
modified:
  command.inc
  tmp_tables.inc
-------------- next part --------------
=== modified file 'command.inc'
--- a/command.inc	2012-09-10 17:07:47 +0000
+++ b/command.inc	2013-09-12 11:59:09 +0000
@@ -158,9 +158,13 @@
     global $lsb_change_link;
     $select = "SELECT * FROM tmp_Command
                 LEFT JOIN Command USING(Cid)
-                LEFT JOIN CmdStd ON CScid=Cid
+                LEFT JOIN CmdStd ON CScid=Cid AND CSsid=Cstd
                 LEFT JOIN SModCmd ON (SMCcid=Command.Cid) AND (SModCmd.SMCsmid=tmp_Command.SMCsmid)
                 LEFT JOIN SubModule ON SModCmd.SMCsmid=SMid
+                WHERE (
+                    SMCappearedin >= CSappearedin AND (SMCappearedin < CSwithdrawnin OR CSwithdrawnin IS NULL )
+                    OR SMCwithdrawnin > CSappearedin AND (SMCwithdrawnin <= CSwithdrawnin OR CSwithdrawnin IS NULL )
+                )
                 ORDER BY Cname";
     $res=Query($select);
 

=== modified file 'tmp_tables.inc'
--- a/tmp_tables.inc	2012-09-12 11:46:45 +0000
+++ b/tmp_tables.inc	2013-09-12 11:59:09 +0000
@@ -238,10 +238,14 @@
                         (KEY `Cid` (`Cid`), KEY `Cstd`(`Cstd`), KEY `Cref`(`Cref`))
                         AS SELECT Cid, SMCsmid, CSsid AS Cstd, CSrefspec AS Cref FROM Command
                         LEFT JOIN SModCmd ON SMCcid=Cid
-                        LEFT JOIN CmdStd ON CScid=Cid ";
+                        LEFT JOIN CmdStd ON CScid=Cid 
+                        WHERE (
+                            SMCappearedin >= CSappearedin AND (SMCappearedin < CSwithdrawnin OR CSwithdrawnin IS NULL )
+                            OR SMCwithdrawnin > CSappearedin AND (SMCwithdrawnin <= CSwithdrawnin OR CSwithdrawnin IS NULL )
+                        )";
     add_lsbversion_filter($createCommand, "SMCappearedin", "SMCwithdrawnin");
-    add_lsbversion_filter($createCommand, "Cappearedin", "Cwithdrawnin");
     add_lsbversion_filter($createCommand, "CSappearedin", "CSwithdrawnin");
+    print $createCommand;
     Query($createCommand);
 }