Switch to using oProc object instead of db object to avoid update errors

This commit is contained in:
Miles Lott 2003-10-19 12:48:36 +00:00
parent 61bf56843f
commit 6a69632487

View File

@ -92,7 +92,7 @@
$accounts->db = $phpgw_setup->db; $accounts->db = $phpgw_setup->db;
$phpgw_setup->oProc->query("select * from phpgw_access_log"); $phpgw_setup->oProc->query("select * from phpgw_access_log");
while ($phpgw_setup->oProc->next_record()) while($phpgw_setup->oProc->next_record())
{ {
$lid = explode('@',$phpgw_setup->oProc->f('loginid')); $lid = explode('@',$phpgw_setup->oProc->f('loginid'));
$account_lid = $lid[0]; $account_lid = $lid[0];
@ -510,7 +510,7 @@
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_vfs','content', array ('type' => 'text', 'nullable' => True)); $GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_vfs','content', array ('type' => 'text', 'nullable' => True));
// this is the 0.9.15.004 update, needed for the polish translations // this is the 0.9.15.004 update, needed for the polish translations
$GLOBALS['phpgw_setup']->db->query("UPDATE languages set available='Yes' WHERE lang_id='pl'"); $GLOBALS['phpgw_setup']->oProc->query("UPDATE languages set available='Yes' WHERE lang_id='pl'");
$GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.14.500'; $GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.14.500';
return $GLOBALS['setup_info']['phpgwapi']['currentver']; return $GLOBALS['setup_info']['phpgwapi']['currentver'];
@ -526,7 +526,7 @@
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_vfs','content', array ('type' => 'text', 'nullable' => True)); $GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_vfs','content', array ('type' => 'text', 'nullable' => True));
// this is the 0.9.15.004 update, needed for the polish translations // this is the 0.9.15.004 update, needed for the polish translations
$GLOBALS['phpgw_setup']->db->query("UPDATE languages set available='Yes' WHERE lang_id='pl'"); $GLOBALS['phpgw_setup']->oProc->query("UPDATE languages set available='Yes' WHERE lang_id='pl'");
$GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.14.500'; $GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.14.500';
return $GLOBALS['setup_info']['phpgwapi']['currentver']; return $GLOBALS['setup_info']['phpgwapi']['currentver'];
@ -542,7 +542,7 @@
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_vfs','content', array ('type' => 'text', 'nullable' => True)); $GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_vfs','content', array ('type' => 'text', 'nullable' => True));
// this is the 0.9.15.004 update, needed for the polish translations // this is the 0.9.15.004 update, needed for the polish translations
$GLOBALS['phpgw_setup']->db->query("UPDATE languages set available='Yes' WHERE lang_id='pl'"); $GLOBALS['phpgw_setup']->oProc->query("UPDATE languages set available='Yes' WHERE lang_id='pl'");
$GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.14.500'; $GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.14.500';
return $GLOBALS['setup_info']['phpgwapi']['currentver']; return $GLOBALS['setup_info']['phpgwapi']['currentver'];
@ -558,7 +558,7 @@
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_vfs','content', array ('type' => 'text', 'nullable' => True)); $GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_vfs','content', array ('type' => 'text', 'nullable' => True));
// this is the 0.9.15.004 update, needed for the polish translations // this is the 0.9.15.004 update, needed for the polish translations
$GLOBALS['phpgw_setup']->db->query("UPDATE languages set available='Yes' WHERE lang_id='pl'"); $GLOBALS['phpgw_setup']->oProc->query("UPDATE languages set available='Yes' WHERE lang_id='pl'");
$GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.14.500'; $GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.14.500';
return $GLOBALS['setup_info']['phpgwapi']['currentver']; return $GLOBALS['setup_info']['phpgwapi']['currentver'];
@ -574,7 +574,7 @@
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_vfs','content', array ('type' => 'text', 'nullable' => True)); $GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_vfs','content', array ('type' => 'text', 'nullable' => True));
// this is the 0.9.15.004 update, needed for the polish translations // this is the 0.9.15.004 update, needed for the polish translations
$GLOBALS['phpgw_setup']->db->query("UPDATE languages set available='Yes' WHERE lang_id='pl'"); $GLOBALS['phpgw_setup']->oProc->query("UPDATE languages set available='Yes' WHERE lang_id='pl'");
$GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.14.500'; $GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.14.500';
return $GLOBALS['setup_info']['phpgwapi']['currentver']; return $GLOBALS['setup_info']['phpgwapi']['currentver'];
@ -627,7 +627,6 @@
return $GLOBALS['setup_info']['phpgwapi']['currentver']; return $GLOBALS['setup_info']['phpgwapi']['currentver'];
} }
$test[] = '0.9.14.502'; $test[] = '0.9.14.502';
function phpgwapi_upgrade0_9_14_502() function phpgwapi_upgrade0_9_14_502()
{ {
@ -698,7 +697,6 @@
return $GLOBALS['setup_info']['phpgwapi']['currentver']; return $GLOBALS['setup_info']['phpgwapi']['currentver'];
} }
$test[] = '0.9.14.505'; $test[] = '0.9.14.505';
function phpgwapi_upgrade0_9_14_505() function phpgwapi_upgrade0_9_14_505()
{ {
@ -709,12 +707,10 @@
'default' => '0' 'default' => '0'
)); ));
$GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.14.506'; $GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.14.506';
return $GLOBALS['setup_info']['phpgwapi']['currentver']; return $GLOBALS['setup_info']['phpgwapi']['currentver'];
} }
$test[] = '0.9.14.506'; $test[] = '0.9.14.506';
function phpgwapi_upgrade0_9_14_506() function phpgwapi_upgrade0_9_14_506()
{ {
@ -723,12 +719,10 @@
'nullable' => True 'nullable' => True
)); ));
$GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.14.507'; $GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.14.507';
return $GLOBALS['setup_info']['phpgwapi']['currentver']; return $GLOBALS['setup_info']['phpgwapi']['currentver'];
} }
$test[] = '0.9.14.507'; $test[] = '0.9.14.507';
function phpgwapi_upgrade0_9_14_507() function phpgwapi_upgrade0_9_14_507()
{ {
@ -739,12 +733,10 @@
'default' => '0' 'default' => '0'
)); ));
$GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.14.508'; $GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.14.508';
return $GLOBALS['setup_info']['phpgwapi']['currentver']; return $GLOBALS['setup_info']['phpgwapi']['currentver'];
} }
$test[] = '0.9.14.508'; $test[] = '0.9.14.508';
function phpgwapi_upgrade0_9_14_508() function phpgwapi_upgrade0_9_14_508()
{ {
@ -825,7 +817,7 @@
function phpgwapi_upgrade0_9_99_002() function phpgwapi_upgrade0_9_99_002()
{ {
// needed for the chinese(simplified) translations // needed for the chinese(simplified) translations
$GLOBALS['phpgw_setup']->db->query("UPDATE phpgw_languages SET lang_name='Chinese(simplified)',available='Yes' WHERE lang_id='zh'"); $GLOBALS['phpgw_setup']->oProc->query("UPDATE phpgw_languages SET lang_name='Chinese(simplified)',available='Yes' WHERE lang_id='zh'");
$GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.99.003'; $GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.99.003';
return $GLOBALS['setup_info']['phpgwapi']['currentver']; return $GLOBALS['setup_info']['phpgwapi']['currentver'];
@ -925,7 +917,6 @@
return $GLOBALS['setup_info']['phpgwapi']['currentver']; return $GLOBALS['setup_info']['phpgwapi']['currentver'];
} }
$test[] = '0.9.99.004'; $test[] = '0.9.99.004';
function phpgwapi_upgrade0_9_99_004() function phpgwapi_upgrade0_9_99_004()
{ {
@ -937,11 +928,10 @@
return $GLOBALS['setup_info']['phpgwapi']['currentver']; return $GLOBALS['setup_info']['phpgwapi']['currentver'];
} }
$test[] = '0.9.99.005'; $test[] = '0.9.99.005';
function phpgwapi_upgrade0_9_99_005() function phpgwapi_upgrade0_9_99_005()
{ {
$GLOBALS['phpgw_setup']->db->query("UPDATE phpgw_languages SET available='Yes' WHERE lang_id='sl'"); $GLOBALS['phpgw_setup']->oProc->query("UPDATE phpgw_languages SET available='Yes' WHERE lang_id='sl'");
$GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.99.006'; $GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.99.006';
return $GLOBALS['setup_info']['phpgwapi']['currentver']; return $GLOBALS['setup_info']['phpgwapi']['currentver'];