rlkollman/meekrodb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

simplify parser a bit

Browse Source
This commit is contained in:
Sergey Tsalkov
2021-06-20 20:53:31 +00:00
parent bac5503d5a
commit ac626b0795
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
db.class.php
View File

@@ -471,13 +471,7 @@ class MeekroDB {
); );
} }
function parse($query) { protected function preParse($query, $args) {
$args = func_get_args();
array_shift($args);
$query = trim($query);
if (! $args) return $query;
$arg_ct = 0; $arg_ct = 0;
$max_numbered_arg = 0; $max_numbered_arg = 0;
$use_numbered_args = false; $use_numbered_args = false;
@@ -521,6 +515,17 @@ class MeekroDB {
return $this->nonSQLError(sprintf('Expected %d args, but only got %d!', $max_numbered_arg+1, count($args))); return $this->nonSQLError(sprintf('Expected %d args, but only got %d!', $max_numbered_arg+1, count($args)));
} }
return $queryParts;
}
function parse($query) {
$args = func_get_args();
array_shift($args);
$query = trim($query);
if (! $args) return $query;
$queryParts = $this->preParse($query, $args);
$array_types = array('ls', 'li', 'ld', 'lb', 'll', 'lt', 'l?', 'll?', 'hc', 'ha', 'ho'); $array_types = array('ls', 'li', 'ld', 'lb', 'll', 'lt', 'l?', 'll?', 'hc', 'ha', 'ho');
$Map = $this->paramsMap(); $Map = $this->paramsMap();
$query = ''; $query = '';
@@ -534,7 +539,7 @@ class MeekroDB {
$is_array_type = in_array($Part['type'], $array_types, true); $is_array_type = in_array($Part['type'], $array_types, true);
$val = null; $val = null;
if ($use_named_args && !is_null($Part['named_arg'])) { if (!is_null($Part['named_arg'])) {
$key = $Part['named_arg']; $key = $Part['named_arg'];
if (! array_key_exists($key, $args[0])) { if (! array_key_exists($key, $args[0])) {
return $this->nonSQLError("Couldn't find named arg {$key}!"); return $this->nonSQLError("Couldn't find named arg {$key}!");
@@ -542,7 +547,7 @@ class MeekroDB {
$val = $args[0][$key]; $val = $args[0][$key];
} }
else if ($use_numbered_args && !is_null($Part['arg'])) { else if (!is_null($Part['arg'])) {
$key = $Part['arg']; $key = $Part['arg'];
$val = $args[$key]; $val = $args[$key];
} }