From a00c376f12f186882be493d243ef4d717922b234 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Wed, 8 Mar 2017 21:05:42 +0100 Subject: [PATCH] Version 16.154.2 --- sql/swad.sql | 4 +-- swad_assignment.h | 4 +-- swad_changelog.h | 7 +++- swad_database.c | 90 +++++++++++++++++++++++------------------------ 4 files changed, 55 insertions(+), 50 deletions(-) diff --git a/sql/swad.sql b/sql/swad.sql index 77460dce0..6f52eff1c 100644 --- a/sql/swad.sql +++ b/sql/swad.sql @@ -94,8 +94,8 @@ CREATE TABLE IF NOT EXISTS assignments ( UsrCod INT NOT NULL, StartTime DATETIME NOT NULL, EndTime DATETIME NOT NULL, - Title VARCHAR(255) NOT NULL, - Folder VARBINARY(32) NOT NULL, + Title VARCHAR(2047) NOT NULL, + Folder VARBINARY(255) NOT NULL, Txt TEXT NOT NULL, UNIQUE INDEX(AsgCod), INDEX(CrsCod,Hidden)); diff --git a/swad_assignment.h b/swad_assignment.h index 8d1375b01..4e164b31f 100644 --- a/swad_assignment.h +++ b/swad_assignment.h @@ -38,8 +38,8 @@ #define Asg_MAX_CHARS_ASSIGNMENT_TITLE (128 - 1) // 127 #define Asg_MAX_BYTES_ASSIGNMENT_TITLE ((Asg_MAX_CHARS_ASSIGNMENT_TITLE + 1) * Str_MAX_BYTES_PER_CHAR - 1) // 2047 -#define Asg_MAX_CHARS_FOLDER 32 -#define Asg_MAX_BYTES_FOLDER Asg_MAX_CHARS_FOLDER +#define Asg_MAX_CHARS_FOLDER NAME_MAX // 255 +#define Asg_MAX_BYTES_FOLDER Asg_MAX_CHARS_FOLDER // 255 #define Asg_NUM_TYPES_SEND_WORK 2 typedef enum diff --git a/swad_changelog.h b/swad_changelog.h index 1733ef96d..e59459aae 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -204,13 +204,18 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.154.1 (2017-03-08)" +#define Log_PLATFORM_VERSION "SWAD 16.154.2 (2017-03-08)" #define CSS_FILE "swad16.147.css" #define JS_FILE "swad16.144.js" // Number of lines (includes comments but not blank lines) has been got with the following command: // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*?.h sql/swad*.sql | tail -1 /* + Version 16.154.2: Mar 08, 2017 Adjusting size of database fields. (216466 lines) + 2 changes necessary in database: +ALTER TABLE assignments CHANGE COLUMN Title Title VARCHAR(2047) NOT NULL; +ALTER TABLE assignments CHANGE COLUMN Folder Folder VARBINARY(255) NOT NULL; + Version 16.154.1: Mar 08, 2017 Adjusting size of database fields. (216462 lines) 2 changes necessary in database: ALTER TABLE agendas CHANGE COLUMN Event Event VARCHAR(2047) NOT NULL; diff --git a/swad_database.c b/swad_database.c index a6bebcabf..d4f606e2a 100644 --- a/swad_database.c +++ b/swad_database.c @@ -103,12 +103,12 @@ mysql> DESCRIBE IP_prefs; 8 rows in set (0.01 sec) */ DB_CreateTable ("CREATE TABLE IF NOT EXISTS IP_prefs (" - "IP CHAR(15) NOT NULL," // Cns_MAX_BYTES_IP + "IP CHAR(15) NOT NULL," // Cns_MAX_BYTES_IP "UsrCod INT NOT NULL DEFAULT -1," "LastChange DATETIME NOT NULL," "FirstDayOfWeek TINYINT NOT NULL DEFAULT 0," - "Theme CHAR(16) NOT NULL," // The_MAX_BYTES_THEME_ID - "IconSet CHAR(16) NOT NULL," // Ico_MAX_BYTES_ICON_SET_ID + "Theme CHAR(16) NOT NULL," // The_MAX_BYTES_THEME_ID + "IconSet CHAR(16) NOT NULL," // Ico_MAX_BYTES_ICON_SET_ID "Menu TINYINT NOT NULL DEFAULT 0," "SideCols TINYINT NOT NULL," "PRIMARY KEY (IP)," @@ -132,7 +132,7 @@ mysql> DESCRIBE actions; "ActCod INT NOT NULL DEFAULT -1," "Language CHAR(2) NOT NULL," "Obsolete ENUM('N','Y') NOT NULL DEFAULT 'N'," - "Txt VARCHAR(255) NOT NULL," // Act_MAX_BYTES_ACTION_TXT + "Txt VARCHAR(255) NOT NULL," // Act_MAX_BYTES_ACTION_TXT "UNIQUE INDEX(ActCod,Language)," "INDEX(Txt))"); @@ -200,8 +200,8 @@ mysql> DESCRIBE agendas; "Hidden ENUM('N','Y') NOT NULL DEFAULT 'N'," "StartTime DATETIME NOT NULL," "EndTime DATETIME NOT NULL," - "Event VARCHAR(2047) NOT NULL," // Agd_MAX_BYTES_EVENT - "Location VARCHAR(2047) NOT NULL," // Agd_MAX_BYTES_LOCATION + "Event VARCHAR(2047) NOT NULL," // Agd_MAX_BYTES_EVENT + "Location VARCHAR(2047) NOT NULL," // Agd_MAX_BYTES_LOCATION "Txt TEXT NOT NULL," "UNIQUE INDEX(AgdCod)," "INDEX(UsrCod,Public,Hidden))"); @@ -218,8 +218,8 @@ mysql> DESCRIBE ann_seen; 2 rows in set (0.00 sec) */ DB_CreateTable ("CREATE TABLE IF NOT EXISTS ann_seen (" - "AnnCod INT NOT NULL," - "UsrCod INT NOT NULL," + "AnnCod INT NOT NULL," + "UsrCod INT NOT NULL," "UNIQUE INDEX(AnnCod,UsrCod))"); /***** Table announcements *****/ @@ -237,13 +237,13 @@ mysql> DESCRIBE announcements; 5 rows in set (0.00 sec) */ DB_CreateTable ("CREATE TABLE IF NOT EXISTS announcements (" - "AnnCod INT NOT NULL AUTO_INCREMENT," - "Status TINYINT NOT NULL DEFAULT 0," - "Roles INT NOT NULL DEFAULT 0," - "Subject TEXT NOT NULL," - "Content TEXT NOT NULL," - "UNIQUE INDEX(AnnCod)," - "INDEX(Status))"); + "AnnCod INT NOT NULL AUTO_INCREMENT," + "Status TINYINT NOT NULL DEFAULT 0," + "Roles INT NOT NULL DEFAULT 0," + "Subject TEXT NOT NULL," // Cns_MAX_BYTES_SUBJECT + "Content TEXT NOT NULL," // Cns_MAX_BYTES_TEXT + "UNIQUE INDEX(AnnCod)," + "INDEX(Status))"); /***** Table asg_grp *****/ /* @@ -257,42 +257,42 @@ mysql> DESCRIBE asg_grp; 2 rows in set (0.00 sec) */ DB_CreateTable ("CREATE TABLE IF NOT EXISTS asg_grp (" - "AsgCod INT NOT NULL," - "GrpCod INT NOT NULL," - "UNIQUE INDEX(AsgCod,GrpCod))"); + "AsgCod INT NOT NULL," + "GrpCod INT NOT NULL," + "UNIQUE INDEX(AsgCod,GrpCod))"); /***** Table assignments *****/ /* mysql> DESCRIBE assignments; -+-----------+---------------+------+-----+---------+----------------+ -| Field | Type | Null | Key | Default | Extra | -+-----------+---------------+------+-----+---------+----------------+ -| AsgCod | int(11) | NO | PRI | NULL | auto_increment | -| CrsCod | int(11) | NO | MUL | -1 | | -| Hidden | enum('N','Y') | NO | | N | | -| NumNotif | int(11) | NO | | 0 | | -| UsrCod | int(11) | NO | | NULL | | -| StartTime | datetime | NO | | NULL | | -| EndTime | datetime | NO | | NULL | | -| Title | varchar(255) | NO | | NULL | | -| Folder | varbinary(32) | NO | | NULL | | -| Txt | text | NO | | NULL | | -+-----------+---------------+------+-----+---------+----------------+ -10 rows in set (0.00 sec) ++-----------+----------------+------+-----+---------+----------------+ +| Field | Type | Null | Key | Default | Extra | ++-----------+----------------+------+-----+---------+----------------+ +| AsgCod | int(11) | NO | PRI | NULL | auto_increment | +| CrsCod | int(11) | NO | MUL | -1 | | +| Hidden | enum('N','Y') | NO | | N | | +| NumNotif | int(11) | NO | | 0 | | +| UsrCod | int(11) | NO | | NULL | | +| StartTime | datetime | NO | | NULL | | +| EndTime | datetime | NO | | NULL | | +| Title | varchar(2047) | NO | | NULL | | +| Folder | varbinary(255) | NO | | NULL | | +| Txt | text | NO | | NULL | | ++-----------+----------------+------+-----+---------+----------------+ +10 rows in set (0,00 sec) */ DB_CreateTable ("CREATE TABLE IF NOT EXISTS assignments (" - "AsgCod INT NOT NULL AUTO_INCREMENT," - "CrsCod INT NOT NULL DEFAULT -1," - "Hidden ENUM('N','Y') NOT NULL DEFAULT 'N'," - "NumNotif INT NOT NULL DEFAULT 0," - "UsrCod INT NOT NULL," - "StartTime DATETIME NOT NULL," - "EndTime DATETIME NOT NULL," - "Title VARCHAR(255) NOT NULL," - "Folder VARBINARY(32) NOT NULL," - "Txt TEXT NOT NULL," - "UNIQUE INDEX(AsgCod)," - "INDEX(CrsCod,Hidden))"); + "AsgCod INT NOT NULL AUTO_INCREMENT," + "CrsCod INT NOT NULL DEFAULT -1," + "Hidden ENUM('N','Y') NOT NULL DEFAULT 'N'," + "NumNotif INT NOT NULL DEFAULT 0," + "UsrCod INT NOT NULL," + "StartTime DATETIME NOT NULL," + "EndTime DATETIME NOT NULL," + "Title VARCHAR(2047) NOT NULL," // Asg_MAX_BYTES_ASSIGNMENT_TITLE + "Folder VARBINARY(255) NOT NULL," // Asg_MAX_BYTES_FOLDER + "Txt TEXT NOT NULL," // Cns_MAX_BYTES_TEXT + "UNIQUE INDEX(AsgCod)," + "INDEX(CrsCod,Hidden))"); /***** Table att_events *****/ /*