lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #968 from FHenry/3.3

Browse Source 
3.3
This commit is contained in:
Laurent Destailleur 2013-05-22 02:56:06 -07:00
commit 1109527528
2 changed files with 45 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
htdocs/core/db/mysql.class.php
View File

@ -878,28 +878,33 @@ class DoliDBMysql
{ {
// cles recherchees dans le tableau des descriptions (fields) : type,value,attribute,null,default,extra // cles recherchees dans le tableau des descriptions (fields) : type,value,attribute,null,default,extra
// ex. : $fields['rowid'] = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment'); // ex. : $fields['rowid'] = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
$sql = "create table ".$table."("; $sql = "CREATE TABLE ".$table."(";
$i=0; $i=0;
foreach($fields as $field_name => $field_desc) foreach($fields as $field_name => $field_desc)
{ {
$sqlfields[$i] = $field_name." "; $sqlfields[$i] = $field_name." ";
$sqlfields[$i] .= $field_desc['type']; $sqlfields[$i] .= $field_desc['type'];
if( preg_match("/^[^\s]/i",$field_desc['value'])) if( preg_match("/^[^\s]/i",$field_desc['value'])) {
$sqlfields[$i] .= "(".$field_desc['value'].")"; $sqlfields[$i] .= "(".$field_desc['value'].")";
else if( preg_match("/^[^\s]/i",$field_desc['attribute'])) }
$sqlfields[$i] .= " ".$field_desc['attribute']; if( preg_match("/^[^\s]/i",$field_desc['attribute'])) {
else if( preg_match("/^[^\s]/i",$field_desc['default'])) $sqlfields[$i] .= " ".$field_desc['attribute'];
{ }
if(preg_match("/null/i",$field_desc['default'])) if( preg_match("/^[^\s]/i",$field_desc['default']))
$sqlfields[$i] .= " default ".$field_desc['default']; {
else if ((preg_match("/null/i",$field_desc['default'])) || (preg_match("/CURRENT_TIMESTAMP/i",$field_desc['default']))) {
$sqlfields[$i] .= " default '".$field_desc['default']."'"; $sqlfields[$i] .= " default ".$field_desc['default'];
}
else {
$sqlfields[$i] .= " default '".$field_desc['default']."'";
}
}
if( preg_match("/^[^\s]/i",$field_desc['null'])) {
$sqlfields[$i] .= " ".$field_desc['null'];
}
if( preg_match("/^[^\s]/i",$field_desc['extra'])) {
$sqlfields[$i] .= " ".$field_desc['extra'];
} }
else if( preg_match("/^[^\s]/i",$field_desc['null']))
$sqlfields[$i] .= " ".$field_desc['null'];
else if( preg_match("/^[^\s]/i",$field_desc['extra']))
$sqlfields[$i] .= " ".$field_desc['extra'];
$i++; $i++;
} }
if($primary_key != "") if($primary_key != "")

43
htdocs/core/db/mysqli.class.php
View File

@ -872,28 +872,33 @@ class DoliDBMysqli
{ {
// cles recherchees dans le tableau des descriptions (fields) : type,value,attribute,null,default,extra // cles recherchees dans le tableau des descriptions (fields) : type,value,attribute,null,default,extra
// ex. : $fields['rowid'] = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment'); // ex. : $fields['rowid'] = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
$sql = "create table ".$table."("; $sql = "CREATE TABLE ".$table."(";
$i=0; $i=0;
foreach($fields as $field_name => $field_desc) foreach($fields as $field_name => $field_desc)
{ {
$sqlfields[$i] = $field_name." "; $sqlfields[$i] = $field_name." ";
$sqlfields[$i] .= $field_desc['type']; $sqlfields[$i] .= $field_desc['type'];
if( preg_match("/^[^\s]/i",$field_desc['value'])) if( preg_match("/^[^\s]/i",$field_desc['value'])) {
$sqlfields[$i] .= "(".$field_desc['value'].")"; $sqlfields[$i] .= "(".$field_desc['value'].")";
else if( preg_match("/^[^\s]/i",$field_desc['attribute'])) }
$sqlfields[$i] .= " ".$field_desc['attribute']; if( preg_match("/^[^\s]/i",$field_desc['attribute'])) {
else if( preg_match("/^[^\s]/i",$field_desc['default'])) $sqlfields[$i] .= " ".$field_desc['attribute'];
{ }
if(preg_match("/null/i",$field_desc['default'])) if( preg_match("/^[^\s]/i",$field_desc['default']))
$sqlfields[$i] .= " default ".$field_desc['default']; {
else if ((preg_match("/null/i",$field_desc['default'])) || (preg_match("/CURRENT_TIMESTAMP/i",$field_desc['default']))) {
$sqlfields[$i] .= " default '".$field_desc['default']."'"; $sqlfields[$i] .= " default ".$field_desc['default'];
} }
else if( preg_match("/^[^\s]/i",$field_desc['null'])) else {
$sqlfields[$i] .= " ".$field_desc['null']; $sqlfields[$i] .= " default '".$field_desc['default']."'";
}
else if( preg_match("/^[^\s]/i",$field_desc['extra'])) }
$sqlfields[$i] .= " ".$field_desc['extra']; if( preg_match("/^[^\s]/i",$field_desc['null'])) {
$sqlfields[$i] .= " ".$field_desc['null'];
}
if( preg_match("/^[^\s]/i",$field_desc['extra'])) {
$sqlfields[$i] .= " ".$field_desc['extra'];
}
$i++; $i++;
} }
if($primary_key != "") if($primary_key != "")