From c57dd047fd71d2a61c56b690eabdae9d2406d038 Mon Sep 17 00:00:00 2001 From: Rooty Date: Thu, 15 Dec 2022 00:58:51 +0100 Subject: [PATCH] Remove ignored 8_* files in install/db_scripts/mysql --- .gitignore | 3 ++ .../db_scripts/mysql/8_create_database.sql | 2 +- .../db_scripts/mysql/8_create_structure.sql | 54 +++++++++---------- 3 files changed, 31 insertions(+), 28 deletions(-) diff --git a/.gitignore b/.gitignore index e73bf15..1f1ca13 100644 --- a/.gitignore +++ b/.gitignore @@ -1452,6 +1452,9 @@ install/db_scripts/mysql/ !install/db_scripts/mysql/7_create_database.sql !install/db_scripts/mysql/7_create_structure.sql !install/db_scripts/mysql/7_insert_datas.sql +!install/db_scripts/mysql/8_create_database.sql +!install/db_scripts/mysql/8_create_structure.sql +!install/db_scripts/mysql/8_insert_datas.sql install/media/ !install/media/fond.png diff --git a/install/db_scripts/mysql/8_create_database.sql b/install/db_scripts/mysql/8_create_database.sql index 180abbd..6b39c2e 100755 --- a/install/db_scripts/mysql/8_create_database.sql +++ b/install/db_scripts/mysql/8_create_database.sql @@ -19,5 +19,5 @@ SET time_zone = "+00:00"; #-- Base de données : `{_DATABASE_}` #-- #--CREATE DATABASE IF NOT EXISTS {_DATABASE_} DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; -CREATE DATABASE {_DATABASE_} DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +CREATE DATABASE IF NOT EXISTS {_DATABASE_} DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT 'QWARE\'s database'; #-- -------------------------------------------------------- diff --git a/install/db_scripts/mysql/8_create_structure.sql b/install/db_scripts/mysql/8_create_structure.sql index d0a42cc..782b1b1 100755 --- a/install/db_scripts/mysql/8_create_structure.sql +++ b/install/db_scripts/mysql/8_create_structure.sql @@ -33,7 +33,7 @@ CREATE TABLE `{_PREFIX_}object_node_group_user_temp` ( `user_id` int(4) UNSIGNED NOT NULL DEFAULT 0, `group_id` int(4) UNSIGNED NOT NULL DEFAULT 0, `node_id` int(4) UNSIGNED NOT NULL DEFAULT 0 -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; #-- -------------------------------------------------------- #-- #-- Structure de la table `object_textentrynode` @@ -44,7 +44,7 @@ CREATE TABLE `{_PREFIX_}object_textentrynode` ( `textentrynode_resume` text CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL, `textentrynode_text` text CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL, `langue_id` int(4) UNSIGNED NOT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; #-- -------------------------------------------------------- #-- #-- Structure de la table `object_textinfo` @@ -53,7 +53,7 @@ CREATE TABLE `{_PREFIX_}object_textinfo` ( `textinfo_id` int(4) UNSIGNED NOT NULL DEFAULT 0, `textinfo_text_fr` text CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL, `textinfo_text_gb` text CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; #-- -------------------------------------------------------- #-- #-- Structure de la table `object_user_temp` @@ -84,7 +84,7 @@ CREATE TABLE `{_PREFIX_}object_user_temp` ( `user_info` text CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL, `user_charte_status` tinyint(4) NOT NULL DEFAULT 0, `user_account_active` enum('on','off') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'off' -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci PACK_KEYS=0; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci PACK_KEYS=0; #-- -------------------------------------------------------- #-- #-- Structure de la table `package_backup` @@ -93,7 +93,7 @@ CREATE TABLE `{_PREFIX_}package_backup` ( `backup_id` int(4) NOT NULL, `backup_libelle` varchar(250) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '', `backup_date` int(14) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; #-- -------------------------------------------------------- #-- #-- Structure de la table `package_backupbd` @@ -102,7 +102,7 @@ CREATE TABLE `{_PREFIX_}package_backupbd` ( `backupbd_id` int(4) UNSIGNED NOT NULL, `backupbd_nom` varchar(250) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '', `backup_id` int(4) UNSIGNED NOT NULL DEFAULT 0 -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; #-- -------------------------------------------------------- #-- #-- Structure de la table `package_backupfile` @@ -112,7 +112,7 @@ CREATE TABLE `{_PREFIX_}package_backupfile` ( `backupfile_new_name` varchar(250) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '', `backupfile_old_name` varchar(250) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '', `backup_id` int(4) UNSIGNED NOT NULL DEFAULT 0 -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; #-- -------------------------------------------------------- #-- #-- Structure de la table `package_file` @@ -128,7 +128,7 @@ CREATE TABLE `{_PREFIX_}package_file` ( `coordination_object_id` int(4) UNSIGNED NOT NULL DEFAULT 0, `user_id` int(4) NOT NULL DEFAULT 0, `file_limit_owner` tinyint(1) NOT NULL DEFAULT 0 -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; #-- -------------------------------------------------------- #-- #-- Structure de la table `package_filedata` @@ -139,7 +139,7 @@ CREATE TABLE `{_PREFIX_}package_filedata` ( `filedata_data` blob NOT NULL, `node_id` int(4) UNSIGNED NOT NULL DEFAULT 0, `coordination_object_id` int(4) UNSIGNED NOT NULL DEFAULT 0 -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; #-- -------------------------------------------------------- #-- #-- Structure de la table `package_user_space` @@ -149,7 +149,7 @@ CREATE TABLE `{_PREFIX_}package_user_space` ( `node_id` int(4) UNSIGNED NOT NULL DEFAULT 0, `user_id` int(4) UNSIGNED NOT NULL DEFAULT 0, `user_space` int(10) NOT NULL DEFAULT 0 -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; #-- -------------------------------------------------------- #-- #-- Structure de la table `cache_list_user_group` @@ -158,7 +158,7 @@ CREATE TABLE `{_PREFIX_}cache_list_user_group` ( `cache_id` int(4) UNSIGNED NOT NULL DEFAULT 0, `cache_index` int(4) UNSIGNED NOT NULL DEFAULT 0, `cache_data` blob NOT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; #-- -------------------------------------------------------- #-- #-- Structure de la table `cache_list_user_node` @@ -167,7 +167,7 @@ CREATE TABLE `{_PREFIX_}cache_list_user_node` ( `cache_id` int(4) UNSIGNED NOT NULL DEFAULT 0, `cache_index` int(4) UNSIGNED NOT NULL DEFAULT 0, `cache_data` blob NOT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; #-- -------------------------------------------------------- #-- #-- Structure de la table `cache_permission` @@ -176,7 +176,7 @@ CREATE TABLE `{_PREFIX_}cache_permission` ( `cache_id` int(4) UNSIGNED NOT NULL DEFAULT 0, `cache_index` int(4) UNSIGNED NOT NULL DEFAULT 0, `cache_data` blob NOT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; #-- -------------------------------------------------------- #-- #-- Structure de la table `cache_tree_group` @@ -185,7 +185,7 @@ CREATE TABLE `{_PREFIX_}cache_tree_group` ( `cache_id` int(4) UNSIGNED NOT NULL DEFAULT 0, `cache_index` int(4) UNSIGNED NOT NULL DEFAULT 0, `cache_data` blob NOT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; #-- -------------------------------------------------------- #-- #-- Structure de la table `cache_tree_node` @@ -194,7 +194,7 @@ CREATE TABLE `{_PREFIX_}cache_tree_node` ( `cache_id` int(4) UNSIGNED NOT NULL DEFAULT 0, `cache_index` int(4) UNSIGNED NOT NULL DEFAULT 0, `cache_data` blob NOT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; #-- -------------------------------------------------------- #-- #-- Structure de la table `coordination_object` @@ -212,7 +212,7 @@ CREATE TABLE `{_PREFIX_}coordination_object` ( `coordination_object_parution` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `coordination_object_archivage` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `coordination_object_data` blob NOT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci PACK_KEYS=0; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci PACK_KEYS=0; #-- -------------------------------------------------------- #-- #-- Structure de la table `group` @@ -222,7 +222,7 @@ CREATE TABLE `{_PREFIX_}group` ( `group_group_id` int(4) UNSIGNED NOT NULL DEFAULT 0, `group_libelle` text CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL, `group_icone` varchar(200) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '' -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; #-- -------------------------------------------------------- #-- #-- Structure de la table `group_user` @@ -231,7 +231,7 @@ CREATE TABLE `{_PREFIX_}group_user` ( `group_user_id` int(4) UNSIGNED NOT NULL, `user_id` int(4) UNSIGNED NOT NULL DEFAULT 0, `group_id` int(4) UNSIGNED NOT NULL DEFAULT 0 -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci PACK_KEYS=0 CHECKSUM=1 DELAY_KEY_WRITE=1; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci PACK_KEYS=0 CHECKSUM=1 DELAY_KEY_WRITE=1; #-- -------------------------------------------------------- #-- @@ -242,7 +242,7 @@ CREATE TABLE `{_PREFIX_}langue` ( `langue_libelle` text CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL, `langue_code` varchar(100) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '', `langue_status` int(2) UNSIGNED NOT NULL DEFAULT 0 -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; #-- -------------------------------------------------------- #-- #-- Structure de la table `node` @@ -263,7 +263,7 @@ CREATE TABLE `{_PREFIX_}node` ( `node_subsgroupid` int(3) DEFAULT 0, `node_subsgrouptempid` int(3) DEFAULT 0, `node_mailnode` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; #-- -------------------------------------------------------- #-- #-- Structure de la table `nodesettings` @@ -279,7 +279,7 @@ CREATE TABLE `sys_nodesettings` ( `node_nextcloud` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, `node_twitter` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, `node_facebook` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; #-- -------------------------------------------------------- #-- #-- Structure de la table `node_group_user` @@ -289,7 +289,7 @@ CREATE TABLE `{_PREFIX_}node_group_user` ( `user_id` int(4) UNSIGNED NOT NULL DEFAULT 0, `group_id` int(4) UNSIGNED NOT NULL DEFAULT 0, `node_id` int(4) UNSIGNED NOT NULL DEFAULT 0 -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; #-- -------------------------------------------------------- #-- #-- Structure de la table `node_space` @@ -298,7 +298,7 @@ CREATE TABLE `{_PREFIX_}package_node_space` ( `node_space_id` int(4) UNSIGNED NOT NULL, `node_space_nid` int(4) UNSIGNED NOT NULL DEFAULT 0, `node_space` int(10) UNSIGNED NOT NULL DEFAULT 0 -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; #-- -------------------------------------------------------- #-- #-- Structure de la table `right` @@ -311,7 +311,7 @@ CREATE TABLE `{_PREFIX_}right` ( `node_id` int(4) UNSIGNED NOT NULL DEFAULT 0, `user_id` int(4) UNSIGNED NOT NULL DEFAULT 0, `group_id` int(4) UNSIGNED NOT NULL DEFAULT 0 -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci PACK_KEYS=0; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci PACK_KEYS=0; #-- -------------------------------------------------------- #-- #-- Structure de la table `session` @@ -328,7 +328,7 @@ CREATE TABLE `{_PREFIX_}session` ( `user_session_entry_node_id` int(4) NOT NULL DEFAULT 0, `user_session_navigation_node_id` int(4) NOT NULL DEFAULT 0, `user_session_vars` longblob NOT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; #-- -------------------------------------------------------- #-- #-- Structure de la table `user` @@ -359,7 +359,7 @@ CREATE TABLE `{_PREFIX_}user` ( `user_info` text CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '', `user_charte_status` tinyint(4) NOT NULL DEFAULT 0, `user_account_active` enum('on','off') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'off' -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci PACK_KEYS=0; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci PACK_KEYS=0; #-- -------------------------------------------------------- #-- @@ -370,7 +370,7 @@ CREATE TABLE `{_PREFIX_}user_preference` ( `langue_id` int(4) UNSIGNED NOT NULL DEFAULT 0, `entry_node_id` int(4) UNSIGNED NOT NULL DEFAULT 0, `right_id` int(4) UNSIGNED NOT NULL DEFAULT 0 -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; #-- #-- Index pour la table `{_PREFIX_}cache_list_user_group`