is a web application for booking meeting rooms or other resources (using PHP and MySQL/pgsql).
| tables.my.sql (mrbs-1.9.4) | : | tables.my.sql (mrbs-1.10.0) |
|---|
| | |
| skipping to change at line 83 | | skipping to change at line 83 |
|---|
| default_type char DEFAULT 'E' NOT NULL, | | default_type char DEFAULT 'E' NOT NULL, |
| | |
| PRIMARY KEY (id), | | PRIMARY KEY (id), |
| UNIQUE KEY uq_area_name (area_name) | | UNIQUE KEY uq_area_name (area_name) |
| ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; | | ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; |
| | |
| CREATE TABLE mrbs_room | | CREATE TABLE mrbs_room |
| ( | | ( |
| id int NOT NULL auto_increment, | | id int NOT NULL auto_increment, |
| disabled tinyint DEFAULT 0 NOT NULL, | | disabled tinyint DEFAULT 0 NOT NULL, |
|
| area_id int DEFAULT '0' NOT NULL, | | area_id int DEFAULT 0 NOT NULL, |
| room_name varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci
DEFAULT '' NOT NULL, | | room_name varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci
DEFAULT '' NOT NULL, |
| sort_key varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci
DEFAULT '' NOT NULL, | | sort_key varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci
DEFAULT '' NOT NULL, |
| description varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, | | description varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, |
|
| capacity int DEFAULT '0' NOT NULL, | | capacity int DEFAULT 0 NOT NULL, |
| room_admin_email text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, | | room_admin_email text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, |
| invalid_types varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci
DEFAULT NULL COMMENT 'JSON encoded', | | invalid_types varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci
DEFAULT NULL COMMENT 'JSON encoded', |
| custom_html text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, | | custom_html text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, |
| | |
| PRIMARY KEY (id), | | PRIMARY KEY (id), |
| FOREIGN KEY (area_id) | | FOREIGN KEY (area_id) |
| REFERENCES mrbs_area(id) | | REFERENCES mrbs_area(id) |
| ON UPDATE CASCADE | | ON UPDATE CASCADE |
| ON DELETE RESTRICT, | | ON DELETE RESTRICT, |
| UNIQUE KEY uq_room_name (area_id, room_name), | | UNIQUE KEY uq_room_name (area_id, room_name), |
| KEY idxSortKey (sort_key) | | KEY idxSortKey (sort_key) |
| ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; | | ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; |
| | |
| CREATE TABLE mrbs_repeat | | CREATE TABLE mrbs_repeat |
| ( | | ( |
| id int NOT NULL auto_increment, | | id int NOT NULL auto_increment, |
|
| start_time int DEFAULT '0' NOT NULL COMMENT 'Unix timestamp', | | start_time int DEFAULT 0 NOT NULL COMMENT 'Unix timestamp', |
| end_time int DEFAULT '0' NOT NULL COMMENT 'Unix timestamp', | | end_time int DEFAULT 0 NOT NULL COMMENT 'Unix timestamp', |
| rep_type int DEFAULT '0' NOT NULL, | | rep_type int DEFAULT 0 NOT NULL, |
| end_date int DEFAULT '0' NOT NULL COMMENT 'Unix timestamp', | | end_date int DEFAULT 0 NOT NULL COMMENT 'Unix timestamp', |
| rep_opt varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DE
FAULT '' NOT NULL, | | rep_opt varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DE
FAULT '' NOT NULL, |
|
| room_id int DEFAULT '1' NOT NULL, | | room_id int DEFAULT 1 NOT NULL, |
| timestamp timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
, | | timestamp timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
, |
| create_by varchar(80) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DE
FAULT '' NOT NULL, | | create_by varchar(80) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DE
FAULT '' NOT NULL, |
| modified_by varchar(80) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DE
FAULT '' NOT NULL, | | modified_by varchar(80) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DE
FAULT '' NOT NULL, |
| name varchar(80) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DE
FAULT '' NOT NULL, | | name varchar(80) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DE
FAULT '' NOT NULL, |
| type char DEFAULT 'E' NOT NULL, | | type char DEFAULT 'E' NOT NULL, |
| description text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, | | description text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, |
| rep_interval smallint DEFAULT 1 NOT NULL, | | rep_interval smallint DEFAULT 1 NOT NULL, |
| month_absolute smallint DEFAULT NULL, | | month_absolute smallint DEFAULT NULL, |
| month_relative varchar(4) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEF
AULT NULL, | | month_relative varchar(4) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEF
AULT NULL, |
| status tinyint unsigned NOT NULL DEFAULT 0, | | status tinyint unsigned NOT NULL DEFAULT 0, |
| | |
| skipping to change at line 137 | | skipping to change at line 137 |
|---|
| PRIMARY KEY (id), | | PRIMARY KEY (id), |
| FOREIGN KEY (room_id) | | FOREIGN KEY (room_id) |
| REFERENCES mrbs_room(id) | | REFERENCES mrbs_room(id) |
| ON UPDATE CASCADE | | ON UPDATE CASCADE |
| ON DELETE RESTRICT | | ON DELETE RESTRICT |
| ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; | | ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; |
| | |
| CREATE TABLE mrbs_entry | | CREATE TABLE mrbs_entry |
| ( | | ( |
| id int NOT NULL auto_increment, | | id int NOT NULL auto_increment, |
|
| start_time int DEFAULT '0' NOT NULL COMMENT 'Unix timestamp', | | start_time int DEFAULT 0 NOT NULL COMMENT 'Unix timestamp', |
| end_time int DEFAULT '0' NOT NULL COMMENT 'Unix timestamp', | | end_time int DEFAULT 0 NOT NULL COMMENT 'Unix timestamp', |
| entry_type int DEFAULT '0' NOT NULL, | | entry_type int DEFAULT 0 NOT NULL, |
| repeat_id int DEFAULT NULL, | | repeat_id int DEFAULT NULL, |
|
| room_id int DEFAULT '1' NOT NULL, | | room_id int DEFAULT 1 NOT NULL, |
| timestamp timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURR
ENT_TIMESTAMP, | | timestamp timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURR
ENT_TIMESTAMP, |
| create_by varchar(80) CHARACTER SET utf8mb4 COLLATE utf8mb4_
unicode_ci DEFAULT '' NOT NULL, | | create_by varchar(80) CHARACTER SET utf8mb4 COLLATE utf8mb4_
unicode_ci DEFAULT '' NOT NULL, |
| modified_by varchar(80) CHARACTER SET utf8mb4 COLLATE utf8mb4_
unicode_ci DEFAULT '' NOT NULL, | | modified_by varchar(80) CHARACTER SET utf8mb4 COLLATE utf8mb4_
unicode_ci DEFAULT '' NOT NULL, |
| name varchar(80) CHARACTER SET utf8mb4 COLLATE utf8mb4_
unicode_ci DEFAULT '' NOT NULL, | | name varchar(80) CHARACTER SET utf8mb4 COLLATE utf8mb4_
unicode_ci DEFAULT '' NOT NULL, |
| type char DEFAULT 'E' NOT NULL, | | type char DEFAULT 'E' NOT NULL, |
| description text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode
_ci, | | description text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode
_ci, |
| status tinyint unsigned NOT NULL DEFAULT 0, | | status tinyint unsigned NOT NULL DEFAULT 0, |
| reminded int, | | reminded int, |
| info_time int, | | info_time int, |
| info_user varchar(80) CHARACTER SET utf8mb4 COLLATE utf8mb4_
unicode_ci, | | info_user varchar(80) CHARACTER SET utf8mb4 COLLATE utf8mb4_
unicode_ci, |
| | |
| skipping to change at line 234 | | skipping to change at line 234 |
|---|
| /* Note that there is a limit on the length of keys which imposes a constraint | | /* Note that there is a limit on the length of keys which imposes a constraint |
| on the size of VARCHAR that can be keyed */ | | on the size of VARCHAR that can be keyed */ |
| PRIMARY KEY (id), | | PRIMARY KEY (id), |
| KEY idxAccess (access) | | KEY idxAccess (access) |
| | |
| ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; | | ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; |
| | |
| CREATE TABLE mrbs_users | | CREATE TABLE mrbs_users |
| ( | | ( |
| id int NOT NULL auto_increment, | | id int NOT NULL auto_increment, |
|
| level smallint DEFAULT '0' NOT NULL, /* play safe and give no rig
hts */ | | level smallint DEFAULT 0 NOT NULL, /* play safe and give no right
s */ |
| name varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci
, | | name varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci
, |
| display_name varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_c
i, | | display_name varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_c
i, |
| password_hash varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_c
i, | | password_hash varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_c
i, |
| email varchar(75) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci
, | | email varchar(75) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci
, |
| timestamp timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMEST
AMP, | | timestamp timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMEST
AMP, |
| last_login int DEFAULT '0' NOT NULL, | | last_login int DEFAULT '0' NOT NULL, |
| reset_key_hash varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_c
i DEFAULT NULL, | | reset_key_hash varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_c
i DEFAULT NULL, |
| reset_key_expiry int DEFAULT 0 NOT NULL, | | reset_key_expiry int DEFAULT 0 NOT NULL, |
| | |
| PRIMARY KEY (id), | | PRIMARY KEY (id), |
| UNIQUE KEY uq_name (name) | | UNIQUE KEY uq_name (name) |
| ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; | | ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; |
| | |
| INSERT INTO mrbs_variables (variable_name, variable_content) | | INSERT INTO mrbs_variables (variable_name, variable_content) |
|
| VALUES ( 'db_version', '81'); | | VALUES ( 'db_version', '82'); |
| INSERT INTO mrbs_variables (variable_name, variable_content) | | INSERT INTO mrbs_variables (variable_name, variable_content) |
| VALUES ( 'local_db_version', '1'); | | VALUES ( 'local_db_version', '1'); |
| | | |
| End of changes. 8 change blocks. |
|---|
| 13 lines changed or deleted | | 13 lines changed or added |
|---|
"Fossies" - the Fresh Open Source Software Archive 