[Fmsystem-commits] [6686] small fix related to merge

[Petur Bjorn Thorsteinsson]

Revision: 6686
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6686
Author:   peturbjorn
Date:     2010-12-20 15:10:20 +0000 (Mon, 20 Dec 2010)
Log Message:
-----------
small fix related to merge

Modified Paths:
--------------
    branches/dev-bim2/property/setup/tables_update.inc.php

Modified: branches/dev-bim2/property/setup/tables_update.inc.php
===================================================================
--- branches/dev-bim2/property/setup/tables_update.inc.php      2010-12-20 
14:44:13 UTC (rev 6685)
+++ branches/dev-bim2/property/setup/tables_update.inc.php      2010-12-20 
15:10:20 UTC (rev 6686)
@@ -4774,12 +4774,12 @@
                                (
                                        'id' => array('type' => 'auto', 
'precision' => 4, 'nullable' => false),
                                        'name' => array('type' => 'varchar', 
'precision' => 50, 'nullable' => false),
-                                       'description' => array('type' => 
'text', 'nullable' => false)
+                                       'description' => array('type' => 
'text', 'nullable' => true)
                                ),
                                'pk' => array('id'),
                                'fk' => array(),
                                'ix' => array(),
-                               'uc' => array()
+                               'uc' => array('name')
                        ),
 
                        'fm_attr_group' => array
@@ -4801,7 +4801,7 @@
                                        'id' => array('type' => 'auto', 
'precision' => 4, 'nullable' => false),
                                        'name' => array('type' => 'varchar', 
'precision' => 10, 'nullable' => false),
                                        'display_name' => array('type' => 
'varchar', 'precision' => 20, 'nullable' => false),
-                                       'description' => array('type' => 
'text', 'nullable' => false),
+                                       'description' => array('type' => 
'text', 'nullable' => true),
                                        'data_type_id' => array('type' => 
'int', 'precision' => 4, 'nullable' => false),
                                        'unit_id' => array('type' => 'varchar', 
'precision' => 20, 'nullable' => false),
                                        'attr_group_id' => array('type' => 
'int', 'precision' => 4, 'nullable' => false)