Fixing backups issue with table names

jguille2 · Mar 14, 2021 · 56b6d4a · 56b6d4a
1 parent 9a6024d
commit 56b6d4a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/snapPlugin/backup/moodle2/backup_assignsubmission_#snapPluginName#_subplugin.class.php b/snapPlugin/backup/moodle2/backup_assignsubmission_#snapPluginName#_subplugin.class.php
@@ -50,7 +50,7 @@ protected function define_submission_subplugin_structure() {
         $subpluginwrapper->add_child($subpluginelement);
 
         // Set source to populate the data.
-        $subpluginelement->set_source_table('assignsubmission_#snapPluginName#',
+        $subpluginelement->set_source_table('assignsubmission_#snapPluginTable#',
                                           ['submission' => backup::VAR_PARENTID]);
 
         $subpluginelement->annotate_files('assignsubmission_#snapPluginName#', 'submission_#snapPluginName#', 'submission');

diff --git a/snapPlugin/backup/moodle2/restore_assignsubmission_#snapPluginName#_subplugin.class.php b/snapPlugin/backup/moodle2/restore_assignsubmission_#snapPluginName#_subplugin.class.php
@@ -67,7 +67,7 @@ public function process_assignsubmission_#snapPluginName#_submission($data) {
         // when a submission node is processed.
         $data->submission = $this->get_mappingid('submission', $data->submission);
 
-        $DB->insert_record('assignsubmission_#snapPluginName#', $data);
+        $DB->insert_record('assignsubmission_#snapPluginTable#', $data);
 
         $this->add_related_files('assignsubmission_#snapPluginName#', 'submission_#snapPluginName#', 'submission', null, $oldsubmissionid);
     }

diff --git a/snapPlugin/classes/event/submission_created.php b/snapPlugin/classes/event/submission_created.php
@@ -38,7 +38,7 @@ class submission_created extends \mod_assign\event\submission_created {
      */
     protected function init() {
         parent::init();
-        $this->data['objecttable'] = 'assignsubmission_#snapPluginName#';
+        $this->data['objecttable'] = 'assignsubmission_#snapPluginTable#';
     }
 
     /**
@@ -66,6 +66,6 @@ public function get_description() {
      */
     public static function get_objectid_mapping() {
         // No mapping available for 'assignsubmission_#snapPluginName#'.
-        return array('db' => 'assignsubmission_#snapPluginName#', 'restore' => \core\event\base::NOT_MAPPED);
+        return array('db' => 'assignsubmission_#snapPluginTable#', 'restore' => \core\event\base::NOT_MAPPED);
     }
 }
diff --git a/snapPlugin/classes/event/submission_updated.php b/snapPlugin/classes/event/submission_updated.php
@@ -40,7 +40,7 @@ class submission_updated extends \mod_assign\event\submission_updated {
      */
     protected function init() {
         parent::init();
-        $this->data['objecttable'] = 'assignsubmission_#snapPluginName#';
+        $this->data['objecttable'] = 'assignsubmission_#snapPluginTable#';
     }
 
     /**
@@ -68,6 +68,6 @@ public function get_description() {
      */
     public static function get_objectid_mapping() {
         // No mapping available for 'assignsubmission_#snapPluginName#'.
-        return array('db' => 'assignsubmission_#snapPluginName#', 'restore' => \core\event\base::NOT_MAPPED);
+        return array('db' => 'assignsubmission_#snapPluginTable#', 'restore' => \core\event\base::NOT_MAPPED);
     }
 }
diff --git a/snapPlugin/classes/privacy/provider.php b/snapPlugin/classes/privacy/provider.php
@@ -57,7 +57,7 @@ public static function get_metadata(collection $collection) : collection {
                     'submission' => 'privacy:metadata:submissionpurpose',
                     '#snapPluginName#_xmlproject' => 'privacy:metadata:textpurpose'
                   ];
-        $collection->add_database_table('assignsubmission_#snapPluginName#', $detail, 'privacy:metadata:tablepurpose');
+        $collection->add_database_table('assignsubmission_#snapPluginTable#', $detail, 'privacy:metadata:tablepurpose');
         return $collection;
     }
 
@@ -140,7 +140,7 @@ public static function delete_submission_for_context(assign_plugin_request_data
         \core_plagiarism\privacy\provider::delete_plagiarism_for_context($requestdata->get_context());
 
         // Delete the records in the table.
-        $DB->delete_records('assignsubmission_#snapPluginName#', ['assignment' => $requestdata->get_assignid()]);
+        $DB->delete_records('assignsubmission_#snapPluginTable#', ['assignment' => $requestdata->get_assignid()]);
     }
 
     /**
@@ -156,7 +156,7 @@ public static function delete_submission_for_userid(assign_plugin_request_data $
         $submissionid = $deletedata->get_pluginobject()->id;
 
         // Delete the records in the table.
-        $DB->delete_records('assignsubmission_#snapPluginName#', ['assignment' => $deletedata->get_assignid(),
+        $DB->delete_records('assignsubmission_#snapPluginTable#', ['assignment' => $deletedata->get_assignid(),
                 'submission' => $submissionid]);
     }
 
@@ -178,6 +178,6 @@ public static function delete_submissions(assign_plugin_request_data $deletedata
         }
 
         $params['assignid'] = $deletedata->get_assignid();
-        $DB->delete_records_select('assignsubmission_#snapPluginName#', "assignment = :assignid AND submission $sql", $params);
+        $DB->delete_records_select('assignsubmission_#snapPluginTable#', "assignment = :assignid AND submission $sql", $params);
     }
 }