Changeset 6216 for extensions

Timestamp:

May 17, 2010, 10:58:24 PM (15 years ago)

Author:

patdenice

Message:

mysqldump class now take into account null fields

Location:

extensions/autoupdate

Files:

• branches/1.7/include/mysqldump.php (modified) (3 diffs)
• trunk/include/mysqldump.php (modified) (3 diffs)

extensions/autoupdate/branches/1.7/include/mysqldump.php

@@ -145 +145 @@
                 while ( $record = mysql_fetch_assoc($records) ) {
                         $structure .= '`'.$record['Field'].'` '.$record['Type'];
-                        if ( !empty($record['Default']) )
+                        if ( isset($record['Default']) )
                                 $structure .= ' DEFAULT \''.$record['Default'].'\'';
                         if ( @strcmp($record['Null'],'YES') != 0 )
                                 $structure .= ' NOT NULL';
+                        elseif ( is_null($record['Default']) )
+                                $structure .= ' DEFAULT NULL';
                         if ( !empty($record['Extra']) )
                                 $structure .= ' '.$record['Extra'];
@@ -206 +208 @@
                         $selectStatement .= ", ";
                 }
-                $insertStatement = @substr($insertStatement,0,-2).') VALUES';
+                $insertStatement = @substr($insertStatement,0,-2).') VALUES'."\n";
                 $selectStatement = @substr($selectStatement,0,-2).' FROM `'.$table.'`';
 
@@ -222 +224 @@
                                         if ( @$hexField[$j] && (@strlen($record[$field_name]) > 0) )
                                                 $data .= "0x".$record[$field_name];
+                                        elseif (is_null($record[$field_name]))
+                                                $data .= "NULL";
                                         else
                                                 $data .= "'".@str_replace('\"','"',@mysql_escape_string($record[$field_name]))."'";

extensions/autoupdate/trunk/include/mysqldump.php

@@ -145 +145 @@
                 while ( $record = mysql_fetch_assoc($records) ) {
                         $structure .= '`'.$record['Field'].'` '.$record['Type'];
-                        if ( !empty($record['Default']) )
+                        if ( isset($record['Default']) )
                                 $structure .= ' DEFAULT \''.$record['Default'].'\'';
                         if ( @strcmp($record['Null'],'YES') != 0 )
                                 $structure .= ' NOT NULL';
+                        elseif ( is_null($record['Default']) )
+                                $structure .= ' DEFAULT NULL';
                         if ( !empty($record['Extra']) )
                                 $structure .= ' '.$record['Extra'];
@@ -206 +208 @@
                         $selectStatement .= ", ";
                 }
-                $insertStatement = @substr($insertStatement,0,-2).') VALUES';
+                $insertStatement = @substr($insertStatement,0,-2).') VALUES'."\n";
                 $selectStatement = @substr($selectStatement,0,-2).' FROM `'.$table.'`';
 
@@ -222 +224 @@
                                         if ( @$hexField[$j] && (@strlen($record[$field_name]) > 0) )
                                                 $data .= "0x".$record[$field_name];
+                                        elseif (is_null($record[$field_name]))
+                                                $data .= "NULL";
                                         else
-                                                $data .= "'".@str_replace('\"','"',@mysql_escape_string($record[$field_name]))."'";
+                                                $data .= "'".@str_replace('\"','"',@mysql_real_escape_string($record[$field_name]))."'";
                                         $data .= ',';
                                 }