Fix phpunit
This commit is contained in:
parent
070b17f397
commit
ba489369dd
1 changed files with 8 additions and 8 deletions
|
|
@ -1324,7 +1324,7 @@ if ($ok && GETPOST('force_utf8_on_tables', 'alpha')) {
|
|||
foreach ($arrayofforeignkey as $tmptable => $foreignkeyname) {
|
||||
if ($table[0] == $tmptable) {
|
||||
print '<tr><td colspan="2">';
|
||||
$sqltmp = 'ALTER TABLE '.$table[0].' DROP FOREIGN KEY '.$foreignkeyname;
|
||||
$sqltmp = "ALTER TABLE ".$db->sanitize($table[0])." DROP FOREIGN KEY ".$db->sanitize($foreignkeyname);
|
||||
print $sqltmp;
|
||||
if ($force_utf8_on_tables == 'confirmed') {
|
||||
$resqltmp = $db->query($sqltmp);
|
||||
|
|
@ -1349,8 +1349,8 @@ if ($ok && GETPOST('force_utf8_on_tables', 'alpha')) {
|
|||
|
||||
print '<tr><td colspan="2">';
|
||||
print $table[0];
|
||||
$sql1 = "ALTER TABLE ".$table[0]." ROW_FORMAT=dynamic";
|
||||
$sql2 = "ALTER TABLE ".$table[0]." CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci";
|
||||
$sql1 = "ALTER TABLE ".$db->sanitize($table[0])." ROW_FORMAT=dynamic";
|
||||
$sql2 = "ALTER TABLE ".$db->sanitize($table[0])." CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci";
|
||||
print '<!-- '.$sql1.' -->';
|
||||
print '<!-- '.$sql2.' -->';
|
||||
if ($force_utf8_on_tables == 'confirmed') {
|
||||
|
|
@ -1371,7 +1371,7 @@ if ($ok && GETPOST('force_utf8_on_tables', 'alpha')) {
|
|||
|
||||
// Restore dropped foreign keys
|
||||
foreach ($foreignkeystorestore as $tmptable => $foreignkeyname) {
|
||||
$stringtofindinline = 'ALTER TABLE .* ADD CONSTRAINT '.$foreignkeyname;
|
||||
$stringtofindinline = "ALTER TABLE .* ADD CONSTRAINT ".$db->sanitize($foreignkeyname);
|
||||
$fileforkeys = DOL_DOCUMENT_ROOT.'/install/mysql/tables/'.$tmptable.'.key.sql';
|
||||
//print 'Search in '.$fileforkeys.' to get '.$stringtofindinline."<br>\n";
|
||||
|
||||
|
|
@ -1448,7 +1448,7 @@ if ($ok && GETPOST('force_utf8mb4_on_tables', 'alpha')) {
|
|||
foreach ($arrayofforeignkey as $tmptable => $foreignkeyname) {
|
||||
if ($table[0] == $tmptable) {
|
||||
print '<tr><td colspan="2">';
|
||||
$sqltmp = 'ALTER TABLE '.$table[0].' DROP FOREIGN KEY '.$foreignkeyname;
|
||||
$sqltmp = "ALTER TABLE ".$db->sanitize($table[0])." DROP FOREIGN KEY ".$db->sanitize($foreignkeyname);
|
||||
print $sqltmp;
|
||||
if ($force_utf8mb4_on_tables == 'confirmed') {
|
||||
$resqltmp = $db->query($sqltmp);
|
||||
|
|
@ -1473,8 +1473,8 @@ if ($ok && GETPOST('force_utf8mb4_on_tables', 'alpha')) {
|
|||
|
||||
print '<tr><td colspan="2">';
|
||||
print $table[0];
|
||||
$sql1 = "ALTER TABLE ".$table[0]." ROW_FORMAT=dynamic";
|
||||
$sql2 = "ALTER TABLE ".$table[0]." CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci";
|
||||
$sql1 = "ALTER TABLE ".$db->sanitize($table[0])." ROW_FORMAT=dynamic";
|
||||
$sql2 = "ALTER TABLE ".$db->sanitize($table[0])." CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci";
|
||||
print '<!-- '.$sql1.' -->';
|
||||
print '<!-- '.$sql2.' -->';
|
||||
if ($force_utf8mb4_on_tables == 'confirmed') {
|
||||
|
|
@ -1495,7 +1495,7 @@ if ($ok && GETPOST('force_utf8mb4_on_tables', 'alpha')) {
|
|||
|
||||
// Restore dropped foreign keys
|
||||
foreach ($foreignkeystorestore as $tmptable => $foreignkeyname) {
|
||||
$stringtofindinline = 'ALTER TABLE .* ADD CONSTRAINT '.$foreignkeyname;
|
||||
$stringtofindinline = "ALTER TABLE .* ADD CONSTRAINT ".$db->sanitize($foreignkeyname);
|
||||
$fileforkeys = DOL_DOCUMENT_ROOT.'/install/mysql/tables/'.$tmptable.'.key.sql';
|
||||
//print 'Search in '.$fileforkeys.' to get '.$stringtofindinline."<br>\n";
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue