Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix travis

Browse Source
This commit is contained in:
Laurent Destailleur
2025-08-26 05:33:23 +02:00
parent 4932cd5f7e
commit ff00f13c8f
3 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
htdocs/admin/system/database-tables.php
View File

@@ -32,9 +32,6 @@ if (! defined('CSRFCHECK_WITH_TOKEN')) {
// Load Dolibarr environment
require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
/**
* @var Conf $conf
* @var DoliDB $db
@@ -42,6 +39,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
* @var Translate $langs
* @var User $user
*/
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
$langs->load("admin");
@@ -57,12 +56,12 @@ $action = GETPOST('action', 'aZ09');
* Actions
*/
$sqllog = '';
$logsql = '';
$resultsql = true;
if ($action == 'convert') { // Convert engine into innodb
$sql = "ALTER TABLE ".$db->sanitize($table)." ENGINE=INNODB";
$sqllog .= $sql.'<br>';
$logsql .= $sql.'<br>';
$resultsql = $db->query($sql);
}
if ($action == 'convertutf8') {
@@ -72,14 +71,14 @@ if ($action == 'convertutf8') {
$collation = 'utf8_general_ci';
}
$sql = "ALTER TABLE ".$db->sanitize($table)." CHARACTER SET utf8 COLLATE ".$db->sanitize($collation); // Set the default value on table
$sqllog .= $sql.'<br>';
$logsql .= $sql.'<br>';
$resql1 = $db->query($sql);
if (!$resql1) {
setEventMessages($db->lasterror(), null, 'warnings');
$resultsql = $resql1;
} else {
$sql = "ALTER TABLE ".$db->sanitize($table)." CONVERT TO CHARACTER SET utf8 COLLATE ".$db->sanitize($collation); // Switch fields (may fails due to foreign key)
$sqllog .= $sql.'<br>';
$logsql .= $sql.'<br>';
$resql2 = $db->query($sql);
if (!$resql2) {
setEventMessages($db->lasterror(), null, 'warnings');
@@ -94,14 +93,14 @@ if ($action == 'convertutf8mb4') {
$collation = 'utf8mb4_general_ci';
}
$sql = "ALTER TABLE ".$db->sanitize($table)." CHARACTER SET utf8mb4 COLLATE ".$db->sanitize($collation); // Set the default value on table
$sqllog .= $sql.'<br>';
$logsql .= $sql.'<br>';
$resql1 = $db->query($sql);
if (!$resql1) {
setEventMessages($db->lasterror(), null, 'warnings');
$resultsql = $resql1;
} else {
$sql = "ALTER TABLE ".$db->sanitize($table)." CONVERT TO CHARACTER SET utf8mb4 COLLATE ".$db->sanitize($collation); // Switch fields (may fails due to foreign key)
$sqllog .= $sql.'<br>';
$logsql .= $sql.'<br>';
$resql2 = $db->query($sql);
if (!$resql2) {
setEventMessages($db->lasterror(), null, 'warnings');
@@ -111,7 +110,7 @@ if ($action == 'convertutf8mb4') {
}
if ($action == 'convertdynamic') {
$sql = "ALTER TABLE ".$db->sanitize($table)." ROW_FORMAT=DYNAMIC;";
$sqllog .= $sql.'<br>';
$logsql .= $sql.'<br>';
$resultsql = $db->query($sql);
}
@@ -126,8 +125,8 @@ $linkback = '<a href="'.DOL_URL_ROOT.'/admin/system/database.php?restore_lastsea
print load_fiche_titre($langs->trans("Tables")." ".ucfirst($conf->db->type), $linkback, 'title_setup');
if ($sqllog) {
print info_admin($sqllog.' '.(empty($resultsql) ? ' => KO '.$db->lasterror() : ' => OK'));
if ($logsql) {
print info_admin($logsql.' '.(empty($resultsql) ? ' => KO '.$db->lasterror() : ' => OK'));
}
// Define request to get table description

14
htdocs/admin/system/database.php
View File

@@ -53,27 +53,27 @@ if (!$user->admin) {
* Actions
*/
$sqllog = '';
$logsql = '';
$resultsql = null;
if ($action == 'convertutf8unicode') { // Test on permission already done.
$sql = "ALTER DATABASE ".$db->sanitize($db->database_name)." CHARACTER SET utf8 COLLATE utf8_unicode_ci";
$sqllog .= $sql.'<br>';
$logsql .= $sql.'<br>';
$resultsql = $db->query($sql);
}
if ($action == 'convertutf8mb4unicode') { // Test on permission already done.
$sql = "ALTER DATABASE ".$db->sanitize($db->database_name)." CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci";
$sqllog .= $sql.'<br>';
$logsql .= $sql.'<br>';
$resultsql = $db->query($sql);
}
if ($action == 'convertutf8general') { // Test on permission already done.
$sql = "ALTER DATABASE ".$db->sanitize($db->database_name)." CHARACTER SET utf8 COLLATE utf8_general_ci";
$sqllog .= $sql.'<br>';
$logsql .= $sql.'<br>';
$resultsql = $db->query($sql);
}
if ($action == 'convertutf8mb4general') { // Test on permission already done.
$sql = "ALTER DATABASE ".$db->sanitize($db->database_name)." CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci";
$sqllog .= $sql.'<br>';
$logsql .= $sql.'<br>';
$resultsql = $db->query($sql);
}
@@ -88,8 +88,8 @@ llxHeader('', '', '', '', 0, 0, '', '', '', 'mod-admin page-system_database');
print load_fiche_titre($langs->trans("InfoDatabase"), '', 'title_setup');
if ($sqllog) {
print info_admin($sqllog.' '.(empty($resultsql) ? ' => KO '.$db->lasterror() : ' => OK'));
if ($logsql) {
print info_admin($logsql.' '.(empty($resultsql) ? ' => KO '.$db->lasterror() : ' => OK'));
}
// Database

18
htdocs/admin/system/dbtable.php
View File

@@ -53,12 +53,12 @@ $action = GETPOST('action', 'aZ09');
*/
$sqllog = '';
$logsql = '';
$resultsql = true;
if ($action == 'convertutf8') {
$sql = "SHOW FULL COLUMNS IN ".$db->sanitize($table);
$sqllog .= $sql.'<br>';
$logsql .= $sql.'<br>';
$resql = $db->query($sql);
if ($resql) {
@@ -68,7 +68,7 @@ if ($action == 'convertutf8') {
$row = $db->fetch_row($resql);
if ($row[0] == $field) {
$sql = "ALTER TABLE ".$db->sanitize($table)." MODIFY ".$db->sanitize($row[0])." ".$row[1]." CHARACTER SET utf8"; // We must not sanitize the $row[1]
$sqllog .= $sql.'<br>';
$logsql .= $sql.'<br>';
$db->query($sql);
@@ -79,7 +79,7 @@ if ($action == 'convertutf8') {
}
$sql = "ALTER TABLE ".$db->sanitize($table)." MODIFY ".$db->sanitize($row[0])." ".$row[1]." COLLATE ".$db->sanitize($collation); // We must not sanitize the $row[1]
$sqllog .= $sql.'<br>';
$logsql .= $sql.'<br>';
$resql2 = $db->query($sql);
if (!$resql2) {
@@ -94,7 +94,7 @@ if ($action == 'convertutf8') {
}
if ($action == 'convertutf8mb4') {
$sql = "SHOW FULL COLUMNS IN ".$db->sanitize($table);
$sqllog .= $sql.'<br>';
$logsql .= $sql.'<br>';
$resql = $db->query($sql);
if ($resql) {
@@ -104,7 +104,7 @@ if ($action == 'convertutf8mb4') {
$row = $db->fetch_row($resql);
if ($row[0] == $field) {
$sql = "ALTER TABLE ".$db->sanitize($table)." MODIFY ".$db->sanitize($row[0])." ".$row[1]." CHARACTER SET utf8mb4"; // We must not sanitize the $row[1]
$sqllog .= $sql.'<br>';
$logsql .= $sql.'<br>';
$db->query($sql);
@@ -115,7 +115,7 @@ if ($action == 'convertutf8mb4') {
}
$sql = "ALTER TABLE ".$db->sanitize($table)." MODIFY ".$db->sanitize($row[0])." ".$row[1]." COLLATE ".$db->sanitize($collation); // We must not sanitize the $row[1]
$sqllog .= $sql.'<br>';
$logsql .= $sql.'<br>';
$resql2 = $db->query($sql);
if (!$resql2) {
@@ -140,8 +140,8 @@ $linkback = '<a href="'.DOL_URL_ROOT.'/admin/system/database-tables.php?restore_
print load_fiche_titre($langs->trans("Table")." ".$table, $linkback, 'title_setup');
if ($sqllog) {
print info_admin($sqllog.' '.($resultsql ? ' => OK' : ' => KO '.$db->lasterror()));
if ($logsql) {
print info_admin($logsql.' '.($resultsql ? ' => OK' : ' => KO '.$db->lasterror()));
}
// Define request to get table description