[Phpgroupware-cvs] sync/setup/tables_current.inc.php, 1.13

[nomail]

Update of /sync/setup
Modified Files:
        Branch: 
          tables_current.inc.php

date: 2004/05/01 13:58:37;  author: mkaemmerer;  state: Exp;  lines: +4 -4

Log Message:
- added conflict field to syncchannels
=====================================================================
Index: sync/setup/tables_current.inc.php
diff -u sync/setup/tables_current.inc.php:1.12 
sync/setup/tables_current.inc.php:1.13
--- sync/setup/tables_current.inc.php:1.12      Mon Mar 15 21:03:39 2004
+++ sync/setup/tables_current.inc.php   Sat May  1 13:58:37 2004
@@ -49,8 +49,7 @@
                          'guid' => array('type' => 'varchar','precision' => 
'150','nullable' => False, 'default' => ''),
                          'ldata' => array('type' => 'text','nullable' => 
False, 'default' => ''),
                          'gdata' => array('type' => 'text','nullable' => 
False, 'default' => ''),
-                         'timestamp' => array('type' => 'timestamp','nullable' 
=> False, 'default' => ''),
-                           
+                         'timestamp' => array('type' => 'timestamp','nullable' 
=> False, 'default' => '')    
                        ),
                        'pk' => array('conflictid'),
                        'fk' => array(''),
@@ -76,7 +75,8 @@
         'sourceid' => array('type' => 'int','precision' => '4','nullable' => 
False,'default' => '-1'),
         'lastanchor' => array('type' => 'varchar','precision' => '16'),
                          'startsync' => array('type' => 'int','precision' => 
'4'),  
-                               'stopsync' => array('type' => 'int','precision' 
=> '4'),  
+                               'stopsync' => array('type' => 'int','precision' 
=> '4'),
+        'conflict' => array('type' => 'int','precision' => '4', 'default' => 
'3')  
                        ),
                        'pk' => array('channelid'),
                        'fk' => array('phpgw_syncsources(sourceid)'), //!!