lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean v14

Browse Source
This commit is contained in:
Laurent Destailleur 2021-07-11 18:56:15 +02:00
parent e1e410ce91
commit 802ac58f9a
5 changed files with 38 additions and 788 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

774
dev/initdemo/mysqldump_dolibarr_14.0.0.sql
View File

File diff suppressed because one or more lines are too long

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

@ -25,6 +25,8 @@
*/
require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
$langs->load("admin");
@ -35,6 +37,10 @@ if (!$user->admin) {
$action = GETPOST('action', 'aZ09');
/*
* Actions
*/
if ($action == 'convert') {
$sql = "ALTER TABLE ".$db->escape(GETPOST("table", "aZ09"))." ENGINE=INNODB";
$db->query($sql);
@ -82,6 +88,7 @@ if (!$base) {
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder">';
print '<tr class="liste_titre">';
print '<td>#</td>';
print '<td>'.$langs->trans("TableName").'</td>';
print '<td colspan="2">'.$langs->trans("Type").'</td>';
print '<td>'.$langs->trans("Format").'</td>';
@ -105,7 +112,18 @@ if (!$base) {
$obj = $db->fetch_object($resql);
print '<tr class="oddeven">';
print '<td><a href="dbtable.php?table='.$obj->Name.'">'.$obj->Name.'</a></td>';
print '<td>'.($i+1).'</td>';
print '<td><a href="dbtable.php?table='.$obj->Name.'">'.$obj->Name.'</a>';
$tablename = preg_replace('/^'.MAIN_DB_PREFIX.'/', 'llx_', $obj->Name);
if (dol_is_file(DOL_DOCUMENT_ROOT.'/install/mysql/tables/'.$tablename.'.sql')) {
$img = "info";
//print img_picto($langs->trans("ExternalModule"), $img);
} else {
$img = "info_black";
//print DOL_DOCUMENT_ROOT.'/install/mysql/tables/'.$tablename.'.sql';
print img_picto($langs->trans("ExternalModule"), $img, 'class="small"');
}
print '</td>';
print '<td>'.$obj->Engine.'</td>';
if (isset($obj->Engine) && $obj->Engine == "MyISAM") {
print '<td><a class="reposition" href="database-tables.php?action=convert&amp;table='.$obj->Name.'">'.$langs->trans("Convert").' InnoDb</a></td>';
@ -142,6 +160,8 @@ if (!$base) {
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder">';
print '<tr class="liste_titre">';
print '<td>#</td>';
print '<td>'.$langs->trans("TableName").'</td>';
print '<td>Nb of tuples</td>';
print '<td>Nb index fetcher.</td>';
@ -160,6 +180,7 @@ if (!$base) {
while ($i < $num) {
$row = $db->fetch_row($resql);
print '<tr class="oddeven">';
print '<td>'.($i+1).'</td>';
print '<td>'.$row[0].'</td>';
print '<td class="right">'.$row[1].'</td>';
print '<td class="right">'.$row[2].'</td>';
@ -179,6 +200,7 @@ if (!$base) {
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder">';
print '<tr class="liste_titre">';
print '<td>#</td>';
print '<td>'.$langs->trans("TableName").'</td>';
print '<td>'.$langs->trans("NbOfRecord").'</td>';
print "</tr>\n";
@ -197,6 +219,7 @@ if (!$base) {
}
print '<tr class="oddeven">';
print '<td>'.($i+1).'</td>';
print '<td>'.$row[0].'</td>';
print '<td>'.$count.'</td>';
print '</tr>';

14
htdocs/install/mysql/migration/13.0.0-14.0.0.sql
View File

@ -569,3 +569,17 @@ create table llx_c_partnership_type
)ENGINE=innodb;
DELETE FROM llx_rights_def WHERE module = 'hrm' AND perms = 'employee';
CREATE TABLE llx_ecm_directories_extrafields
(
rowid integer AUTO_INCREMENT PRIMARY KEY,
tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
fk_object integer NOT NULL,
import_key varchar(14) -- import key
) ENGINE=innodb;
DROP TABLE llx_categorie_association;
DROP TABLE llx_cond_reglement;
DROP TABLE llx_zapier_hook_extrafields;

0
htdocs/install/mysql/tables/llx_ecm_directories_extrafileds.sql → htdocs/install/mysql/tables/llx_ecm_directories_extrafields.sql
View File

13
htdocs/install/upgrade2.php
View File

@ -3439,19 +3439,6 @@ function migrate_categorie_association($db, $langs, $conf)
}
if (!$error) {
// TODO DROP table in the next release
/*
$sqlDrop = "DROP TABLE ".MAIN_DB_PREFIX."categorie_association";
if ($db->query($sqlDrop))
{
$db->commit();
}
else
{
$db->rollback();
}
*/
$db->commit();
} else {
$db->rollback();