From 532f7d020c6ae009c78a3ccf0d8aa36f33e4f86f Mon Sep 17 00:00:00 2001 From: acanas Date: Sat, 20 Mar 2021 12:21:29 +0100 Subject: [PATCH] Version 20.51.25: Mar 20, 2021 Plugins database table renamed. --- sql/swad.sql | 4 +-- swad_API.c | 4 ++- swad_changelog.h | 8 +++-- swad_database.c | 6 ++-- swad_plugin.c | 83 +++++++++++++++++++++++++++++++++--------------- 5 files changed, 72 insertions(+), 33 deletions(-) diff --git a/sql/swad.sql b/sql/swad.sql index 109fef05a..7571f9326 100644 --- a/sql/swad.sql +++ b/sql/swad.sql @@ -1158,9 +1158,9 @@ CREATE TABLE IF NOT EXISTS plc_places ( UNIQUE INDEX(PlcCod), INDEX(InsCod)); -- --- Table plugins: stores the plugins +-- Table plg_plugins: stores the plugins -- -CREATE TABLE IF NOT EXISTS plugins ( +CREATE TABLE IF NOT EXISTS plg_plugins ( PlgCod INT NOT NULL AUTO_INCREMENT, Name VARCHAR(511) NOT NULL, Description VARCHAR(2047) NOT NULL, diff --git a/swad_API.c b/swad_API.c index f6800d445..8921a9d50 100644 --- a/swad_API.c +++ b/swad_API.c @@ -364,7 +364,9 @@ static int API_GetPlgCodFromAppKey (struct soap *soap, /***** Get number of plugins with a IP address *****/ if (DB_QuerySELECT (&mysql_res,"can not check application key", - "SELECT PlgCod FROM plugins WHERE AppKey='%s'", + "SELECT PlgCod" + " FROM plg_plugins" + " WHERE AppKey='%s'", appKey)) // Session found in table of sessions { row = mysql_fetch_row (mysql_res); diff --git a/swad_changelog.h b/swad_changelog.h index 49a8fb56c..6ab3a97b2 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -600,14 +600,18 @@ 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.24 (2021-03-19)" +#define Log_PLATFORM_VERSION "SWAD 20.51.25 (2021-03-20)" #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.24: Mar 19, 2021 Places database table renamed. (308022 lines) + Version 20.51.25: Mar 20, 2021 Plugins database table renamed. (308202 lines) + 1 change necessary in database: +RENAME TABLE plugins TO plg_plugins; + + Version 20.51.24: Mar 19, 2021 Places database table renamed. (308164 lines) 1 change necessary in database: RENAME TABLE places TO plc_places; diff --git a/swad_database.c b/swad_database.c index 0e84aef51..724192ec7 100644 --- a/swad_database.c +++ b/swad_database.c @@ -2414,9 +2414,9 @@ mysql> DESCRIBE plc_places; "UNIQUE INDEX(PlcCod)," "INDEX(InsCod))"); - /***** Table plugins *****/ + /***** Table plg_plugins *****/ /* -mysql> DESCRIBE plugins; +mysql> DESCRIBE plg_plugins; +-------------+---------------+------+-----+---------+----------------+ | Field | Type | Null | Key | Default | Extra | +-------------+---------------+------+-----+---------+----------------+ @@ -2430,7 +2430,7 @@ mysql> DESCRIBE plugins; +-------------+---------------+------+-----+---------+----------------+ 7 rows in set (0,00 sec) */ - DB_CreateTable ("CREATE TABLE IF NOT EXISTS plugins (" + DB_CreateTable ("CREATE TABLE IF NOT EXISTS plg_plugins (" "PlgCod INT NOT NULL AUTO_INCREMENT," "Name VARCHAR(511) NOT NULL," // Plg_MAX_BYTES_PLUGIN_NAME "Description VARCHAR(2047) NOT NULL," // Plg_MAX_BYTES_PLUGIN_DESCRIPTION diff --git a/swad_plugin.c b/swad_plugin.c index 6a1019a92..48ed782dd 100644 --- a/swad_plugin.c +++ b/swad_plugin.c @@ -231,8 +231,15 @@ static void Plg_GetListPlugins (void) /***** Get plugins from database *****/ NumRows = DB_QuerySELECT (&mysql_res,"can not get plugins", - "SELECT PlgCod,Name,Description,Logo,AppKey,URL,IP" - " FROM plugins ORDER BY Name"); + "SELECT PlgCod," // row[0] + "Name," // row[1] + "Description," // row[2] + "Logo," // row[3] + "AppKey," // row[4] + "URL," // row[5] + "IP" // row[6] + " FROM plg_plugins" + " ORDER BY Name"); /***** Count number of rows in result *****/ if (NumRows) // Plugins found... @@ -300,8 +307,13 @@ bool Plg_GetDataOfPluginByCod (struct Plugin *Plg) /***** Get data of a plugin from database *****/ NumRows = DB_QuerySELECT (&mysql_res,"can not get data of a plugin", - "SELECT Name,Description,Logo,AppKey,URL,IP" - " FROM plugins" + "SELECT Name," // row[0] + "Description," // row[1] + "Logo," // row[2] + "AppKey," // row[3] + "URL," // row[4] + "IP" // row[5] + " FROM plg_plugins" " WHERE PlgCod=%ld", Plg->PlgCod); @@ -496,7 +508,8 @@ void Plg_RemovePlugin (void) /***** Remove plugin *****/ DB_QueryDELETE ("can not remove a plugin", - "DELETE FROM plugins WHERE PlgCod=%ld", + "DELETE FROM plg_plugins" + " WHERE PlgCod=%ld", Plg_EditingPlg->PlgCod); /***** Write message to show the change made *****/ @@ -546,7 +559,9 @@ void Plg_RenamePlugin (void) { /* Update the table changing old name by new name */ DB_QueryUPDATE ("can not update the name of a plugin", - "UPDATE plugins SET Name='%s' WHERE PlgCod=%ld", + "UPDATE plg_plugins" + " SET Name='%s'" + " WHERE PlgCod=%ld", NewPlgName,Plg_EditingPlg->PlgCod); /***** Write message to show the change made *****/ @@ -576,8 +591,9 @@ static bool Plg_CheckIfPluginNameExists (const char *Name,long PlgCod) /***** Get number of plugins with a name from database *****/ return (DB_QueryCOUNT ("can not check if the name of a plugin" " already existed", - "SELECT COUNT(*) FROM plugins" - " WHERE Name='%s' AND PlgCod<>%ld", + "SELECT COUNT(*) FROM plg_plugins" + " WHERE Name='%s'" + " AND PlgCod<>%ld", Name,PlgCod) != 0); } @@ -609,8 +625,11 @@ void Plg_ChangePlgDescription (void) { /* Update the table changing old description by new description */ DB_QueryUPDATE ("can not update the description of a plugin", - "UPDATE plugins SET Description='%s' WHERE PlgCod=%ld", - NewDescription,Plg_EditingPlg->PlgCod); + "UPDATE plg_plugins" + " SET Description='%s'" + " WHERE PlgCod=%ld", + NewDescription, + Plg_EditingPlg->PlgCod); /***** Write message to show the change made *****/ Ale_CreateAlert (Ale_SUCCESS,NULL, @@ -653,8 +672,11 @@ void Plg_ChangePlgLogo (void) { /* Update the table changing old logo by new logo */ DB_QueryUPDATE ("can not update the logo of a plugin", - "UPDATE plugins SET Logo='%s' WHERE PlgCod=%ld", - NewLogo,Plg_EditingPlg->PlgCod); + "UPDATE plg_plugins" + " SET Logo='%s'" + " WHERE PlgCod=%ld", + NewLogo, + Plg_EditingPlg->PlgCod); /***** Write message to show the change made *****/ Ale_CreateAlert (Ale_SUCCESS,NULL, @@ -696,8 +718,11 @@ void Plg_ChangePlgAppKey (void) { /* Update the table changing old application key by new application key */ DB_QueryUPDATE ("can not update the application key of a plugin", - "UPDATE plugins SET AppKey='%s' WHERE PlgCod=%ld", - NewAppKey,Plg_EditingPlg->PlgCod); + "UPDATE plg_plugins" + " SET AppKey='%s'" + " WHERE PlgCod=%ld", + NewAppKey, + Plg_EditingPlg->PlgCod); /***** Write message to show the change made *****/ Ale_CreateAlert (Ale_SUCCESS,NULL, @@ -739,8 +764,11 @@ void Plg_ChangePlgURL (void) { /* Update the table changing old WWW by new WWW */ DB_QueryUPDATE ("can not update the URL of a plugin", - "UPDATE plugins SET URL='%s' WHERE PlgCod=%ld", - NewURL,Plg_EditingPlg->PlgCod); + "UPDATE plg_plugins" + " SET URL='%s'" + " WHERE PlgCod=%ld", + NewURL, + Plg_EditingPlg->PlgCod); /***** Write message to show the change made *****/ Ale_CreateAlert (Ale_SUCCESS,NULL, @@ -782,8 +810,11 @@ void Plg_ChangePlgIP (void) { /* Update the table changing old IP by new IP */ DB_QueryUPDATE ("can not update the IP address of a plugin", - "UPDATE plugins SET IP='%s' WHERE PlgCod=%ld", - NewIP,Plg_EditingPlg->PlgCod); + "UPDATE plg_plugins" + " SET IP='%s'" + " WHERE PlgCod=%ld", + NewIP, + Plg_EditingPlg->PlgCod); /***** Write message to show the change made *****/ Ale_CreateAlert (Ale_SUCCESS,NULL, @@ -1002,14 +1033,16 @@ static void Plg_CreatePlugin (struct Plugin *Plg) { /***** Create a new plugin *****/ DB_QueryINSERT ("can not create plugin", - "INSERT INTO plugins" - " (Name,Description,Logo," - "AppKey,URL,IP)" + "INSERT INTO plg_plugins" + " (Name,Description,Logo,AppKey,URL,IP)" " VALUES" - " ('%s','%s','%s'," - "'%s','%s','%s')", - Plg->Name,Plg->Description,Plg->Logo, - Plg->AppKey,Plg->URL,Plg->IP); + " ('%s','%s','%s','%s','%s','%s')", + Plg->Name, + Plg->Description, + Plg->Logo, + Plg->AppKey, + Plg->URL, + Plg->IP); } /*****************************************************************************/