1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 08:47:45 +02:00

Dumped sql_query_array, replaced with build_array, posting updates, fixed quoting in mysql layers, fulltext enabled ... speed/problem feedback welcome

git-svn-id: file:///svn/phpbb/trunk@2986 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen
2002-10-30 18:59:09 +00:00
parent 9273252cfc
commit 0a4f369681
14 changed files with 677 additions and 652 deletions

View File

@@ -205,17 +205,17 @@ class sql_db
}
// Idea for this from Ikonboard
function sql_query_array($query = '', $assoc_ary = false)
function sql_build_array($query, $assoc_ary = false)
{
if (!is_array($assoc_ary))
{
return false;
}
if (preg_match('/^INSERT/', $query))
$fields = array();
$values = array();
if ($query == 'INSERT')
{
$fields = array();
$values = array();
foreach ($assoc_ary as $key => $var)
{
$fields[] = $key;
@@ -226,7 +226,7 @@ class sql_db
}
elseif (is_string($var))
{
$values[] = "'" . str_replace("'", "''", $var) . "'";
$values[] = "'" . str_replace('\\\'', '\'\'', $var) . "'";
}
else
{
@@ -236,7 +236,7 @@ class sql_db
$query = $query . ' (' . implode(', ', $fields) . ') VALUES (' . implode(', ', $values) . ')';
}
else
else if ($query == 'UPDATE')
{
$values = array();
foreach ($assoc_ary as $key => $var)
@@ -247,18 +247,16 @@ class sql_db
}
elseif (is_string($var))
{
$values[] = "$key = '" . str_replace("'", "''", $var) . "'";
$values[] = "$key = '" . str_replace('\\\'', '\'\'', $var) . "'";
}
else
{
$values[] = (is_bool($var)) ? "$key = " . intval($var) : "$key = $var";
}
}
$query = preg_replace('/^(.*? SET )(.*?)$/is', '\1' . implode(', ', $values) . ' \2', $query);
}
return $this->sql_query($query);
return implode(', ', $values);
}
//