[Fmsystem-commits] [6532] bkbooking: bugfix updatescript added missing sql statment and corrected another

[Kjell Arne Espedal]

Revision: 6532
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6532
Author:   kjell
Date:     2010-11-02 07:33:17 +0000 (Tue, 02 Nov 2010)
Log Message:
-----------
bkbooking: bugfix updatescript added missing sql statment and corrected another

Modified Paths:
--------------
    branches/Version-1_0-branch/booking/setup/tables_update.inc.php

Modified: branches/Version-1_0-branch/booking/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/setup/tables_update.inc.php     
2010-11-02 07:29:35 UTC (rev 6531)
+++ branches/Version-1_0-branch/booking/setup/tables_update.inc.php     
2010-11-02 07:33:17 UTC (rev 6532)
@@ -2372,8 +2372,8 @@
 
                $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
 
-               $GLOBALS['phpgw_setup']->oProc->m_odb->query("");
-               $GLOBALS['phpgw_setup']->oProc->m_odb->query("UPDATE 
bb_application SET building_name = b2.name FROM bb_building b2 WHERE EXISTS 
(SELECT 1 FROM bb_building b, bb_application a, bb_application_resource 
ar,bb_resource r WHERE a.activity_id = ar.application_id AND ar.resource_id = 
r.id AND r.building_id = b.id AND b2.id=b.id AND bb_booking.id=bo.id)");
+               $GLOBALS['phpgw_setup']->oProc->m_odb->query("ALTER TABLE 
bb_application ADD COLUMN building_name varchar(50) NOT NULL DEFAULT 
'changeme'");
+               $GLOBALS['phpgw_setup']->oProc->m_odb->query("UPDATE 
bb_application SET building_name = b2.name FROM bb_building b2 WHERE EXISTS 
(SELECT 1 FROM bb_building b, bb_application a, bb_application_resource 
ar,bb_resource r WHERE a.activity_id = ar.application_id AND ar.resource_id = 
r.id AND r.building_id = b.id AND b2.id=b.id AND bb_application.id=a.id)");
 
                if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
                {