MDL-79397 reportbuilder: update existing entity table definitions.

laurentdavid · Dec 7, 2023 · 7143cf4 · 7143cf4
1 parent fb53d08
commit 7143cf4
Show file tree

Hide file tree

Showing 27 changed files with 158 additions and 131 deletions.
diff --git a/admin/classes/reportbuilder/local/entities/task_log.php b/admin/classes/reportbuilder/local/entities/task_log.php
@@ -46,12 +46,14 @@ class task_log extends base {
     protected const FAILED = 1;
 
     /**
-     * Database tables that this entity uses and their default aliases
+     * Database tables that this entity uses
      *
-     * @return array
+     * @return string[]
      */
-    protected function get_default_table_aliases(): array {
-        return ['task_log' => 'tl'];
+    protected function get_default_tables(): array {
+        return [
+            'task_log',
+        ];
     }
 
     /**

diff --git a/admin/roles/classes/reportbuilder/local/entities/role.php b/admin/roles/classes/reportbuilder/local/entities/role.php
@@ -34,14 +34,14 @@
 class role extends base {
 
     /**
-     * Database tables that this entity uses and their default aliases
+     * Database tables that this entity uses
      *
-     * @return array
+     * @return string[]
      */
-    protected function get_default_table_aliases(): array {
+    protected function get_default_tables(): array {
         return [
-            'context' => 'rctx',
-            'role' => 'r',
+            'context',
+            'role',
         ];
     }
 

diff --git a/badges/classes/reportbuilder/local/entities/badge.php b/badges/classes/reportbuilder/local/entities/badge.php
@@ -44,16 +44,16 @@
 class badge extends base {
 
     /**
-     * Database tables that this entity uses and their default aliases
+     * Database tables that this entity uses
      *
-     * @return array
+     * @return string[]
      */
-    protected function get_default_table_aliases(): array {
+    protected function get_default_tables(): array {
         return [
-            'badge' => 'b',
-            'context' => 'bctx',
-            'tag_instance' => 'bti',
-            'tag' => 'bt',
+            'badge',
+            'context',
+            'tag_instance',
+            'tag',
         ];
     }
 

diff --git a/badges/classes/reportbuilder/local/entities/badge_issued.php b/badges/classes/reportbuilder/local/entities/badge_issued.php
@@ -34,12 +34,14 @@
 class badge_issued extends base {
 
     /**
-     * Database tables that this entity uses and their default aliases
+     * Database tables that this entity uses
      *
-     * @return array
+     * @return string[]
      */
-    protected function get_default_table_aliases(): array {
-        return ['badge_issued' => 'bi'];
+    protected function get_default_tables(): array {
+        return [
+            'badge_issued',
+        ];
     }
 
     /**

diff --git a/blog/classes/reportbuilder/local/entities/blog.php b/blog/classes/reportbuilder/local/entities/blog.php
@@ -38,15 +38,15 @@
 class blog extends base {
 
     /**
-     * Database tables that this entity uses and their default aliases
+     * Database tables that this entity uses
      *
-     * @return array
+     * @return string[]
      */
-    protected function get_default_table_aliases(): array {
+    protected function get_default_tables(): array {
         return [
-            'post' => 'bp',
-            'tag_instance' => 'bti',
-            'tag' => 'bt',
+            'post',
+            'tag_instance',
+            'tag',
         ];
     }
 

diff --git a/cohort/classes/reportbuilder/local/entities/cohort.php b/cohort/classes/reportbuilder/local/entities/cohort.php
@@ -42,14 +42,14 @@
 class cohort extends base {
 
     /**
-     * Database tables that this entity uses and their default aliases
+     * Database tables that this entity uses
      *
-     * @return array
+     * @return string[]
      */
-    protected function get_default_table_aliases(): array {
+    protected function get_default_tables(): array {
         return [
-            'cohort' => 'c',
-            'context' => 'chctx',
+            'cohort',
+            'context',
         ];
     }
 

diff --git a/cohort/classes/reportbuilder/local/entities/cohort_member.php b/cohort/classes/reportbuilder/local/entities/cohort_member.php
@@ -35,12 +35,14 @@
 class cohort_member extends base {
 
     /**
-     * Database tables that this entity uses and their default aliases
+     * Database tables that this entity uses
      *
-     * @return array
+     * @return string[]
      */
-    protected function get_default_table_aliases(): array {
-        return ['cohort_members' => 'cm'];
+    protected function get_default_tables(): array {
+        return [
+            'cohort_members',
+        ];
     }
 
     /**

diff --git a/comment/classes/reportbuilder/local/entities/comment.php b/comment/classes/reportbuilder/local/entities/comment.php
@@ -38,14 +38,14 @@
 class comment extends base {
 
     /**
-     * Database tables that this entity uses and their default aliases
+     * Database tables that this entity uses
      *
-     * @return array
+     * @return string[]
      */
-    protected function get_default_table_aliases(): array {
+    protected function get_default_tables(): array {
         return [
-            'comments' => 'c',
-            'context' => 'cmctx',
+            'comments',
+            'context',
         ];
     }
 

diff --git a/course/classes/reportbuilder/local/entities/access.php b/course/classes/reportbuilder/local/entities/access.php
@@ -36,12 +36,15 @@
 class access extends base {
 
     /**
-     * Database tables that this entity uses and their default aliases
+     * Database tables that this entity uses
      *
-     * @return array
+     * @return string[]
      */
-    protected function get_default_table_aliases(): array {
-        return ['user_lastaccess' => 'ula', 'user' => 'u'];
+    protected function get_default_tables(): array {
+        return [
+            'user_lastaccess',
+            'user',
+        ];
     }
 
     /**

diff --git a/course/classes/reportbuilder/local/entities/completion.php b/course/classes/reportbuilder/local/entities/completion.php
@@ -42,17 +42,17 @@
 class completion extends base {
 
     /**
-     * Database tables that this entity uses and their default aliases
+     * Database tables that this entity uses
      *
-     * @return array
+     * @return string[]
      */
-    protected function get_default_table_aliases(): array {
+    protected function get_default_tables(): array {
         return [
-            'course_completion' => 'ccomp',
-            'course' => 'c',
-            'grade_grades' => 'gg',
-            'grade_items' => 'gi',
-            'user' => 'u',
+            'course_completion',
+            'course',
+            'grade_grades' ,
+            'grade_items',
+            'user',
         ];
     }
 

diff --git a/course/classes/reportbuilder/local/entities/course_category.php b/course/classes/reportbuilder/local/entities/course_category.php
@@ -40,14 +40,14 @@
 class course_category extends base {
 
     /**
-     * Database tables that this entity uses and their default aliases
+     * Database tables that this entity uses
      *
-     * @return array
+     * @return string[]
      */
-    protected function get_default_table_aliases(): array {
+    protected function get_default_tables(): array {
         return [
-            'context' => 'ccctx',
-            'course_categories' => 'cc',
+            'context',
+            'course_categories',
         ];
     }
 

diff --git a/course/classes/reportbuilder/local/entities/enrolment.php b/course/classes/reportbuilder/local/entities/enrolment.php
@@ -42,12 +42,15 @@
 class enrolment extends base {
 
     /**
-     * Database tables that this entity uses and their default aliases
+     * Database tables that this entity uses
      *
-     * @return array
+     * @return string[]
      */
-    protected function get_default_table_aliases(): array {
-        return ['user_enrolments' => 'ue', 'enrol' => 'e'];
+    protected function get_default_tables(): array {
+        return [
+            'user_enrolments',
+            'enrol',
+        ];
     }
 
     /**

diff --git a/enrol/classes/reportbuilder/local/entities/enrol.php b/enrol/classes/reportbuilder/local/entities/enrol.php
@@ -34,13 +34,13 @@
 class enrol extends base {
 
     /**
-     * Database tables that this entity uses and their default aliases
+     * Database tables that this entity uses
      *
-     * @return array
+     * @return string[]
      */
-    protected function get_default_table_aliases(): array {
+    protected function get_default_tables(): array {
         return [
-            'enrol' => 'e',
+            'enrol',
         ];
     }
 

diff --git a/files/classes/reportbuilder/local/entities/file.php b/files/classes/reportbuilder/local/entities/file.php
@@ -41,14 +41,14 @@
 class file extends base {
 
     /**
-     * Database tables that this entity uses and their default aliases
+     * Database tables that this entity uses
      *
-     * @return array
+     * @return string[]
      */
-    protected function get_default_table_aliases(): array {
+    protected function get_default_tables(): array {
         return [
-            'files' => 'f',
-            'context' => 'fctx',
+            'files',
+            'context',
         ];
     }
 

diff --git a/grade/report/summary/classes/local/entities/grade_items.php b/grade/report/summary/classes/local/entities/grade_items.php
@@ -59,12 +59,14 @@ public function __construct(stdClass $course) {
     }
 
     /**
-     * Database tables that this entity uses and their default aliases
+     * Database tables that this entity uses
      *
-     * @return array
+     * @return string[]
      */
-    protected function get_default_table_aliases(): array {
-        return ['grade_items' => 'gi'];
+    protected function get_default_tables(): array {
+        return [
+            'grade_items',
+        ];
     }
 
     /**

diff --git a/group/classes/reportbuilder/local/entities/group.php b/group/classes/reportbuilder/local/entities/group.php
@@ -44,14 +44,14 @@
 class group extends base {
 
     /**
-     * Database tables that this entity uses and their default aliases
+     * Database tables that this entity uses
      *
-     * @return array
+     * @return string[]
      */
-    protected function get_default_table_aliases(): array {
+    protected function get_default_tables(): array {
         return [
-            'context' => 'gctx',
-            'groups' => 'g',
+            'context',
+            'groups',
         ];
     }
 

diff --git a/group/classes/reportbuilder/local/entities/group_member.php b/group/classes/reportbuilder/local/entities/group_member.php
@@ -34,13 +34,13 @@
 class group_member extends base {
 
     /**
-     * Database tables that this entity uses and their default aliases
+     * Database tables that this entity uses
      *
-     * @return array
+     * @return string[]
      */
-    protected function get_default_table_aliases(): array {
+    protected function get_default_tables(): array {
         return [
-            'groups_members' => 'gm',
+            'groups_members',
         ];
     }
 

diff --git a/group/classes/reportbuilder/local/entities/grouping.php b/group/classes/reportbuilder/local/entities/grouping.php
@@ -37,14 +37,14 @@
 class grouping extends base {
 
     /**
-     * Database tables that this entity uses and their default aliases
+     * Database tables that this entity uses
      *
-     * @return array
+     * @return string[]
      */
-    protected function get_default_table_aliases(): array {
+    protected function get_default_tables(): array {
         return [
-            'context' => 'ggctx',
-            'groupings' => 'gg',
+            'context',
+            'groupings',
         ];
     }
 

diff --git a/lib/classes/reportbuilder/local/entities/context.php b/lib/classes/reportbuilder/local/entities/context.php
@@ -36,12 +36,14 @@
 class context extends base {
 
     /**
-     * Database tables that this entity uses and their default aliases
+     * Database tables that this entity uses
      *
-     * @return array
+     * @return string[]
      */
-    protected function get_default_table_aliases(): array {
-        return ['context' => 'ctx'];
+    protected function get_default_tables(): array {
+        return [
+            'context',
+        ];
     }
 
     /**