Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
commit
726657fd4c
@ -170,10 +170,12 @@ class CodingSqlTest extends PHPUnit\Framework\TestCase
|
|||||||
$langs=$this->savlangs;
|
$langs=$this->savlangs;
|
||||||
$db=$this->savdb;
|
$db=$this->savdb;
|
||||||
|
|
||||||
$a = 'abc"\'def';
|
if ($db->type == 'mysqli') {
|
||||||
print $a;
|
$a = 'abc"\'def';
|
||||||
$result = $db->escape($a); // $result must be abc\"\'def
|
print $a;
|
||||||
$this->assertEquals('abc\"\\\'def', $result);
|
$result = $db->escape($a); // $result must be abc\"\'def with mysql
|
||||||
|
$this->assertEquals('abc\"\\\'def', $result);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -191,7 +193,7 @@ class CodingSqlTest extends PHPUnit\Framework\TestCase
|
|||||||
|
|
||||||
$a = 'abc"\'def_ghi%klm\\nop';
|
$a = 'abc"\'def_ghi%klm\\nop';
|
||||||
//print $a;
|
//print $a;
|
||||||
$result = $db->escapeforlike($a); // $result must be abc"'def\_ghi\%klm\\nop
|
$result = $db->escapeforlike($a); // $result must be abc"'def\_ghi\%klm\\nop with mysql
|
||||||
$this->assertEquals('abc"\'def\_ghi\%klm\\\\nop', $result);
|
$this->assertEquals('abc"\'def\_ghi\%klm\\\\nop', $result);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user