From: David Mudrák <david@moodle.com>
Date: Tue, 19 Jun 2012 11:56:30 +0000 (+0200)
Subject: MDL-33430 Include repository type in files.xml in MBZ backup file
X-Git-Tag: v2.3.0-rc1~8^2~8
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=79b810fdc0fd9fb0b16e941008b5ec38d93a015d;hp=6feae1d256448b0a9867a010065deccfc3f54527

MDL-33430 Include repository type in files.xml in MBZ backup file

This is a valuable information needed especially when restoring the MBZ
at another site. The repositoryid itself is not enough there to identify
the type of the repository.
---

diff --git a/backup/moodle2/backup_stepslib.php b/backup/moodle2/backup_stepslib.php
index a2fa9488605..fa515210c0e 100644
--- a/backup/moodle2/backup_stepslib.php
+++ b/backup/moodle2/backup_stepslib.php
@@ -1404,7 +1404,8 @@ class backup_final_files_structure_step extends backup_structure_step {
             'contenthash', 'contextid', 'component', 'filearea', 'itemid',
             'filepath', 'filename', 'userid', 'filesize',
             'mimetype', 'status', 'timecreated', 'timemodified',
-            'source', 'author', 'license', 'sortorder', 'reference', 'repositoryid'));
+            'source', 'author', 'license', 'sortorder',
+            'repositorytype', 'repositoryid', 'reference'));
 
         // Build the tree
 
@@ -1412,12 +1413,12 @@ class backup_final_files_structure_step extends backup_structure_step {
 
         // Define sources
 
-        $file->set_source_sql("SELECT f.*, r.repositoryid, r.reference
+        $file->set_source_sql("SELECT f.*, r.type AS repositorytype, fr.repositoryid, fr.reference
                                  FROM {files} f
-                                 LEFT JOIN {files_reference} r
-                                      ON r.id = f.referencefileid
-                                 JOIN {backup_ids_temp} bi
-                                      ON f.id = bi.itemid
+                                      LEFT JOIN {files_reference} fr ON fr.id = f.referencefileid
+                                      LEFT JOIN {repository_instances} ri ON ri.id = fr.repositoryid
+                                      LEFT JOIN {repository} r ON r.id = ri.typeid
+                                      JOIN {backup_ids_temp} bi ON f.id = bi.itemid
                                 WHERE bi.backupid = ?
                                   AND bi.itemname = 'filefinal'", array(backup::VAR_BACKUPID));