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

FIX: GetNextValue() adding regexsql() function

Browse Source
This commit is contained in:
Noé Courtier 2022-11-10 17:10:51 +01:00
parent 026404657d
commit c12a6bd4d1
3 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
htdocs/core/db/DoliDB.class.php
View File

@ -79,6 +79,25 @@ abstract class DoliDB implements Database
{
return 'IF('.$test.','.$resok.','.$resko.')';
}
/**
* Format a SQL REGEXP
*
* @param string $subject string tested
* @param string $pattern SQL pattern to match
* @param string $sqlstring whether or not the string being tested is an SQL expression
* @return string SQL string
*/
public function regexpsql($subject, $pattern, $sqlstring = false)
{
if ($sqlstring) {
return "(". $subject ." REGEXP '" . $pattern . "')";
}
return "('". $subject ."' REGEXP '" . $pattern . "')";
}
/**
* Convert (by PHP) a GM Timestamp date into a string date with PHP server TZ to insert into a date field.

18
htdocs/core/db/pgsql.class.php
View File

@ -724,6 +724,24 @@ class DoliDBPgsql extends DoliDB
return '(CASE WHEN '.$test.' THEN '.$resok.' ELSE '.$resko.' END)';
}
/**
* Format a SQL REGEXP
*
* @param string $subject string tested
* @param string $pattern SQL pattern to match
* @param string $sqlstring whether or not the string being tested is an SQL expression
* @return string SQL string
*/
public function regexpsql($subject, $pattern, $sqlstring = false)
{
if ($sqlstring) {
return "(". $subject ." ~ '" . $pattern . "')";
}
return "('". $subject ."' ~ '" . $pattern . "')";
}
/**
* Renvoie le code erreur generique de l'operation precedente.
*

7
htdocs/core/lib/functions2.lib.php
View File

@ -1282,6 +1282,11 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
$sql .= " FROM ".MAIN_DB_PREFIX.$table;
$sql .= " WHERE ".$field." LIKE '".$db->escape($maskLike)."'";
$sql .= " AND ".$field." NOT LIKE '(PROV%)'";
// To ensure that all variables within the MAX() brackets are integers
$sql .= " AND ". $db->regexpsql($sqlstring, '^[0-9]+$', true);
if ($bentityon) { // only if entity enable
$sql .= " AND entity IN (".getEntity($sharetable).")";
} elseif (!empty($forceentity)) {
@ -1293,7 +1298,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
if ($sqlwhere) {
$sql .= ' AND '.$sqlwhere;
}
//print $sql.'<br>';
dol_syslog("functions2::get_next_value mode=".$mode."", LOG_DEBUG);
$resql = $db->query($sql);