Merge lp:~dshrews/drizzle/bug643630 into lp:~drizzle-trunk/drizzle/development

[David Shrewsbury]

Properly escape embedded quotes in column values when transforming GPB messages into SQL. Adds a test case for this too.

=== modified file 'drizzled/message/statement_transform.cc'
--- drizzled/message/statement_transform.cc	2010-09-20 17:39:56 +0000
+++ drizzled/message/statement_transform.cc	2010-09-22 21:59:41 +0000
@@ -51,6 +51,20 @@
 namespace message
 {
 
+static void escapeEmbeddedQuotes(string &s, const char quote='\'')
+{
+  string::iterator it;
+
+  for (it= s.begin(); it != s.end(); ++it)
+  {
+    if (*it == quote)
+    {
+      it= s.insert(it, quote);
+      ++it;  // advance back to the quote
+    }
+  }
+}
+
 /* Incredibly similar to append_unescaped() in table.cc, but for std::string */
 static void append_escaped_string(std::string *res, const std::string &input, const char quote='\'')
 {
@@ -408,7 +422,9 @@
       }
       else
       {
-        destination.append(record.insert_value(x));
+        string tmp(record.insert_value(x));
+        escapeEmbeddedQuotes(tmp);
+        destination.append(tmp);
       }
     }
 
@@ -472,7 +488,9 @@
       }
       else
       {
-        destination.append(data.record(x).insert_value(y));
+        string tmp(data.record(x).insert_value(y));
+        escapeEmbeddedQuotes(tmp);
+        destination.append(tmp);
       }
 
       if (should_quote_field_value)
@@ -567,7 +585,9 @@
       }
       else 
       {
-        destination.append(record.after_value(x));
+        string tmp(record.after_value(x));
+        escapeEmbeddedQuotes(tmp);
+        destination.append(tmp);
       }
     }
 
@@ -690,7 +710,9 @@
     }
     else
     {
-      destination.append(record.key_value(x));
+      string tmp(record.key_value(x));
+      escapeEmbeddedQuotes(tmp);
+      destination.append(tmp);
     }
 
     if (should_quote_field_value)
@@ -759,7 +781,9 @@
       }
       else
       {
-        destination.append(data.record(x).key_value(y));
+        string tmp(data.record(x).key_value(y));
+        escapeEmbeddedQuotes(tmp);
+        destination.append(tmp);
       }
 
       if (should_quote_field_value)

=== added file 'plugin/transaction_log/tests/r/embedded_quotes.result'
--- plugin/transaction_log/tests/r/embedded_quotes.result	1970-01-01 00:00:00 +0000
+++ plugin/transaction_log/tests/r/embedded_quotes.result	2010-09-22 21:59:41 +0000
@@ -0,0 +1,10 @@
+CREATE TABLE t (a INT NOT NULL PRIMARY KEY, b VARCHAR(10));
+INSERT INTO t VALUES (1, "don't");
+START TRANSACTION;
+CREATE TABLE `test`.`t` (   `a` INT NOT NULL,   `b` VARCHAR(10) COLLATE utf8_general_ci DEFAULT NULL,   PRIMARY KEY (`a`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
+COMMIT;
+START TRANSACTION;
+INSERT INTO `test`.`t` (`a`,`b`) VALUES (1,'don''t');
+COMMIT;
+DROP TABLE t;
+SET GLOBAL transaction_log_truncate_debug= true;

=== added file 'plugin/transaction_log/tests/t/embedded_quotes-master.opt'
--- plugin/transaction_log/tests/t/embedded_quotes-master.opt	1970-01-01 00:00:00 +0000
+++ plugin/transaction_log/tests/t/embedded_quotes-master.opt	2010-09-22 21:59:41 +0000
@@ -0,0 +1,1 @@
+--transaction-log.enable

=== added file 'plugin/transaction_log/tests/t/embedded_quotes.test'
--- plugin/transaction_log/tests/t/embedded_quotes.test	1970-01-01 00:00:00 +0000
+++ plugin/transaction_log/tests/t/embedded_quotes.test	2010-09-22 21:59:41 +0000
@@ -0,0 +1,16 @@
+#
+# Tests for properly escaping embedded quotes when reading from the transaction log
+#
+
+CREATE TABLE t (a INT NOT NULL PRIMARY KEY, b VARCHAR(10));
+
+INSERT INTO t VALUES (1, "don't");
+
+# Read in the transaction.log.
+
+--exec ../drizzled/message/transaction_reader var/master-data/transaction.log
+
+DROP TABLE t;
+
+# Truncate the log file to reset for the next test
+--source ../plugin/transaction_log/tests/t/truncate_log.inc