[Phpgroupware-cvs] CVS: sitemgr/setup setup.inc.php,1.10,1.11 tables_current.inc.php,1.9,1.10 tables_update.inc.php,1.8,1.9

[Michael Totschnig <address@hidden>]

Update of /cvsroot/phpgroupware/sitemgr/setup
In directory subversions:/tmp/cvs-serv32375/setup

Modified Files:
        setup.inc.php tables_current.inc.php tables_update.inc.php 
Log Message:
SQL changes with respect to errors on MsSQL (reported by Sigurd Nes)


Index: setup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/setup/setup.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** setup.inc.php       17 Jan 2003 03:37:52 -0000      1.10
--- setup.inc.php       28 Jan 2003 20:00:00 -0000      1.11
***************
*** 14,18 ****
        $setup_info['sitemgr']['name']      = 'sitemgr';
        $setup_info['sitemgr']['title']     = 'SiteMgr Web Content Manager';
!       $setup_info['sitemgr']['version']   = '0.9.15.001';
        $setup_info['sitemgr']['app_order'] = 8;
        $setup_info['sitemgr']['tables']    = 
array('phpgw_sitemgr_pages','phpgw_sitemgr_pages_lang','phpgw_sitemgr_categories_lang','phpgw_sitemgr_preferences','phpgw_sitemgr_modules','phpgw_sitemgr_content','phpgw_sitemgr_content_lang','phpgw_sitemgr_active_modules','phpgw_sitemgr_properties');
--- 14,18 ----
        $setup_info['sitemgr']['name']      = 'sitemgr';
        $setup_info['sitemgr']['title']     = 'SiteMgr Web Content Manager';
!       $setup_info['sitemgr']['version']   = '0.9.15.002';
        $setup_info['sitemgr']['app_order'] = 8;
        $setup_info['sitemgr']['tables']    = 
array('phpgw_sitemgr_pages','phpgw_sitemgr_pages_lang','phpgw_sitemgr_categories_lang','phpgw_sitemgr_preferences','phpgw_sitemgr_modules','phpgw_sitemgr_content','phpgw_sitemgr_content_lang','phpgw_sitemgr_active_modules','phpgw_sitemgr_properties');

Index: tables_current.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/setup/tables_current.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** tables_current.inc.php      27 Jan 2003 19:09:16 -0000      1.9
--- tables_current.inc.php      28 Jan 2003 20:00:00 -0000      1.10
***************
*** 83,87 ****
                                'arguments' => array('type' => 'text'),
                                'sort_order' => array('type' => 'int', 
'precision' => 4),
!                               'view' => array('type' => 'int', 'precision' => 
4),
                                'actif' => array('type' => 'int', 'precision' 
=> 2)
                        ),
--- 83,87 ----
                                'arguments' => array('type' => 'text'),
                                'sort_order' => array('type' => 'int', 
'precision' => 4),
!                               'viewable' => array('type' => 'int', 
'precision' => 4),
                                'actif' => array('type' => 'int', 'precision' 
=> 2)
                        ),
***************
*** 93,97 ****
                'phpgw_sitemgr_content_lang' => array(
                        'fd' => array(
!                               'block_id' => array('type' => 'auto', 
'nullable' => false),
                                'lang' => array('type' => 'varchar', 
'precision' => 2, 'nullable' => false),
                                'arguments_lang' => array('type' => 'text'),
--- 93,97 ----
                'phpgw_sitemgr_content_lang' => array(
                        'fd' => array(
!                               'block_id' => array('type' => 'int', 
'precision' => 4, 'nullable' => false),
                                'lang' => array('type' => 'varchar', 
'precision' => 2, 'nullable' => false),
                                'arguments_lang' => array('type' => 'text'),

Index: tables_update.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/setup/tables_update.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** tables_update.inc.php       18 Jan 2003 06:02:01 -0000      1.8
--- tables_update.inc.php       28 Jan 2003 20:00:00 -0000      1.9
***************
*** 370,372 ****
--- 370,384 ----
                return $setup_info['sitemgr']['currentver'];
        }
+ 
+       $test[] = '0.9.15.001';
+       function sitemgr_upgrade0_9_15_001()
+       {
+               global $setup_info,$phpgw_setup;
+               $setup_info['sitemgr']['currentver'] = '0.9.15.002';
+ 
+               echo 'Fixing column names.';
+               $phpgw_setup->oProc->RenameColumn('phpgw_sitemgr_content', 
'view', 'viewable');
+ 
+               return $setup_info['sitemgr']['currentver'];                    
         
+       }
  ?>