Merge pull request #7 from robertgarrigos/patch_6

Fixes #6: mysql 8.x compatibility
backdrop-contrib · Aug 15, 2023 · afe235c · afe235c
2 parents 2fa1480 + ab793b3
commit afe235c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/database_mysql_dump.inc b/database_mysql_dump.inc
@@ -205,7 +205,7 @@ function _demo_dump_table_schema($fp, $table) {
 function _demo_dump_table_data($fp, $table) {
   $output = "\n";
   $output .= "--\n";
-  $output .= "-- Dumping data for table '$table'\n";
+  $output .= "-- Dumping data for table `'$table'`\n";
   $output .= "--\n\n";
 
   // Dump table data.
@@ -214,7 +214,7 @@ function _demo_dump_table_data($fp, $table) {
   // Get table fields.
   if ($fields = _demo_get_fields($result)) {
     // Disable indices to speed up import.
-    $output .= "/*!40000 ALTER TABLE $table DISABLE KEYS */;\n";
+    $output .= "/*!40000 ALTER TABLE `$table` DISABLE KEYS */;\n";
 
     // Escape backslashes, PHP code, special chars
     $search = array('\\', "'", "\x00", "\x0a", "\x0d", "\x1a");
@@ -287,7 +287,7 @@ function _demo_dump_table_data($fp, $table) {
     }
 
     // Enable indices again.
-    $output .= "/*!40000 ALTER TABLE $table ENABLE KEYS */;\n";
+    $output .= "/*!40000 ALTER TABLE `$table` ENABLE KEYS */;\n";
   }
 
   fwrite($fp, $output);
@@ -338,4 +338,3 @@ function _demo_table_is_view($table) {
   }
   return $tables[$table];
 }
-
diff --git a/demo.admin.inc b/demo.admin.inc
@@ -332,7 +332,7 @@ function _demo_reset($filename, $verbose = TRUE) {
   foreach (demo_enum_tables() as $table => $dump_options) {
     // Skip watchdog, except for legacy dumps that included the watchdog table
     if ($table != $watchdog || $is_version_1_0_dump) {
-      db_query("DROP TABLE $table");
+      db_query("DROP TABLE IF EXISTS `$table`");
     }
   }
 
@@ -754,4 +754,3 @@ function demo_download($filename, $type) {
   );
   file_transfer($fileconfig[$type . 'file'], $headers);
 }
-