From 8878baf7b1e49e7ddd00ac9e5264650a3d87872e Mon Sep 17 00:00:00 2001
From: Sebastian Mendel <cybot_tm@users.sourceforge.net>
Date: Mon, 19 Mar 2007 15:41:35 +0000
Subject: [PATCH] #1643758 Error #1264 importing NULL values in MySQL 5.0

---
 ChangeLog                |  1 +
 libraries/import/csv.php | 33 +++++++++++++++++++++++++++------
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ee50b5b33..1a70e06d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,7 @@ $HeadURL$
 - bug #1682044 Export file even if file not selected
 - bug #1672789 Undefined offset: 4 in sqlparser.lib.php #1674
 - bug #1662976 Authentication fails when controluser/pass is set
+- bug #1643758 Error #1264 importing NULL values in MySQL 5.0
 - [gui] avoid displaying a wide selector in server selection
 + [core] added PMA_fatalError() and made use of it
 . [i18n] use generic $strOptions
diff --git a/libraries/import/csv.php b/libraries/import/csv.php
index 1414830d7..2f9b368f6 100644
--- a/libraries/import/csv.php
+++ b/libraries/import/csv.php
@@ -1,9 +1,15 @@
 <?php
-/* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
-
-/* CSV import plugin for phpMyAdmin */
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * CSV import plugin for phpMyAdmin
+ *
+ * @todo    add an option for handling NULL values
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 if ($plugin_param == 'table') {
     if (isset($plugin_list)) {
         $plugin_list['csv'] = array(
@@ -165,7 +171,10 @@ if ($plugin_param == 'table') {
                     }
                     $fail = FALSE;
                     $value = '';
-                    while (($need_end && $ch != $csv_enclosed) || (!$need_end && !($ch == $csv_terminated || $ch == $csv_new_line || ($csv_new_line == 'auto' && ($ch == "\r" || $ch == "\n"))))) {
+                    while (($need_end && $ch != $csv_enclosed)
+                     || (!$need_end && !($ch == $csv_terminated
+                       || $ch == $csv_new_line || ($csv_new_line == 'auto'
+                        && ($ch == "\r" || $ch == "\n"))))) {
                         if ($ch == $csv_escaped) {
                             if ($i == $len - 1) {
                                 $fail = TRUE;
@@ -184,6 +193,12 @@ if ($plugin_param == 'table') {
                         $i++;
                         $ch = $buffer[$i];
                     }
+
+                    // unquoted NULL string
+                    if (false === $need_end && $value === 'NULL') {
+                        $value = null;
+                    }
+
                     if ($fail) {
                         $i = $fallbacki;
                         $ch = $buffer[$i];
@@ -236,6 +251,7 @@ if ($plugin_param == 'table') {
                     }
                     // Do we have correct count of values?
                     if (count($values) != $required_fields) {
+
                         // Hack for excel
                         if ($values[count($values) - 1] == ';') {
                             unset($values[count($values) - 1]);
@@ -253,7 +269,12 @@ if ($plugin_param == 'table') {
                         if (!$first) {
                             $sql .= ', ';
                         }
-                        $sql .= '\'' . addslashes($val) . '\'';
+                        if ($val === null) {
+                            $sql .= 'NULL';
+                        } else {
+                            $sql .= '\'' . addslashes($val) . '\'';
+                        }
+
                         $first = FALSE;
                     }
                     $sql .= ')';