Skip to content
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

LEAF-4581 - extended character sets #2612

Merged
merged 3 commits into from
Dec 19, 2024
Merged

LEAF-4581 - extended character sets #2612

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d80e29
LEAF-4581 - work on getting emojis to post, also look at the full dat…
Nov 22, 2024
e710967
LEAF-4581 - get the db changes that we will need in place and get the…
Nov 26, 2024
1aae9e4
Merge branch 'rc/2024-12-19/Sprint-86-c2' into feature/LEAF-4581/exte…
shaneodd Dec 19, 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
2 changes: 1 addition & 1 deletion LEAF-Automated-Tests
Open in desktop
Submodule LEAF-Automated-Tests updated 1 files
+24 −0 end2end/README.md
1 change: 1 addition & 0 deletions LEAF_Request_Portal/sources/Form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1095,6 +1095,7 @@ public function isCategory($categoryID)
*/
private function writeDataField($recordID, $key, $series)
{

if (is_array($_POST[$key])) //multiselect, checkbox, grid items
{
$_POST[$key] = XSSHelpers::scrubObjectOrArray($_POST[$key]);
Expand Down
2 changes: 1 addition & 1 deletion LEAF_Request_Portal/sources/FormWorkflow.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1672,7 +1672,7 @@ private function getFields(): array
default:
break;
}
$data = iconv('UTF-8', 'ISO-8859-1//TRANSLIT', $data);
//$data = iconv('UTF-8', 'ISO-8859-1//TRANSLIT', $data);
$formattedFields["content"][$field['indicatorID']] = $data !== "" ? $data : $field["default"];
$formattedFields["to_cc_content"][$field['indicatorID']] = $emailValue;
}
Expand Down
2 changes: 1 addition & 1 deletion app/Leaf/Db.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public function __construct($host, $user, $pass, $database, $abortOnError = fals

$this->isConnected = false;
}

$this->db->exec("SET NAMES 'utf8mb4'");
unset($pass);
}

Expand Down
47 changes: 47 additions & 0 deletions docker/mysql/db/db_upgrade/portal/Update_RMC_DB_2024101500-2024112500.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
START TRANSACTION;

ALTER TABLE `data`
CHANGE `data` `data` text COLLATE 'utf8mb4_general_ci' NOT NULL AFTER `series`,
CHANGE `userID` `userID` varchar(50) COLLATE 'utf8mb4_general_ci' NOT NULL AFTER `timestamp`,
COLLATE 'utf8mb4_general_ci';

ALTER TABLE `data_history`
CHANGE `data` `data` text COLLATE 'utf8mb4_general_ci' NOT NULL AFTER `series`,
CHANGE `userID` `userID` varchar(50) COLLATE 'utf8mb4_general_ci' NOT NULL AFTER `timestamp`,
CHANGE `userDisplay` `userDisplay` varchar(90) COLLATE 'utf8mb4_general_ci' NULL AFTER `userID`,
COLLATE 'utf8mb4_general_ci';

ALTER TABLE `records`
CHANGE `userID` `userID` varchar(50) COLLATE 'utf8mb4_general_ci' NOT NULL AFTER `serviceID`,
CHANGE `title` `title` text COLLATE 'utf8mb4_general_ci' NULL AFTER `userID`,
CHANGE `lastStatus` `lastStatus` text COLLATE 'utf8mb4_general_ci' NULL AFTER `priority`,
COLLATE 'utf8mb4_general_ci';


UPDATE `settings` SET `data` = '2024112500' WHERE `settings`.`setting` = 'dbversion';

COMMIT;

/**** Revert DB ***** NOTE: Data could have issues going back if it contains data that is in the mb4 set
START TRANSACTION;

ALTER TABLE `data`
CHANGE `data` `data` text COLLATE 'utf8mb3_general_ci' NOT NULL AFTER `series`,
CHANGE `userID` `userID` varchar(50) COLLATE 'utf8mb3_general_ci' NOT NULL AFTER `timestamp`,
COLLATE 'utf8mb3_general_ci';

ALTER TABLE `data_history`
CHANGE `data` `data` text COLLATE 'utf8mb3_general_ci' NOT NULL AFTER `series`,
CHANGE `userID` `userID` varchar(50) COLLATE 'utf8mb3_general_ci' NOT NULL AFTER `timestamp`,
CHANGE `userDisplay` `userDisplay` varchar(90) COLLATE 'utf8mb3_general_ci' NULL AFTER `userID`,
COLLATE 'utf8mb3_general_ci';

ALTER TABLE `records`
CHANGE `userID` `userID` varchar(50) COLLATE 'utf8mb3_general_ci' NOT NULL AFTER `serviceID`,
CHANGE `title` `title` text COLLATE 'utf8mb3_general_ci' NULL AFTER `userID`,
COLLATE 'utf8mb3_general_ci';

UPDATE `settings` SET `data` = '2024101500' WHERE `settings`.`setting` = 'dbversion';

COMMIT;
*/
Loading