Merge lp:~linuxjedi/drizzle/trunk-drizzledump-bugs-part2 into lp:drizzle/7.0

[Andrew Hutchings]

General Drizzledump fixes:
* column comments were missing from dump files
* --databases option was broken

Migration fixes:
* FLOAT UNSIGNED without any precision and scale failed to migrate
* FLOAT with only precision and no scale lost the precision during migrate

[Lee Bieber (kalebral-deactivatedaccount)]

Getting merge conflicts, please re-merge with trunk

Text conflict in client/drizzledump_mysql.cc

review: Needs Fixing

[lp:~linuxjedi/drizzle/trunk-drizzledump-bugs-part2]

1982. By Andrew Hutchings on 2010-12-08

Merge trunk into branch

[Andrew Hutchings (linuxjedi)]

Fixed

=== modified file 'client/drizzledump.cc'
--- client/drizzledump.cc	2010-12-02 00:10:36 +0000
+++ client/drizzledump.cc	2010-12-08 07:39:23 +0000
@@ -801,10 +801,8 @@
     dump_selected_tables(database_used, vm["Table-used"].as< vector<string> >());
   }
 
-  if (vm.count("Table-used") && opt_databases)
+  if (vm.count("Table-used") and opt_databases)
   {
-/*
- * This is not valid!
     vector<string> database_used= vm["database-used"].as< vector<string> >();
     vector<string> table_used= vm["Table-used"].as< vector<string> >();
 
@@ -814,16 +812,17 @@
     {
       database_used.insert(database_used.end(), *it);
     }
+
     dump_databases(database_used);
-    dump_tables();
-*/
+    dump_all_tables();
   }
-  
+
   if (vm.count("database-used") && ! vm.count("Table-used"))
   {
     dump_databases(vm["database-used"].as< vector<string> >());
     dump_all_tables();
   }
+
   if (opt_destination == DESTINATION_STDOUT)
     generate_dump();
   else

=== modified file 'client/drizzledump_data.cc'
--- client/drizzledump_data.cc	2010-12-06 09:41:28 +0000
+++ client/drizzledump_data.cc	2010-12-08 07:39:23 +0000
@@ -186,6 +186,11 @@
     os << " DEFAULT NULL";
   }
 
+  if (not obj.comment.empty())
+  {
+    os << " COMMENT '" << DrizzleDumpData::escape(obj.comment.c_str(), obj.comment.length()) << "'";
+  }
+
   return os;
 }
 

=== modified file 'client/drizzledump_data.h'
--- client/drizzledump_data.h	2010-12-06 22:58:27 +0000
+++ client/drizzledump_data.h	2010-12-08 07:39:23 +0000
@@ -113,6 +113,7 @@
     bool rangeCheck;
     std::string defaultValue;
     std::string collation;
+    std::string comment;
 
     /* For enum type */
     std::string enumValues;

=== modified file 'client/drizzledump_drizzle.cc'
--- client/drizzledump_drizzle.cc	2010-12-02 00:10:36 +0000
+++ client/drizzledump_drizzle.cc	2010-12-08 07:39:23 +0000
@@ -171,7 +171,7 @@
   if (verbose)
     std::cerr << _("-- Retrieving fields for ") << tableName << "..." << std::endl;
 
-  query= "SELECT COLUMN_NAME, DATA_TYPE, COLUMN_DEFAULT, COLUMN_DEFAULT_IS_NULL, IS_NULLABLE, CHARACTER_MAXIMUM_LENGTH, NUMERIC_PRECISION, NUMERIC_SCALE, COLLATION_NAME, IS_AUTO_INCREMENT, ENUM_VALUES FROM DATA_DICTIONARY.COLUMNS WHERE TABLE_SCHEMA='";
+  query= "SELECT COLUMN_NAME, DATA_TYPE, COLUMN_DEFAULT, COLUMN_DEFAULT_IS_NULL, IS_NULLABLE, CHARACTER_MAXIMUM_LENGTH, NUMERIC_PRECISION, NUMERIC_SCALE, COLLATION_NAME, IS_AUTO_INCREMENT, ENUM_VALUES, COLUMN_COMMENT FROM DATA_DICTIONARY.COLUMNS WHERE TABLE_SCHEMA='";
   query.append(database->databaseName);
   query.append("' AND TABLE_NAME='");
   query.append(tableName);
@@ -202,7 +202,7 @@
     field->length= (row[5]) ? boost::lexical_cast<uint32_t>(row[5]) : 0;
     field->decimalPrecision= (row[6]) ? boost::lexical_cast<uint32_t>(row[6]) : 0;
     field->decimalScale= (row[7]) ? boost::lexical_cast<uint32_t>(row[7]) : 0;
-
+    field->comment= (row[11]) ? row[11] : "";
 
     fields.push_back(field);
   }

=== modified file 'client/drizzledump_mysql.cc'
--- client/drizzledump_mysql.cc	2010-12-06 09:41:28 +0000
+++ client/drizzledump_mysql.cc	2010-12-08 07:39:23 +0000
@@ -167,7 +167,7 @@
   if (verbose)
     std::cerr << _("-- Retrieving fields for ") << tableName << "..." << std::endl;
 
-  query="SELECT COLUMN_NAME, COLUMN_TYPE, COLUMN_DEFAULT, IS_NULLABLE, CHARACTER_MAXIMUM_LENGTH, NUMERIC_PRECISION, NUMERIC_SCALE, COLLATION_NAME, EXTRA FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA='";
+  query="SELECT COLUMN_NAME, COLUMN_TYPE, COLUMN_DEFAULT, IS_NULLABLE, CHARACTER_MAXIMUM_LENGTH, NUMERIC_PRECISION, NUMERIC_SCALE, COLLATION_NAME, EXTRA, COLUMN_COMMENT FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA='";
   query.append(database->databaseName);
   query.append("' AND TABLE_NAME='");
   query.append(tableName);
@@ -205,6 +205,7 @@
 
     field->isAutoIncrement= (strcmp(row[8], "auto_increment") == 0) ? true : false;
     field->defaultIsNull= field->isNull;
+
     /* Seriously MySQL, why is BIT length in NUMERIC_PRECISION? */
     if ((strncmp(row[1], "bit", 3) == 0) and (row[5] != NULL))
       field->length= ((boost::lexical_cast<uint32_t>(row[5]) - 1) / 8) + 1;
@@ -219,17 +220,9 @@
       field->length= 1;
     }
 
-    if ((row[5] != NULL) and (row[6] != NULL))
-    {
-      field->decimalPrecision= boost::lexical_cast<uint32_t>(row[5]);
-      field->decimalScale= boost::lexical_cast<uint32_t>(row[6]);
-    }
-    else
-    {
-      field->decimalPrecision= 0;
-      field->decimalScale= 0;
-    }
-
+    field->decimalPrecision= (row[5]) ? boost::lexical_cast<uint32_t>(row[5]) : 0;
+    field->decimalScale= (row[6]) ? boost::lexical_cast<uint32_t>(row[6]) : 0;
+    field->comment= (row[9]) ? row[9] : "";
     fields.push_back(field);
   }
 
@@ -382,7 +375,8 @@
   std::string extra;
   size_t pos;
   
-  if ((pos= old_type.find("(")) != std::string::npos)
+  if (((pos= old_type.find("(")) != std::string::npos) or
+    ((pos= old_type.find(" ")) != std::string::npos))
   {
     extra= old_type.substr(pos);
     old_type.erase(pos, std::string::npos);