diff --git a/sql/swad.sql b/sql/swad.sql index 2f804819f..dbe94e362 100644 --- a/sql/swad.sql +++ b/sql/swad.sql @@ -164,9 +164,9 @@ CREATE TABLE IF NOT EXISTS brw_expanded_folders ( INDEX(FileBrowser,Cod), INDEX(WorksUsrCod)); -- --- Table file_cache: stores the media private paths linked from public directories in current session +-- Table brw_file_caches: stores the media private paths linked from public directories in current session -- -CREATE TABLE IF NOT EXISTS file_cache ( +CREATE TABLE IF NOT EXISTS brw_file_caches ( SessionId CHAR(43) NOT NULL, PrivPath TEXT COLLATE latin1_bin NOT NULL, TmpPubDir TEXT COLLATE latin1_bin NOT NULL, diff --git a/swad_changelog.h b/swad_changelog.h index d465041a2..da0254091 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -600,13 +600,17 @@ TODO: Salvador Romero Cort TODO: FIX BUG, URGENT! En las fechas como parámetro Dat_WriteParamsIniEndDates(), por ejemplo al cambiar el color de la gráfica de accesos por día y hora, no se respeta la zona horaria. */ -#define Log_PLATFORM_VERSION "SWAD 20.51.6 (2021-03-18)" +#define Log_PLATFORM_VERSION "SWAD 20.51.7 (2021-03-18)" #define CSS_FILE "swad20.45.css" #define JS_FILE "swad20.6.2.js" /* TODO: Rename CENTRE to CENTER in help wiki. TODO: Rename ASSESSMENT.Announcements to ASSESSMENT.Calls_for_exams + Version 20.51.7: Mar 18, 2021 Files database table renamed. (307704 lines) + 1 change necessary in database: +RENAME TABLE file_cache TO brw_file_caches; + Version 20.51.6: Mar 18, 2021 Files database table renamed. (307697 lines) 1 change necessary in database: RENAME TABLE files TO brw_files; diff --git a/swad_database.c b/swad_database.c index b84026d0a..af60b4f96 100644 --- a/swad_database.c +++ b/swad_database.c @@ -435,9 +435,9 @@ mysql> DESCRIBE brw_expanded_folders; "INDEX(FileBrowser,Cod)," "INDEX(WorksUsrCod))"); - /***** Table file_cache *****/ + /***** Table brw_file_caches *****/ /* -mysql> DESCRIBE file_cache; +mysql> DESCRIBE brw_file_caches; +-----------+----------+------+-----+---------+-------+ | Field | Type | Null | Key | Default | Extra | +-----------+----------+------+-----+---------+-------+ @@ -447,7 +447,7 @@ mysql> DESCRIBE file_cache; +-----------+----------+------+-----+---------+-------+ 3 rows in set (0.01 sec) */ - DB_CreateTable ("CREATE TABLE IF NOT EXISTS file_cache (" + DB_CreateTable ("CREATE TABLE IF NOT EXISTS brw_file_caches (" "SessionId CHAR(43) NOT NULL," // Cns_BYTES_SESSION_ID "PrivPath VARCHAR(4096) COLLATE latin1_bin NOT NULL," // PATH_MAX "TmpPubDir VARCHAR(4096) COLLATE latin1_bin NOT NULL," // PATH_MAX diff --git a/swad_session.c b/swad_session.c index b29da5c08..b4d3cb531 100644 --- a/swad_session.c +++ b/swad_session.c @@ -473,8 +473,10 @@ bool Ses_GetPublicDirFromCache (const char *FullPathMediaPriv, { /***** Get temporary directory from cache *****/ if (DB_QuerySELECT (&mysql_res,"can not get check if file is cached", - "SELECT TmpPubDir FROM file_cache" - " WHERE SessionId='%s' AND PrivPath='%s'", + "SELECT TmpPubDir" + " FROM brw_file_caches" + " WHERE SessionId='%s'" + " AND PrivPath='%s'", Gbl.Session.Id,FullPathMediaPriv)) { /* Get the temporary public directory (row[0]) */ @@ -511,8 +513,9 @@ static void Ses_DeletePublicDirFromCache (const char *FullPathMediaPriv) /***** Delete possible entry *****/ if (Gbl.Session.IsOpen) DB_QueryDELETE ("can not remove cached file", - "DELETE FROM file_cache" - " WHERE SessionId='%s' AND PrivPath='%s'", + "DELETE FROM brw_file_caches" + " WHERE SessionId='%s'" + " AND PrivPath='%s'", Gbl.Session.Id,FullPathMediaPriv); } @@ -531,7 +534,7 @@ void Ses_AddPublicDirToCache (const char *FullPathMediaPriv, /* Insert new entry */ DB_QueryINSERT ("can not cache file", - "INSERT INTO file_cache" + "INSERT INTO brw_file_caches" " (SessionId,PrivPath,TmpPubDir)" " VALUES" " ('%s','%s','%s')", @@ -548,7 +551,8 @@ void Ses_RemovePublicDirsCache (void) /***** Insert into cache *****/ if (Gbl.Session.IsOpen) DB_QueryDELETE ("can not cache file", - "DELETE FROM file_cache WHERE SessionId='%s'", + "DELETE FROM brw_file_caches" + " WHERE SessionId='%s'", Gbl.Session.Id); } @@ -561,7 +565,7 @@ void Ses_RemovePublicDirsFromExpiredSessions (void) { /***** Remove public directories in expired sessions *****/ DB_QueryDELETE ("can not remove public directories in expired sessions", - "DELETE FROM file_cache" + "DELETE FROM brw_file_caches" " WHERE SessionId NOT IN" " (SELECT SessionId FROM sessions)"); }