Merge branch 'develop'

CHANGELOG.md

@@ -5,9 +5,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
 ### Added
-- added tbl_commands to system database
+- added tbl_commands to myems_system_db in database
 - added command actions to myems-api
 - added command feature to myems-admin
+- added tbl_new_users to myems_user_db in database
 
 ### Changed
 - updated tranlations of myems-admin

database/install/myems_user_db.sql

@@ -28,9 +28,9 @@ CREATE TABLE IF NOT EXISTS `myems_user_db`.`tbl_users` (
   `failed_login_count` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`));
 
-  -- --------------------------------------------------------------------------------------------------------------------
-  -- Example Data for table `myems_user_db`.`tbl_users`
-  -- --------------------------------------------------------------------------------------------------------------------
+-- --------------------------------------------------------------------------------------------------------------------
+-- Example Data for table `myems_user_db`.`tbl_users`
+-- --------------------------------------------------------------------------------------------------------------------
 START TRANSACTION;
 USE `myems_user_db`;
 -- default username: administrator
@@ -79,6 +79,21 @@ CREATE TABLE IF NOT EXISTS `myems_user_db`.`tbl_logs` (
   PRIMARY KEY (`id`));
 CREATE INDEX `tbl_logs_index_1` ON  `myems_user_db`.`tbl_logs`  (`user_uuid`, `request_datetime_utc`, `request_method`);
 
+-- ---------------------------------------------------------------------------------------------------------------------
+-- Table `myems_user_db`.`tbl_new_users`
+-- ---------------------------------------------------------------------------------------------------------------------
+DROP TABLE IF EXISTS `myems_user_db`.`tbl_new_users` ;
+
+CREATE TABLE IF NOT EXISTS `myems_user_db`.`tbl_new_users` (
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `name` VARCHAR(128) NOT NULL,
+  `uuid` CHAR(36) NOT NULL,
+  `display_name` VARCHAR(128) NOT NULL,
+  `email` VARCHAR(128) NOT NULL,
+  `salt` VARCHAR(128) NOT NULL,
+  `password` VARCHAR(256) NOT NULL,
+  PRIMARY KEY (`id`));
+
 -- ---------------------------------------------------------------------------------------------------------------------
 -- Table `myems_user_db`.`tbl_notifications`
 -- ---------------------------------------------------------------------------------------------------------------------

database/upgrade/upgrade3.4.0RC.sql

@@ -138,6 +138,21 @@ CREATE TABLE IF NOT EXISTS `myems_system_db`.`tbl_microgrids_sensors` (
   PRIMARY KEY (`id`));
 CREATE INDEX `tbl_microgrids_sensors_index_1` ON  `myems_system_db`.`tbl_microgrids_sensors`   (`microgrid_id`);
 
+-- ---------------------------------------------------------------------------------------------------------------------
+-- Table `myems_user_db`.`tbl_new_users`
+-- ---------------------------------------------------------------------------------------------------------------------
+DROP TABLE IF EXISTS `myems_user_db`.`tbl_new_users` ;
+
+CREATE TABLE IF NOT EXISTS `myems_user_db`.`tbl_new_users` (
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `name` VARCHAR(128) NOT NULL,
+  `uuid` CHAR(36) NOT NULL,
+  `display_name` VARCHAR(128) NOT NULL,
+  `email` VARCHAR(128) NOT NULL,
+  `salt` VARCHAR(128) NOT NULL,
+  `password` VARCHAR(256) NOT NULL,
+  PRIMARY KEY (`id`));
+
 -- UPDATE VERSION NUMBER
 UPDATE `myems_system_db`.`tbl_versions` SET version='3.4.0RC', release_date='2023-06-16' WHERE id=1;