From 09cb4092f385ea679693cbe7d9205ef577544f41 Mon Sep 17 00:00:00 2001
From: Alex Morris <alex.morris@catalyst.net.nz>
Date: Thu, 17 Aug 2023 14:55:46 +1200
Subject: [PATCH] Remove mysqlisms and hardcoded table prefixes

Resolves #29
---
 backup/moodle2/backup_coursework_stepslib.php | 34 +++++++++----------
 classes/models/outstanding_marking.php        |  6 ++--
 classes/warnings.php                          |  4 +--
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/backup/moodle2/backup_coursework_stepslib.php b/backup/moodle2/backup_coursework_stepslib.php
index 44c6126..55ddc47 100644
--- a/backup/moodle2/backup_coursework_stepslib.php
+++ b/backup/moodle2/backup_coursework_stepslib.php
@@ -5,7 +5,7 @@ class backup_coursework_activity_structure_step extends backup_activity_structur
     protected function define_structure()
     {
         global $DB;
-        
+
         foreach(array('coursework_submissions',
                       'coursework_allocation_pairs',
                       'coursework_mod_set_members',
@@ -13,13 +13,13 @@ protected function define_structure()
                       'coursework_extensions',
                       'coursework_person_deadlines') as $tablename)
         {
-            $DB->execute("update {{$tablename}} set `allocatableuser`=0, `allocatablegroup`=0");
-            $DB->execute("update {{$tablename}} set `allocatableuser`=`allocatableid` where allocatabletype='user'");
-            $DB->execute("update {{$tablename}} set `allocatablegroup`=`allocatableid` where allocatabletype='group'");
+            $DB->execute("update {{$tablename}} set allocatableuser=0, allocatablegroup=0");
+            $DB->execute("update {{$tablename}} set allocatableuser=allocatableid where allocatabletype='user'");
+            $DB->execute("update {{$tablename}} set allocatablegroup=allocatableid where allocatabletype='group'");
         }
-        
+
         $userinfo = $this->get_setting_value('userinfo');
-        
+
         $coursework=new backup_nested_element('coursework',array('id'),
                                               array('formid',
                                                     'course',
@@ -316,7 +316,7 @@ protected function define_structure()
             $coursework->add_child($allocation_configs);
             //And sample members
             $coursework->add_child($sample_members);
-        
+
             //And submissions are made up from individual submission instances
             $submissions->add_child($submission);
             //Submissions have multiple feedback items
@@ -377,30 +377,30 @@ protected function define_structure()
 
             $allocation_config->set_source_table('coursework_allocation_config',
                                                  array('courseworkid'=>backup::VAR_PARENTID));
-                                        
+
             //Mark important foreign keys
             $feedback->annotate_ids('user','assessorid');
             $feedback->annotate_ids('user','lasteditedbyuser');
             $feedback->annotate_ids('user','markernumber');
-        
+
             $submission->annotate_ids('user','userid');
             $submission->annotate_ids('user','createdby');
             $submission->annotate_ids('user','lastupdatedby');
-            $submission->annotate_ids('user','allocatableuser');   
+            $submission->annotate_ids('user','allocatableuser');
             $submission->annotate_ids('group','allocatablegroup');
 
             $reminder->annotate_ids('user','userid');
 
             $pair->annotate_ids('user','assessorid');
-            $pair->annotate_ids('user','allocatableuser');   
+            $pair->annotate_ids('user','allocatableuser');
             $pair->annotate_ids('group','allocatablegroup');
-        
+
             $allocation_config->annotate_ids('user','assessorid');
 
-            $modsetmember->annotate_ids('user','allocatableuser');   
+            $modsetmember->annotate_ids('user','allocatableuser');
             $modsetmember->annotate_ids('group','allocatablegroup');
 
-            $extension->annotate_ids('user','allocatableuser');   
+            $extension->annotate_ids('user','allocatableuser');
             $extension->annotate_ids('group','allocatablegroup');
 
             $personal_deadline->annotate_ids('user','allocatableuser');
@@ -423,8 +423,8 @@ protected function define_structure()
         $coursework->annotate_ids('grouping','grouping_id');
 
         $coursework->set_source_table('coursework',array('id'=>backup::VAR_ACTIVITYID));
-        
-        return $this->prepare_activity_structure($coursework);        
-        
+
+        return $this->prepare_activity_structure($coursework);
+
     }
 }
\ No newline at end of file
diff --git a/classes/models/outstanding_marking.php b/classes/models/outstanding_marking.php
index f9e44d6..8061592 100644
--- a/classes/models/outstanding_marking.php
+++ b/classes/models/outstanding_marking.php
@@ -247,9 +247,9 @@ private function get_to_grade_agreed_grade_sampled_submissions($courseworkid) {
                                    COUNT(a.id) AS ssmID  FROM(
                                                   SELECT f.id AS fid, cs.id AS csid, cs.allocatableid ,ssm.id, COUNT(f.id) AS count_feedback,   
                                                       cs.courseworkid
-                                                  FROM mdl_coursework_submissions cs  LEFT JOIN
-                                                       mdl_coursework_feedbacks f ON f.submissionid= cs.id 
-                                                  LEFT JOIN `mdl_coursework_sample_set_mbrs` ssm 
+                                                  FROM {coursework_submissions} cs  LEFT JOIN
+                                                       {coursework_feedbacks} f ON f.submissionid= cs.id
+                                                  LEFT JOIN {coursework_sample_set_mbrs} ssm
                                                   ON  cs.courseworkid = ssm.courseworkid AND cs.allocatableid =ssm.allocatableid    
                                                   WHERE cs.courseworkid = :courseworkid
                                                   GROUP BY cs.allocatableid, ssm.stage_identifier
diff --git a/classes/warnings.php b/classes/warnings.php
index c63aebc..02c169b 100644
--- a/classes/warnings.php
+++ b/classes/warnings.php
@@ -129,8 +129,8 @@ public function students_in_mutiple_grouos() {
                     } else {
 
                         $sql = "SELECT groups.id,groups.name
-                                FROM mdl_groups groups
-                          INNER JOIN mdl_groups_members gm
+                                FROM {groups} groups
+                          INNER JOIN {groups_members} gm
                                   ON gm.groupid = groups.id
                                WHERE groups.courseid = :courseid
 		                         AND gm.userid = :userid";