Fix bug on DDLCreateDb in Mysql

Dolibarr · May 21, 2013 · f08ce6d · f08ce6d
1 parent 047aa8e
commit f08ce6d
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 32 deletions.
diff --git a/htdocs/core/db/mysql.class.php b/htdocs/core/db/mysql.class.php
@@ -884,22 +884,27 @@ function DDLCreateTable($table,$fields,$primary_key,$type,$unique_keys="",$fullt
 		{
 			$sqlfields[$i] = $field_name." ";
 			$sqlfields[$i]  .= $field_desc['type'];
-			if( preg_match("/^[^\s]/i",$field_desc['value']))
-			$sqlfields[$i]  .= "(".$field_desc['value'].")";
-			else if( preg_match("/^[^\s]/i",$field_desc['attribute']))
-			$sqlfields[$i]  .= " ".$field_desc['attribute'];
-			else if( preg_match("/^[^\s]/i",$field_desc['default']))
+			if( preg_match("/^[^\s]/i",$field_desc['value'])) {
+				$sqlfields[$i]  .= "(".$field_desc['value'].")";
+			}
+			if( preg_match("/^[^\s]/i",$field_desc['attribute'])) {
+				$sqlfields[$i]  .= " ".$field_desc['attribute'];
+			}
+			if( preg_match("/^[^\s]/i",$field_desc['default']))
 			{
-				if(preg_match("/null/i",$field_desc['default']))
-				$sqlfields[$i]  .= " default ".$field_desc['default'];
-				else
-				$sqlfields[$i]  .= " default '".$field_desc['default']."'";
+				if ((preg_match("/null/i",$field_desc['default'])) || (preg_match("/CURRENT_TIMESTAMP/i",$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++;
 		}
 		if($primary_key != "")

diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
@@ -876,24 +876,29 @@ function DDLCreateTable($table,$fields,$primary_key,$type,$unique_keys="",$fullt
         $i=0;
         foreach($fields as $field_name => $field_desc)
         {
-            $sqlfields[$i] = $field_name." ";
-            $sqlfields[$i]  .= $field_desc['type'];
-            if( preg_match("/^[^\s]/i",$field_desc['value']))
-            $sqlfields[$i]  .= "(".$field_desc['value'].")";
-            else if( preg_match("/^[^\s]/i",$field_desc['attribute']))
-            $sqlfields[$i]  .= " ".$field_desc['attribute'];
-            else if( preg_match("/^[^\s]/i",$field_desc['default']))
-            {
-                if(preg_match("/null/i",$field_desc['default']))
-                $sqlfields[$i]  .= " default ".$field_desc['default'];
-                else
-                $sqlfields[$i]  .= " default '".$field_desc['default']."'";
-            }
-            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'];
+        $sqlfields[$i] = $field_name." ";
+			$sqlfields[$i]  .= $field_desc['type'];
+			if( preg_match("/^[^\s]/i",$field_desc['value'])) {
+				$sqlfields[$i]  .= "(".$field_desc['value'].")";
+			}
+			if( preg_match("/^[^\s]/i",$field_desc['attribute'])) {
+				$sqlfields[$i]  .= " ".$field_desc['attribute'];
+			}
+			if( preg_match("/^[^\s]/i",$field_desc['default']))
+			{
+				if ((preg_match("/null/i",$field_desc['default'])) || (preg_match("/CURRENT_TIMESTAMP/i",$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'];
+			}
             $i++;
         }
         if($primary_key != "")