Removes unneeded reports database tables

main/inc/lib/database.constants.inc.php

@@ -310,10 +310,6 @@ define('TABLE_USERGROUP_REL_SESSION',   'usergroup_rel_session');
 // Mail notifications
 define('TABLE_NOTIFICATION',               'notification');
 
-//Custom reports table
-define('TABLE_MAIN_REPORTS_KEYS',			'reports_keys');
-define('TABLE_MAIN_REPORTS_VALUES', 			'reports_values');
-
 //Storage api tables
 define('TABLE_MAIN_STORED_VALUES',			'stored_values');
 define('TABLE_MAIN_STORED_VALUES_STACK',		'stored_values_stack');

main/install/db_main.sql

@@ -2867,38 +2867,6 @@ CREATE TABLE IF NOT EXISTS skill_rel_profile (
   PRIMARY KEY (id)
 );
 
--- Custom reports
-
-DROP TABLE IF EXISTS reports_keys;
-CREATE TABLE IF NOT EXISTS reports_keys (
-  id int unsigned NOT NULL AUTO_INCREMENT,
-  course_id int DEFAULT NULL,
-  tool_id int DEFAULT NULL,
-  child_id int DEFAULT NULL,
-  child_name varchar(64) DEFAULT NULL,
-  subchild_id int unsigned DEFAULT NULL,
-  subchild_name varchar(64) DEFAULT NULL,
-  subsubchild_id int unsigned DEFAULT NULL,
-  subsubchild_name varchar(64) DEFAULT NULL,
-  link varchar(256) DEFAULT NULL,
-  PRIMARY KEY (id),
-  KEY course_id (course_id),
-  KEY course_id_2 (course_id,tool_id,child_id,subchild_id,subsubchild_id)
-);
-
-DROP TABLE IF EXISTS reports_values;
-CREATE TABLE IF NOT EXISTS reports_values (
-  key_id int unsigned NOT NULL,
-  uid int DEFAULT NULL,
-  session_id int unsigned DEFAULT NULL,
-  attempt int DEFAULT NULL,
-  score decimal(5,3) DEFAULT NULL,
-  progress int DEFAULT NULL,
-  `time` int DEFAULT NULL,
-  KEY uid (uid),
-  PRIMARY KEY (key_id,uid,session_id,attempt)
-);
-
 --
 -- Table structure for event email sending
 --

main/install/db_stats.sql

@@ -270,32 +270,6 @@ ALTER TABLE track_e_downloads ADD INDEX (down_session_id);
 ALTER TABLE track_e_links ADD INDEX (links_session_id); 
 ALTER TABLE track_e_uploads ADD INDEX (upload_session_id);  
 
-CREATE TABLE reports_keys (
-  id int unsigned NOT NULL AUTO_INCREMENT,
-  course_id int unsigned DEFAULT NULL,
-  tool_id int DEFAULT NULL,
-  child_id int DEFAULT NULL,
-  child_name varchar(64) DEFAULT NULL,
-  subchild_id int DEFAULT NULL,
-  subchild_name varchar(64) DEFAULT NULL,
-  subsubchild_id int DEFAULT NULL,
-  subsubchild_name varchar(64) DEFAULT NULL,
-  link varchar(256) DEFAULT NULL,
-  PRIMARY KEY (id),
-  KEY course_id (course_id),
-  KEY course_id_2 (course_id,tool_id,child_id,subchild_id,subsubchild_id));
-
-CREATE TABLE reports_values (
-  key_id int unsigned NOT NULL,
-  user_id int unsigned DEFAULT NULL,
-  session_id int DEFAULT NULL,
-  attempt int DEFAULT NULL,
-  score decimal(5,3) DEFAULT NULL,
-  progress int DEFAULT NULL,
-  report_time int DEFAULT NULL,
-  KEY user_id (user_id),
-  PRIMARY KEY (key_id,user_id,session_id,attempt));
-
 --
 -- Table structure for LP custom storage API
 --

main/install/migrate-db-1.8.8-1.9.0-pre.sql

@@ -171,8 +171,6 @@ UPDATE settings_current SET selected_value = '1.9.0.17051' WHERE variable = 'cha
 -- xxSTATSxx
 ALTER TABLE track_e_exercices ADD COLUMN questions_to_check TEXT NOT NULL DEFAULT '';
 --CREATE TABLE track_filtered_terms (id int, user_id int, course_id int, session_id int, tool_id char(12), filtered_term varchar(255), created_at datetime);
-CREATE TABLE reports_keys ( id int unsigned NOT NULL AUTO_INCREMENT, course_id int unsigned DEFAULT NULL, tool_id int DEFAULT NULL, child_id int DEFAULT NULL, child_name varchar(64) DEFAULT NULL, subchild_id int DEFAULT NULL, subchild_name varchar(64) DEFAULT NULL, subsubchild_id int DEFAULT NULL, subsubchild_name varchar(64) DEFAULT NULL, link varchar(256) DEFAULT NULL, PRIMARY KEY (id), KEY course_id (course_id), KEY course_id_2 (course_id,tool_id,child_id,subchild_id,subsubchild_id));
-CREATE TABLE reports_values ( key_id int unsigned NOT NULL, user_id int unsigned DEFAULT NULL, session_id int DEFAULT NULL, attempt int DEFAULT NULL, score decimal(5,3) DEFAULT NULL, progress int DEFAULT NULL, report_time int DEFAULT NULL, KEY user_id (user_id), PRIMARY KEY (key_id,user_id,session_id,attempt));
 CREATE TABLE stored_values (user_id INT NOT NULL, sco_id INT NOT NULL, course_id CHAR(40) NOT NULL, sv_key CHAR(64) NOT NULL, sv_value TEXT NOT NULL );
 ALTER TABLE stored_values ADD KEY (user_id, sco_id, course_id, sv_key);
 ALTER TABLE stored_values ADD UNIQUE (user_id, sco_id, course_id, sv_key);

main/reports/reports.lib.php

@@ -21,11 +21,11 @@ function reports_loadTemplates() {
 
 
 // clear all reporting data
-function reports_clearAll() {
 /*
-	Database::query('DELETE FROM '.Database::get_main_table(TABLE_MAIN_REPORTS_KEYS));
-	Database::query('DELETE FROM '.Database::get_main_table(TABLE_MAIN_REPORTS_VALUES));
-*/	
+function reports_clearAll() {
+
+	//Database::query('DELETE FROM '.Database::get_main_table(TABLE_MAIN_REPORTS_KEYS));
+	//Database::query('DELETE FROM '.Database::get_main_table(TABLE_MAIN_REPORTS_VALUES));
 	Database::query('DROP TABLE '.Database::get_main_table(TABLE_MAIN_REPORTS_KEYS));
 	Database::query('DROP TABLE '.Database::get_main_table(TABLE_MAIN_REPORTS_VALUES));
 	Database::query('
@@ -70,7 +70,6 @@ function reports_addDBKeys() {
 		Database::get_main_table(TABLE_MAIN_REPORTS_VALUES).
 		' add primary key(key_id,user_id,session_id,attempt)');
 }
-
 // build all reporting data
 function reports_build() {
 	global $reports_enabled_modules, $reports_modules;
@@ -147,7 +146,7 @@ function reports_addValueQuery($query) {
 		' (key_id, user_id, session_id, attempt, score, '.
 		'progress, report_time, ts) ('.$query.')');
 }
-
+ */
 // return tools ID (parametre is a constant from main_api
 function reports_getToolId($tool) {
 	$tools = array_flip(api_get_tools_lists());
@@ -180,6 +179,7 @@ function reports_getVisibilitySQL () {
 //  this sql stateuement MUST include a field key_id with the value given
 //  to the function as parametre. This statement will be passed to 
 //  reports_addValueQuery
+/*
 function reports_automaticAdd($keys_query, $values_query_function) {
 	$keys_result = Database::query($keys_query);
 	if (!$keys_query) {
@@ -213,4 +213,4 @@ function reports_automaticAdd($keys_query, $values_query_function) {
 		else
 			reports_addValueQuery($values['sql']);
 	}
-}
+}*/