Merge lp:~ochedru/mydumper/complete-insert into lp:mydumper/0.6

[ochedru]

Added option --complete-insert

Unmerged revisions

155. By ochedru <ochedru@mydeb> on 2014-12-19

Added option --complete-insert

=== modified file 'docs/mydumper_usage.rst'
--- docs/mydumper_usage.rst	2014-06-04 18:29:03 +0000
+++ docs/mydumper_usage.rst	2014-12-19 14:56:44 +0000
@@ -175,3 +175,7 @@
 .. option:: --use-savepoints
 
    Use savepoints to reduce metadata locking issues, needs SUPER privilege
+
+.. option:: --complete-insert
+
+   Use complete INSERT statements that include column names.

=== modified file 'mydumper.c'
--- mydumper.c	2014-10-27 14:49:27 +0000
+++ mydumper.c	2014-12-19 14:56:44 +0000
@@ -102,6 +102,7 @@
 guint less_locking_threads = 0;
 guint updated_since = 0;
 guint trx_consistency_only = 0;
+guint complete_insert = 0;
 
 // For daemon mode, 0 or 1
 guint dump_number= 0;
@@ -144,6 +145,7 @@
 	{ "lock-all-tables", 0, 0, G_OPTION_ARG_NONE, &lock_all_tables, "Use LOCK TABLE for all, instead of FTWRL", NULL},
 	{ "updated-since", 'U', 0, G_OPTION_ARG_INT, &updated_since, "Use Update_time to dump only tables updated in the last U days", NULL},
 	{ "trx-consistency-only", 0, 0, G_OPTION_ARG_NONE, &trx_consistency_only, "Transactional consistency only", NULL},
+	{ "complete-insert", 0, 0, G_OPTION_ARG_NONE, &complete_insert, "Use complete INSERT statements that include column names", NULL},
 	{ NULL, 0, 0, G_OPTION_ARG_NONE,   NULL, NULL, NULL }
 };
 
@@ -1952,7 +1954,18 @@
 					return num_rows;
 				}
 			}
-			g_string_printf(statement, "INSERT INTO `%s` VALUES", table);
+			if (complete_insert) {
+				g_string_printf(statement, "INSERT INTO `%s`(", table);
+				for (i = 0; i < num_fields; ++i) {
+					if (i > 0) {
+						g_string_append_c(statement, ',');
+					}
+					g_string_append_printf(statement, "`%s`", fields[i].name);
+				} 
+				g_string_append(statement, ") VALUES");
+			} else {
+				g_string_printf(statement, "INSERT INTO `%s` VALUES", table);
+			}
 			num_rows_st = 0;
 		}
 		
@@ -2031,7 +2044,18 @@
 			g_string_append(statement, statement_row->str);
 		}
 		else {
-			g_string_printf(statement, "INSERT INTO `%s` VALUES", table);
+                        if (complete_insert) {
+                                g_string_printf(statement, "INSERT INTO `%s`(", table);
+                                for (i = 0; i < num_fields; ++i) {
+                                        if (i > 0) {
+                                                g_string_append_c(statement, ',');
+                                        }
+                                        g_string_append_printf(statement, "`%s`", fields[i].name);
+                                }
+                                g_string_append(statement, ") VALUES");
+                        } else {
+                                g_string_printf(statement, "INSERT INTO `%s` VALUES", table);
+                        }
 			g_string_append(statement, statement_row->str);
 		}
 	}