Merge lp:~linuxjedi/drizzle/elliott-bug-653300 into lp:drizzle/7.0

[Andrew Hutchings]

1. date 0000-00-00 regex bug fixed
2. date/time conversion was also sending a pointer to output
3. a '%' was sent to progress output
4. disable not null dates for conversion as data may contain 0000-00-00 which turns into null

=== modified file 'client/drizzledump_data.cc'
--- client/drizzledump_data.cc	2010-09-24 14:56:23 +0000
+++ client/drizzledump_data.cc	2010-10-01 23:32:46 +0000
@@ -242,7 +242,7 @@
     rownr++;
     if ((rownr % show_progress_size) == 0)
     {
-      std::cerr << "-- %" << rownr << _(" rows dumped for table ") << obj.table->displayName << std::endl;
+      std::cerr << "-- " << rownr << _(" rows dumped for table ") << obj.table->displayName << std::endl;
     }
 
     size_t* row_sizes= drizzle_row_field_sizes(obj.result);
@@ -279,7 +279,7 @@
       /* time/date conversion for MySQL connections */
       else if (obj.table->fields[i]->convertDateTime)
       {
-        os << obj.checkDateTime(os, row[i], i);
+        os << obj.checkDateTime(row[i], i);
       }
       else
       {

=== modified file 'client/drizzledump_data.h'
--- client/drizzledump_data.h	2010-09-24 14:56:23 +0000
+++ client/drizzledump_data.h	2010-10-01 23:32:46 +0000
@@ -162,7 +162,7 @@
     virtual ~DrizzleDumpData() { }
     friend std::ostream& operator <<(std::ostream &os, const DrizzleDumpData &obj);
 
-    virtual std::ostream& checkDateTime(std::ostream &os, const char*, uint32_t) const { return os; }
+    virtual std::string checkDateTime(const char*, uint32_t) const { return std::string(""); }
     std::string convertHex(const unsigned char* from, size_t from_size) const;
     std::string escape(const char* from, size_t from_size) const;
 };

=== modified file 'client/drizzledump_mysql.cc'
--- client/drizzledump_mysql.cc	2010-09-24 13:38:21 +0000
+++ client/drizzledump_mysql.cc	2010-10-01 23:32:46 +0000
@@ -169,6 +169,7 @@
     field->convertDateTime= false;
     /* Also sets collation */
     field->setType(row[1], row[8]);
+    field->isNull= (strcmp(row[3], "YES") == 0) ? true : false;
     if (row[2])
     {
       if (field->convertDateTime)
@@ -181,7 +182,6 @@
     else
      field->defaultValue= "";
 
-    field->isNull= (strcmp(row[3], "YES") == 0) ? true : false;
     field->isAutoIncrement= (strcmp(row[8], "auto_increment") == 0) ? true : false;
     field->defaultIsNull= field->isNull;
     field->length= (row[4]) ? boost::lexical_cast<uint32_t>(row[4]) : 0;
@@ -216,9 +216,9 @@
     return;
   }
 
-  boost::regex date_regex("([0-9]{3}[1-9]-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01]))");
+  boost::regex date_regex("(0000|-00)");
 
-  if (regex_search(oldDefault, date_regex, flags))
+  if (not regex_search(oldDefault, date_regex, flags))
   {
     defaultValue= oldDefault;
   }
@@ -227,6 +227,7 @@
     defaultIsNull= true;
     defaultValue="";
   }
+  isNull= true;
 }
 
 
@@ -464,9 +465,9 @@
 {
   boost::match_flag_type flags = boost::match_default;
   std::string output;
-  boost::regex date_regex("([0-9]{3}[1-9]-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01]))");
+  boost::regex date_regex("(0000|-00)");
 
-  if (regex_search(oldDate, date_regex, flags))
+  if (not regex_search(oldDate, date_regex, flags))
   {
     output.push_back('\'');
     output.append(oldDate);
@@ -478,15 +479,17 @@
   return output;
 }
 
-std::ostream& DrizzleDumpDataMySQL::checkDateTime(std::ostream &os, const char* item, uint32_t field) const
+std::string DrizzleDumpDataMySQL::checkDateTime(const char* item, uint32_t field) const
 {
+  std::string ret;
+
   if (table->fields[field]->convertDateTime)
   {
     if (table->fields[field]->type.compare("INT") == 0)
-      os << convertTime(item);
+      ret= boost::lexical_cast<std::string>(convertTime(item));
     else
-      os << convertDate(item);
+      ret= convertDate(item);
   }
-  return os;
+  return ret;
 }
 

=== modified file 'client/drizzledump_mysql.h'
--- client/drizzledump_mysql.h	2010-09-23 20:32:31 +0000
+++ client/drizzledump_mysql.h	2010-10-01 23:32:46 +0000
@@ -100,7 +100,7 @@
     std::string convertDate(const char* oldDate) const;
     /* For xx:xx:xx -> INT conversion */
     long convertTime(const char* oldTime) const;
-    std::ostream& checkDateTime(std::ostream &os, const char* item, uint32_t field) const;
+    std::string checkDateTime(const char* item, uint32_t field) const;
 };
 
 #endif /* CLIENT_DRIZZLEDUMP_MYSQL_H */