Skip to content

Switch to utf8mb4 #415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
effgarces merged 4 commits into from
Sep 30, 2024
Merged

Switch to utf8mb4 #415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c26d115
Remove clean.sql files
Sep 15, 2024
b53e633
Set uf8mb4 in mysqli connection
Sep 15, 2024
b6064af
Add database upgrade files
Sep 15, 2024
7ce4847
Set utf8mb4 as default charset for all tables
Sep 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 0 additions & 23 deletions database_schema/upgrades/2.1/clean.sql
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions database_schema/upgrades/2.2/clean.sql
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion database_schema/upgrades/2.3/clean.sql
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion database_schema/upgrades/2.4/clean.sql
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion database_schema/upgrades/2.5/clean.sql
View file
Open in desktop

This file was deleted.

Empty file removed database_schema/upgrades/2.6/clean.sql
View file
Open in desktop
Empty file.
Empty file removed database_schema/upgrades/2.8/clean.sql
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions database_schema/upgrades/2.9/data.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
insert into `dbversion` values('2.9', now());
138 changes: 138 additions & 0 deletions database_schema/upgrades/2.9/schema.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
ALTER TABLE `accessories`
CHANGE COLUMN `accessory_name` `accessory_name` VARCHAR(85) CHARACTER SET 'utf8mb4' NOT NULL ;

ALTER TABLE `announcements`
CHANGE COLUMN `announcement_text` `announcement_text` TEXT CHARACTER SET 'utf8mb4' NOT NULL ;

ALTER TABLE `blackout_series`
CHANGE COLUMN `title` `title` VARCHAR(85) CHARACTER SET 'utf8mb4' NOT NULL ,
CHANGE COLUMN `description` `description` TEXT CHARACTER SET 'utf8mb4' NULL DEFAULT NULL ;

ALTER TABLE `credit_log`
CHANGE COLUMN `credit_note` `credit_note` VARCHAR(1000) CHARACTER SET 'utf8mb4' NULL DEFAULT NULL ;

ALTER TABLE `custom_attribute_values`
CHANGE COLUMN `attribute_value` `attribute_value` TEXT CHARACTER SET 'utf8mb4' NOT NULL ;

ALTER TABLE `custom_attributes`
CHANGE COLUMN `display_label` `display_label` VARCHAR(50) CHARACTER SET 'utf8mb4' NOT NULL ,
CHANGE COLUMN `validation_regex` `validation_regex` VARCHAR(50) CHARACTER SET 'utf8mb4' NULL DEFAULT NULL ,
CHANGE COLUMN `possible_values` `possible_values` TEXT CHARACTER SET 'utf8mb4' NULL DEFAULT NULL ;

ALTER TABLE `groups`
CHANGE COLUMN `name` `name` VARCHAR(85) CHARACTER SET 'utf8mb4' NOT NULL ;

ALTER TABLE `reminders`
CHANGE COLUMN `address` `address` TEXT CHARACTER SET 'utf8mb4' NOT NULL ,
CHANGE COLUMN `message` `message` TEXT CHARACTER SET 'utf8mb4' NOT NULL ;

ALTER TABLE `reservation_series`
CHANGE COLUMN `title` `title` VARCHAR(300) CHARACTER SET 'utf8mb4' NULL DEFAULT NULL ,
CHANGE COLUMN `description` `description` TEXT CHARACTER SET 'utf8mb4' NULL DEFAULT NULL ;

ALTER TABLE `reservation_types`
CHANGE COLUMN `label` `label` VARCHAR(85) CHARACTER SET 'utf8mb4' NOT NULL ;

ALTER TABLE `resource_groups`
CHANGE COLUMN `resource_group_name` `resource_group_name` VARCHAR(75) CHARACTER SET 'utf8mb4' NULL DEFAULT NULL ;

ALTER TABLE `resource_status_reasons`
CHANGE COLUMN `description` `description` VARCHAR(100) CHARACTER SET 'utf8mb4' NULL DEFAULT NULL ;

ALTER TABLE `resource_types`
CHANGE COLUMN `resource_type_name` `resource_type_name` VARCHAR(75) CHARACTER SET 'utf8mb4' NULL DEFAULT NULL ,
CHANGE COLUMN `resource_type_description` `resource_type_description` TEXT CHARACTER SET 'utf8mb4' NULL DEFAULT NULL ;

ALTER TABLE `resources`
CHANGE COLUMN `name` `name` VARCHAR(85) CHARACTER SET 'utf8mb4' NOT NULL ,
CHANGE COLUMN `location` `location` VARCHAR(255) CHARACTER SET 'utf8mb4' NULL DEFAULT NULL ,
CHANGE COLUMN `contact_info` `contact_info` VARCHAR(255) CHARACTER SET 'utf8mb4' NULL DEFAULT NULL ,
CHANGE COLUMN `description` `description` TEXT CHARACTER SET 'utf8mb4' NULL DEFAULT NULL ,
CHANGE COLUMN `notes` `notes` TEXT CHARACTER SET 'utf8mb4' NULL DEFAULT NULL ,
CHANGE COLUMN `additional_properties` `additional_properties` TEXT CHARACTER SET 'utf8mb4' NULL DEFAULT NULL ;

ALTER TABLE `saved_reports`
CHANGE COLUMN `report_name` `report_name` VARCHAR(50) CHARACTER SET 'utf8mb4' NULL DEFAULT NULL ;

ALTER TABLE `schedules`
CHANGE COLUMN `name` `name` VARCHAR(85) CHARACTER SET 'utf8mb4' NOT NULL ,
CHANGE COLUMN `additional_properties` `additional_properties` TEXT CHARACTER SET 'utf8mb4' NULL DEFAULT NULL ;

ALTER TABLE `terms_of_service`
CHANGE COLUMN `terms_text` `terms_text` TEXT CHARACTER SET 'utf8mb4' NULL DEFAULT NULL ,
CHANGE COLUMN `applicability` `applicability` VARCHAR(50) CHARACTER SET 'utf8mb4' NULL DEFAULT NULL ;

ALTER TABLE `time_blocks`
CHANGE COLUMN `label` `label` VARCHAR(85) CHARACTER SET 'utf8mb4' NULL DEFAULT NULL ,
CHANGE COLUMN `end_label` `end_label` VARCHAR(85) CHARACTER SET 'utf8mb4' NULL DEFAULT NULL ;

ALTER TABLE `user_statuses`
CHANGE COLUMN `description` `description` VARCHAR(85) CHARACTER SET 'utf8mb4' NULL DEFAULT NULL ;

ALTER TABLE `users`
CHANGE COLUMN `fname` `fname` VARCHAR(85) CHARACTER SET 'utf8mb4' NULL DEFAULT NULL ,
CHANGE COLUMN `lname` `lname` VARCHAR(85) CHARACTER SET 'utf8mb4' NULL DEFAULT NULL ,
CHANGE COLUMN `username` `username` VARCHAR(85) CHARACTER SET 'utf8mb4' NULL DEFAULT NULL ,
CHANGE COLUMN `organization` `organization` VARCHAR(85) CHARACTER SET 'utf8mb4' NULL DEFAULT NULL ,
CHANGE COLUMN `position` `position` VARCHAR(85) CHARACTER SET 'utf8mb4' NULL DEFAULT NULL ,
CHANGE COLUMN `phone` `phone` VARCHAR(85) CHARACTER SET 'utf8mb4' NULL DEFAULT NULL ;

ALTER TABLE `accessories` DEFAULT CHARSET utf8mb4;
ALTER TABLE `account_activation` DEFAULT CHARSET utf8mb4;
ALTER TABLE `announcement_groups` DEFAULT CHARSET utf8mb4;
ALTER TABLE `announcement_resources` DEFAULT CHARSET utf8mb4;
ALTER TABLE `announcements` DEFAULT CHARSET utf8mb4;
ALTER TABLE `blackout_instances` DEFAULT CHARSET utf8mb4;
ALTER TABLE `blackout_series` DEFAULT CHARSET utf8mb4;
ALTER TABLE `blackout_series_resources` DEFAULT CHARSET utf8mb4;
ALTER TABLE `credit_log` DEFAULT CHARSET utf8mb4;
ALTER TABLE `custom_attribute_entities` DEFAULT CHARSET utf8mb4;
ALTER TABLE `custom_attribute_values` DEFAULT CHARSET utf8mb4;
ALTER TABLE `custom_attributes` DEFAULT CHARSET utf8mb4;
ALTER TABLE `custom_time_blocks` DEFAULT CHARSET utf8mb4;
ALTER TABLE `dbversion` DEFAULT CHARSET utf8mb4;
ALTER TABLE `group_resource_permissions` DEFAULT CHARSET utf8mb4;
ALTER TABLE `group_roles` DEFAULT CHARSET utf8mb4;
ALTER TABLE `groups` DEFAULT CHARSET utf8mb4;
ALTER TABLE `layouts` DEFAULT CHARSET utf8mb4;
ALTER TABLE `payment_configuration` DEFAULT CHARSET utf8mb4;
ALTER TABLE `payment_gateway_settings` DEFAULT CHARSET utf8mb4;
ALTER TABLE `payment_transaction_log` DEFAULT CHARSET utf8mb4;
ALTER TABLE `peak_times` DEFAULT CHARSET utf8mb4;
ALTER TABLE `pending_reservations` DEFAULT CHARSET utf8mb4;
ALTER TABLE `quotas` DEFAULT CHARSET utf8mb4;
ALTER TABLE `refund_transaction_log` DEFAULT CHARSET utf8mb4;
ALTER TABLE `reminders` DEFAULT CHARSET utf8mb4;
ALTER TABLE `reservation_accessories` DEFAULT CHARSET utf8mb4;
ALTER TABLE `reservation_color_rules` DEFAULT CHARSET utf8mb4;
ALTER TABLE `reservation_files` DEFAULT CHARSET utf8mb4;
ALTER TABLE `reservation_guests` DEFAULT CHARSET utf8mb4;
ALTER TABLE `reservation_instances` DEFAULT CHARSET utf8mb4;
ALTER TABLE `reservation_reminders` DEFAULT CHARSET utf8mb4;
ALTER TABLE `reservation_resources` DEFAULT CHARSET utf8mb4;
ALTER TABLE `reservation_series` DEFAULT CHARSET utf8mb4;
ALTER TABLE `reservation_statuses` DEFAULT CHARSET utf8mb4;
ALTER TABLE `reservation_types` DEFAULT CHARSET utf8mb4;
ALTER TABLE `reservation_users` DEFAULT CHARSET utf8mb4;
ALTER TABLE `reservation_waitlist_requests` DEFAULT CHARSET utf8mb4;
ALTER TABLE `resource_accessories` DEFAULT CHARSET utf8mb4;
ALTER TABLE `resource_group_assignment` DEFAULT CHARSET utf8mb4;
ALTER TABLE `resource_groups` DEFAULT CHARSET utf8mb4;
ALTER TABLE `resource_images` DEFAULT CHARSET utf8mb4;
ALTER TABLE `resource_status_reasons` DEFAULT CHARSET utf8mb4;
ALTER TABLE `resource_type_assignment` DEFAULT CHARSET utf8mb4;
ALTER TABLE `resource_types` DEFAULT CHARSET utf8mb4;
ALTER TABLE `resources` DEFAULT CHARSET utf8mb4;
ALTER TABLE `roles` DEFAULT CHARSET utf8mb4;
ALTER TABLE `saved_reports` DEFAULT CHARSET utf8mb4;
ALTER TABLE `schedules` DEFAULT CHARSET utf8mb4;
ALTER TABLE `terms_of_service` DEFAULT CHARSET utf8mb4;
ALTER TABLE `time_blocks` DEFAULT CHARSET utf8mb4;
ALTER TABLE `user_email_preferences` DEFAULT CHARSET utf8mb4;
ALTER TABLE `user_groups` DEFAULT CHARSET utf8mb4;
ALTER TABLE `user_preferences` DEFAULT CHARSET utf8mb4;
ALTER TABLE `user_resource_permissions` DEFAULT CHARSET utf8mb4;
ALTER TABLE `user_session` DEFAULT CHARSET utf8mb4;
ALTER TABLE `user_statuses` DEFAULT CHARSET utf8mb4;
ALTER TABLE `users` DEFAULT CHARSET utf8mb4;
ALTER TABLE `users_customers` DEFAULT CHARSET utf8mb4;
2 changes: 1 addition & 1 deletion lib/Database/MySQL/MySqlConnection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public function Connect()

$this->_db = @mysqli_connect($this->_hostSpec, $this->_dbUser, $this->_dbPassword, $this->_dbName, $this->_port);
$selected = @mysqli_select_db($this->_db, $this->_dbName);
@mysqli_set_charset($this->_db, 'utf8');
@mysqli_set_charset($this->_db, 'utf8mb4');

if (!$this->_db || !$selected) {
Log::Error("Error connecting to database\nCheck your database settings in the config file\n%s", @mysqli_error($this->_db));
Expand Down
1 change: 0 additions & 1 deletion phing-tasks/UpgradeDbTask.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ private function ExecuteUpgrade($upgradeDir, $upgrade)

print("Upgrading database to version $upgrade\n");

// $this->ExecuteFile($fullUpgradeDir, 'clean.sql');
$this->ExecuteFile($fullUpgradeDir, 'schema.sql');
$this->ExecuteFile($fullUpgradeDir, 'data.sql');

Expand Down