Fix: extrafield repair was using bad hardcoded values.

Dolibarr · May 23, 2012 · 1aa4429 · 1aa4429
1 parent 81be50b
commit 1aa4429
Showing 1 changed file with 20 additions and 9 deletions.
diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php
@@ -211,12 +211,21 @@
         $i=0;
         while($obj=$db->fetch_object($resql))
         {
-            $fieldname = isset($obj->Key)?$obj->Key:$obj->attname;
+            $fieldname=$fieldtype='';
-            $fieldtype = isset($obj->Type)?$obj->Type:'varchar';
+            if (preg_match('/mysql/',$db->type))
+            {
+                $fieldname=$obj->Field;
+                $fieldtype=$obj->Type;
+            }
+            else
+            {
+                $fieldname = isset($obj->Key)?$obj->Key:$obj->attname;
+                $fieldtype = isset($obj->Type)?$obj->Type:'varchar';
+            }
 
             if (empty($fieldname)) continue;
             if (in_array($fieldname,array('rowid','tms','fk_object','import_key'))) continue;
-            $arrayoffieldsfound[$fieldname]=$fieldtype;
+            $arrayoffieldsfound[$fieldname]=array('type'=>$fieldtype);
         }
 
         // If it does not match, we create fields
@@ -225,14 +234,16 @@
             if (! in_array($code,array_keys($arrayoffieldsfound)))
             {
                 print 'Found field '.$code.' declared into '.MAIN_DB_PREFIX.'extrafields table but not found into desc of table '.$tableextra." -> ";
+                $type=$extrafields->attribute_type[$code]; $value=$extrafields->attribute_size[$code]; $attribute=''; $default=''; $extra=''; $null='null';
                 $field_desc=array(
-                	'type'=>'varchar',
+                	'type'=>$type,
-                	'value'=>'',
+                	'value'=>$value,
-                	'attribute'=>'',
+                	'attribute'=>$attribute,
-                	'default'=>'',
+                	'default'=>$default,
-                	'extra'=>'',
+                	'extra'=>$extra,
-                	'null'=>'null'
+                	'null'=>$null
                 );
+                //var_dump($field_desc);exit;
 
                 $result=$db->DDLAddField($tableextra,$code,$field_desc,"");
                 if ($result < 0)