phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] phpgwapi/setup tables_baseline.inc.php, 1.5.4.2, 1.5.


From: Alejandro Borges (lex) <address@hidden>
Subject: [Phpgroupware-cvs] phpgwapi/setup tables_baseline.inc.php, 1.5.4.2, 1.5.4.3 tables_update.inc.php, 1.53.2.9.2.21, 1.53.2.9.2.22
Date: Thu, 23 Oct 2003 23:31:41 +0000

Update of /cvsroot/phpgroupware/phpgwapi/setup
In directory subversions:/tmp/cvs-serv1134

Modified Files:
      Tag: Version-0_9_16-branch
        tables_baseline.inc.php tables_update.inc.php 
Log Message:
Fixes stuff....  


Index: tables_baseline.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/setup/tables_baseline.inc.php,v
retrieving revision 1.5.4.2
retrieving revision 1.5.4.3
diff -C2 -d -r1.5.4.2 -r1.5.4.3
*** tables_baseline.inc.php     5 Oct 2003 07:35:18 -0000       1.5.4.2
--- tables_baseline.inc.php     23 Oct 2003 23:31:39 -0000      1.5.4.3
***************
*** 105,109 ****
                        'uc' => array()
                ),
!               'access_log' => array(
                        'fd' => array(
                                'sessionid' => array('type' => 'varchar', 
'precision' => 30),
--- 105,109 ----
                        'uc' => array()
                ),
!               'phpgw_access_log' => array(
                        'fd' => array(
                                'sessionid' => array('type' => 'varchar', 
'precision' => 30),

Index: tables_update.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/setup/tables_update.inc.php,v
retrieving revision 1.53.2.9.2.21
retrieving revision 1.53.2.9.2.22
diff -C2 -d -r1.53.2.9.2.21 -r1.53.2.9.2.22
*** tables_update.inc.php       20 Oct 2003 14:35:18 -0000      1.53.2.9.2.21
--- tables_update.inc.php       23 Oct 2003 23:31:39 -0000      1.53.2.9.2.22
***************
*** 581,584 ****
--- 581,600 ----
        }
  
+       $test[] = '0.9.14.007';
+       function phpgwapi_upgrade0_9_14_007()
+       {
+               // 0.9.14.5xx are the development-versions of the 0.9.16 
release (based on the 0.9.14 api)
+               // as 0.9.15.xxx are already used in HEAD
+               
+               // this is the 0.9.15.003 update, needed for the new 
filemanager and vfs-classes in the api
+               
$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
+               $GLOBALS['phpgw_setup']->db->query("UPDATE languages set 
available='Yes' WHERE lang_id='pl'");
+ 
+               $GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.14.500';
+               return $GLOBALS['setup_info']['phpgwapi']['currentver'];
+       }
+ 
        $test[] = '0.9.14.500';
        function phpgwapi_upgrade0_9_14_500()
***************
*** 1166,1169 ****
--- 1182,1186 ----
                                . ')');
                  }
+ 
                $GLOBALS['phpgw_setup']->oProc->query("SELECT c.contact_id, 
ab.id, ab.owner, ab.org_name, ab.last_mod
                        FROM phpgw_contact as c INNER JOIN phpgw_addressbook as 
ab 
***************
*** 1188,1195 ****
                  while ($GLOBALS['phpgw_setup']->oProc->next_record())
                {
!                         $db1->query("INSERT INTO phpgw_contact_org_person 
(org_id,person_id, 
                        created_on,created_by) VALUES (" 
                        . $GLOBALS['phpgw_setup']->oProc->f('org_id') 
                        . ", " . $GLOBALS['phpgw_setup']->oProc->f('person_id') 
                        . ", " . 
$GLOBALS['phpgw_setup']->oProc->f('created_on') 
                        . ", " . 
$GLOBALS['phpgw_setup']->oProc->f('created_by') 
--- 1205,1213 ----
                  while ($GLOBALS['phpgw_setup']->oProc->next_record())
                {
!                         $db1->query("INSERT INTO phpgw_contact_org_person 
(org_id,person_id, preferred,
                        created_on,created_by) VALUES (" 
                        . $GLOBALS['phpgw_setup']->oProc->f('org_id') 
                        . ", " . $GLOBALS['phpgw_setup']->oProc->f('person_id') 
+                       . ", 'Y'"           
                        . ", " . 
$GLOBALS['phpgw_setup']->oProc->f('created_on') 
                        . ", " . 
$GLOBALS['phpgw_setup']->oProc->f('created_by') 
***************
*** 1692,1696 ****
  //            $GLOBALS['phpgw_setup']->oProc->DropTable('phpgw_addressbook');
  //            
$GLOBALS['phpgw_setup']->oProc->DropTable('phpgw_addressbook_extra');
!                               
                // remove temporary ab_id field in phpgw_contact, 
phpgw_contact_person, and phpgw_contact_org
                
$GLOBALS['phpgw_setup']->oProc->DropColumn('phpgw_contact',array(
--- 1710,1714 ----
  //            $GLOBALS['phpgw_setup']->oProc->DropTable('phpgw_addressbook');
  //            
$GLOBALS['phpgw_setup']->oProc->DropTable('phpgw_addressbook_extra');
!               
                // remove temporary ab_id field in phpgw_contact, 
phpgw_contact_person, and phpgw_contact_org
                
$GLOBALS['phpgw_setup']->oProc->DropColumn('phpgw_contact',array(
***************
*** 1707,1710 ****
--- 1725,1729 ----
                        'uc' => array()
                        ),'ab_id');
+ 
                
$GLOBALS['phpgw_setup']->oProc->DropColumn('phpgw_contact_person',array(
                        'fd' => array(
***************
*** 1748,1752 ****
                        'uc' => array()
                        ),'ab_id');
!               
                // Paste this below!!!
                $GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.14.509';
--- 1767,1771 ----
                        'uc' => array()
                        ),'ab_id');
! 
                // Paste this below!!!
                $GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.14.509';
***************
*** 1778,1804 ****
                $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO 
phpgw_languages(lang_id, lang_name, available) VALUES('ug', 'Uigur', 'No')");
  
-               // Set up the new logging tables        
-               $GLOBALS['phpgw_setup']->oProc->DropTable('phpgw_log_msg');
-               // just drop and re-create.  We don't need to save it and the 
structure has changed alot
-               $GLOBALS['phpgw_setup']->oProc->DropTable('phpgw_log');
-               $GLOBALS['phpgw_setup']->oProc->CreateTable('phpgw_log',array(
-                       'fd' => array(
-                               'log_id' => array('type' => 'auto','precision' 
=> '4','nullable' => False),
-                               'log_date' => array('type' => 
'timestamp','nullable' => False),
-                               'log_account_id' => array('type' => 
'int','precision' => '4','nullable' => False),
-                               'log_account_lid' => array('type' => 
'varchar','precision' => '25','nullable' => False),
-                               'log_app' => array('type' => 
'varchar','precision' => '25','nullable' => False),
-                               'log_severity' => array('type' => 
'char','precision' => '1','nullable' => False),
-                               'log_file' => array('type' => 
'varchar','precision' => '255','nullable' => False, 'default' => ''),
-                               'log_line' => array('type' => 'int','precision' 
=> '4','nullable' => False, 'default' => '0'),
-                               'log_msg' => array('type' => 'text','nullable' 
=> False)
-                       ),
-                       'pk' => array('log_id'),
-                       'fk' => array(),
-                       'ix' => array(),
-                       'uc' => array()
-               ));
-               $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_config 
(config_app, config_name, config_value) VALUES ('phpgwapi','log_levels', '" . 
serialize(array( 'global_level' => 'E', 'module' => array(), 'user' => 
array())) ."')");
-               
                $GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.14.510';
                return $GLOBALS['setup_info']['phpgwapi']['currentver'];
--- 1797,1800 ----
***************
*** 1831,1836 ****
                        'uc' => array()
                ));
!               $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_config 
(config_app, config_name, config_value) VALUES ('phpgwapi','log_levels', '" . 
serialize(array( 'global_level' => 'E', 'module' => array(), 'user' => 
array())) ."')");
!               
                $GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.14.511';
                return $GLOBALS['setup_info']['phpgwapi']['currentver'];
--- 1827,1846 ----
                        'uc' => array()
                ));
! 
!               $GLOBALS['phpgw_setup']->oProc->query("SELECT * FROM 
phpgw_config WHERE config_name = 'log_levels'");
!               if (!$GLOBALS['phpgw_setup']->oProc->next_record())
!               {
!                       $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO 
phpgw_config (config_app, config_name, config_value) 
!                                                       VALUES 
('phpgwapi','log_levels', '" 
!                                                       . serialize(array( 
'global_level' => 'E', 'module' => array(), 'user' => array())) ."')");
!               }
!               else
!               {
!                       $GLOBALS['phpgw_setup']->oProc->query("UPDATE 
phpgw_config SET config_app='phpgwapi', "
!                                                             
."config_name='log_levels', "
!                                                             
."config_value='". serialize(array('global_level' => 'E', 
!                                                                               
                'module' => array(), 
!                                                                               
                'user' => array())) ."'");
!               }               
                $GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.14.511';
                return $GLOBALS['setup_info']['phpgwapi']['currentver'];





reply via email to

[Prev in Thread] Current Thread [Next in Thread]