Alias functions usage.

This commit is contained in:
Yuriy Pikhtarev 2017-05-05 00:57:55 +03:00
commit 4a79c081b5
No known key found for this signature in database
GPG key ID: 3A9B5A757B48ECC6
53 changed files with 199 additions and 199 deletions

View file

@ -461,34 +461,34 @@ class sql_db
$fields[] = $field;
$values[] = $this->escape($val, $check_type, $dont_escape);
}
$fields = join(', ', $fields);
$values = join(', ', $values);
$fields = implode(', ', $fields);
$values = implode(', ', $values);
$query = "($fields)\nVALUES\n($values)";
} elseif ($query_type == 'INSERT_SELECT') {
foreach ($input_ary as $field => $val) {
$fields[] = $field;
$values[] = $this->escape($val, $check_type, $dont_escape);
}
$fields = join(', ', $fields);
$values = join(', ', $values);
$fields = implode(', ', $fields);
$values = implode(', ', $values);
$query = "($fields)\nSELECT\n$values";
} elseif ($query_type == 'MULTI_INSERT') {
foreach ($input_ary as $id => $sql_ary) {
foreach ($sql_ary as $field => $val) {
$values[] = $this->escape($val, $check_type, $dont_escape);
}
$ary[] = '(' . join(', ', $values) . ')';
$ary[] = '(' . implode(', ', $values) . ')';
$values = [];
}
$fields = join(', ', array_keys($input_ary[0]));
$values = join(",\n", $ary);
$fields = implode(', ', array_keys($input_ary[0]));
$values = implode(",\n", $ary);
$query = "($fields)\nVALUES\n$values";
} elseif ($query_type == 'SELECT' || $query_type == 'UPDATE') {
foreach ($input_ary as $field => $val) {
$ary[] = "$field = " . $this->escape($val, $check_type, $dont_escape);
}
$glue = ($query_type == 'SELECT') ? "\nAND " : ",\n";
$query = join($glue, $ary);
$query = implode($glue, $ary);
}
if (!$query) {
@ -529,31 +529,31 @@ class sql_db
foreach ($sql_ary as $clause => $ary) {
switch ($clause) {
case 'SELECT':
$sql .= ($ary) ? ' SELECT ' . join(' ', $sql_ary['select_options']) . ' ' . join(', ', $ary) : '';
$sql .= ($ary) ? ' SELECT ' . implode(' ', $sql_ary['select_options']) . ' ' . implode(', ', $ary) : '';
break;
case 'FROM':
$sql .= ($ary) ? ' FROM ' . join(', ', $ary) : '';
$sql .= ($ary) ? ' FROM ' . implode(', ', $ary) : '';
break;
case 'INNER JOIN':
$sql .= ($ary) ? ' INNER JOIN ' . join(' INNER JOIN ', $ary) : '';
$sql .= ($ary) ? ' INNER JOIN ' . implode(' INNER JOIN ', $ary) : '';
break;
case 'LEFT JOIN':
$sql .= ($ary) ? ' LEFT JOIN ' . join(' LEFT JOIN ', $ary) : '';
$sql .= ($ary) ? ' LEFT JOIN ' . implode(' LEFT JOIN ', $ary) : '';
break;
case 'WHERE':
$sql .= ($ary) ? ' WHERE ' . join(' AND ', $ary) : '';
$sql .= ($ary) ? ' WHERE ' . implode(' AND ', $ary) : '';
break;
case 'GROUP BY':
$sql .= ($ary) ? ' GROUP BY ' . join(', ', $ary) : '';
$sql .= ($ary) ? ' GROUP BY ' . implode(', ', $ary) : '';
break;
case 'HAVING':
$sql .= ($ary) ? ' HAVING ' . join(' AND ', $ary) : '';
$sql .= ($ary) ? ' HAVING ' . implode(' AND ', $ary) : '';
break;
case 'ORDER BY':
$sql .= ($ary) ? ' ORDER BY ' . join(', ', $ary) : '';
$sql .= ($ary) ? ' ORDER BY ' . implode(', ', $ary) : '';
break;
case 'LIMIT':
$sql .= ($ary) ? ' LIMIT ' . join(', ', $ary) : '';
$sql .= ($ary) ? ' LIMIT ' . implode(', ', $ary) : '';
break;
}
}
@ -643,7 +643,7 @@ class sql_db
foreach ((array)$tables as $table_name) {
$tables_sql[] = "$table_name $lock_type";
}
if ($tables_sql = join(', ', $tables_sql)) {
if ($tables_sql = implode(', ', $tables_sql)) {
$this->locked = $this->sql_query("LOCK TABLES $tables_sql");
}
@ -913,7 +913,7 @@ class sql_db
$msg[] = sprintf('%05d', getmypid());
$msg[] = $this->db_server;
$msg[] = short_query($this->cur_query);
$msg = join(LOG_SEPR, $msg);
$msg = implode(LOG_SEPR, $msg);
$msg .= ($info = $this->query_info()) ? ' # ' . $info : '';
$msg .= ' # ' . $this->debug_find_source() . ' ';
$msg .= defined('IN_CRON') ? 'cron' : basename($_SERVER['REQUEST_URI']);