X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fdba.php;h=586fc092fb764c51b9c54587f167b30570b51c20;hb=0ccb29c4dfa709c279168209a53e38f6fc863807;hp=74e9d7c061dd3b62c8641e1a87257efcb1e58b75;hpb=404ed27fb41e3e2c0c1a00f53b35b602a5d40d02;p=friendica.git diff --git a/include/dba.php b/include/dba.php index 74e9d7c061..586fc092fb 100644 --- a/include/dba.php +++ b/include/dba.php @@ -1,8 +1,10 @@ config["system"]["db_charset"])) { - mysql_set_charset($a->config["system"]["db_charset"], self::$db); - } - } - } - // No suitable SQL driver was found. if (!self::$connected) { self::$db = null; - if (!$install) { - system_unavailable(); - } } $a->save_timestamp($stamp1, "network"); - return true; + return self::$connected; } /** @@ -134,9 +116,6 @@ class dba { case 'mysqli': self::$_server_info = self::$db->server_info; break; - case 'mysql': - self::$_server_info = mysql_get_server_info(self::$db); - break; } } return self::$_server_info; @@ -158,7 +137,7 @@ class dba { * * @param string $query The database query that will be analyzed */ - private static function log_index($query) { + private static function logIndex($query) { $a = get_app(); if (empty($a->config["system"]["db_log_index"])) { @@ -171,12 +150,12 @@ class dba { } // Only do the explain on "select", "update" and "delete" - if (!in_array(strtolower(substr($query, 0, 6)), array("select", "update", "delete"))) { + if (!in_array(strtolower(substr($query, 0, 6)), ["select", "update", "delete"])) { return; } $r = self::p("EXPLAIN ".$query); - if (!dbm::is_result($r)) { + if (!DBM::is_result($r)) { return; } @@ -201,7 +180,7 @@ class dba { if ($log) { $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); - @file_put_contents($a->config["system"]["db_log_index"], datetime_convert()."\t". + @file_put_contents($a->config["system"]["db_log_index"], DateTimeFormat::utcNow()."\t". $row['key']."\t".$row['rows']."\t".$row['Extra']."\t". basename($backtrace[1]["file"])."\t". $backtrace[1]["line"]."\t".$backtrace[2]["function"]."\t". @@ -216,8 +195,6 @@ class dba { return substr(@self::$db->quote($str, PDO::PARAM_STR), 1, -1); case 'mysqli': return @self::$db->real_escape_string($str); - case 'mysql': - return @mysql_real_escape_string($str,self::$db); } } @@ -227,7 +204,7 @@ class dba { switch (self::$driver) { case 'pdo': $r = dba::p("SELECT 1"); - if (dbm::is_result($r)) { + if (DBM::is_result($r)) { $row = dba::inArray($r); $connected = ($row[0]['1'] == '1'); } @@ -235,9 +212,6 @@ class dba { case 'mysqli': $connected = self::$db->ping(); break; - case 'mysql': - $connected = mysql_ping(self::$db); - break; } return $connected; } @@ -272,8 +246,8 @@ class dba { * @return string The input SQL string modified if necessary. */ public static function clean_query($sql) { - $search = array("\t", "\n", "\r", " "); - $replace = array(' ', ' ', ' ', ' '); + $search = ["\t", "\n", "\r", " "]; + $replace = [' ', ' ', ' ', ' ']; do { $oldsql = $sql; $sql = str_replace($search, $replace, $sql); @@ -290,7 +264,7 @@ class dba { * @param array $args The parameters that are to replace the ? placeholders * @return string The replaced SQL query */ - private static function replace_parameters($sql, $args) { + private static function replaceParameters($sql, $args) { $offset = 0; foreach ($args AS $param => $value) { if (is_int($args[$param]) || is_float($args[$param])) { @@ -332,7 +306,7 @@ class dba { * For all regular queries please use dba::select or dba::exists * * @param string $sql SQL statement - * @return object statement object + * @return bool|object statement object */ public static function p($sql) { $a = get_app(); @@ -343,7 +317,7 @@ class dba { // Renumber the array keys to be sure that they fit $i = 0; - $args = array(); + $args = []; foreach ($params AS $param) { // Avoid problems with some MySQL servers and boolean values. See issue #3645 if (is_bool($param)) { @@ -427,11 +401,11 @@ class dba { // There are SQL statements that cannot be executed with a prepared statement $parts = explode(' ', $orig_sql); $command = strtolower($parts[0]); - $can_be_prepared = in_array($command, array('select', 'update', 'insert', 'delete')); + $can_be_prepared = in_array($command, ['select', 'update', 'insert', 'delete']); // The fallback routine is called as well when there are no arguments if (!$can_be_prepared || (count($args) == 0)) { - $retval = self::$db->query(self::replace_parameters($sql, $args)); + $retval = self::$db->query(self::replaceParameters($sql, $args)); if (self::$db->errno) { self::$error = self::$db->error; self::$errorno = self::$db->errno; @@ -456,7 +430,7 @@ class dba { } $params = ''; - $values = array(); + $values = []; foreach ($args AS $param => $value) { if (is_int($args[$param])) { $params .= 'i'; @@ -472,7 +446,7 @@ class dba { if (count($values) > 0) { array_unshift($values, $params); - call_user_func_array(array($stmt, 'bind_param'), $values); + call_user_func_array([$stmt, 'bind_param'], $values); } if (!$stmt->execute()) { @@ -485,22 +459,6 @@ class dba { self::$affected_rows = $retval->affected_rows; } break; - case 'mysql': - // For the old "mysql" functions we cannot use prepared statements - $retval = mysql_query(self::replace_parameters($sql, $args), self::$db); - if (mysql_errno(self::$db)) { - self::$error = mysql_error(self::$db); - self::$errorno = mysql_errno(self::$db); - } else { - self::$affected_rows = mysql_affected_rows($retval); - - // Due to missing mysql_* support this here wasn't tested at all - // See here: http://php.net/manual/en/function.mysql-num-rows.php - if (self::$affected_rows <= 0) { - self::$affected_rows = mysql_num_rows($retval); - } - } - break; } // We are having an own error logging in the function "e" @@ -510,7 +468,7 @@ class dba { $errorno = self::$errorno; logger('DB Error '.self::$errorno.': '.self::$error."\n". - System::callstack(8)."\n".self::replace_parameters($sql, $params)); + System::callstack(8)."\n".self::replaceParameters($sql, $params)); self::$error = $error; self::$errorno = $errorno; @@ -527,10 +485,10 @@ class dba { $duration = round($duration, 3); $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); - @file_put_contents($a->config["system"]["db_log"], datetime_convert()."\t".$duration."\t". + @file_put_contents($a->config["system"]["db_log"], DateTimeFormat::utcNow()."\t".$duration."\t". basename($backtrace[1]["file"])."\t". $backtrace[1]["line"]."\t".$backtrace[2]["function"]."\t". - substr(self::replace_parameters($sql, $args), 0, 2000)."\n", FILE_APPEND); + substr(self::replaceParameters($sql, $args), 0, 2000)."\n", FILE_APPEND); } } return $retval; @@ -575,7 +533,7 @@ class dba { $errorno = self::$errorno; logger('DB Error '.self::$errorno.': '.self::$error."\n". - System::callstack(8)."\n".self::replace_parameters($sql, $params)); + System::callstack(8)."\n".self::replaceParameters($sql, $params)); self::$error = $error; self::$errorno = $errorno; @@ -599,15 +557,15 @@ class dba { return false; } - $fields = array(); + $fields = []; - $array_element = each($condition); - $array_key = $array_element['key']; - if (!is_int($array_key)) { - $fields = array($array_key); + reset($condition); + $first_key = key($condition); + if (!is_int($first_key)) { + $fields = [$first_key]; } - $stmt = self::select($table, $fields, $condition, array('limit' => 1, 'only_query' => true)); + $stmt = self::select($table, $fields, $condition, ['limit' => 1]); if (is_bool($stmt)) { $retval = $stmt; @@ -621,10 +579,11 @@ class dba { } /** - * @brief Fetches the first row + * Fetches the first row * - * Please use dba::select or dba::exists whenever this is possible. + * Please use dba::selectFirst or dba::exists whenever this is possible. * + * @brief Fetches the first row * @param string $sql SQL statement * @return array first row of query */ @@ -668,15 +627,13 @@ class dba { return $stmt->columnCount(); case 'mysqli': return $stmt->field_count; - case 'mysql': - return mysql_affected_rows($stmt); } return 0; } /** * @brief Returns the number of rows of a statement * - * @param object Statement object + * @param PDOStatement|mysqli_result|mysqli_stmt Statement object * @return int Number of rows */ public static function num_rows($stmt) { @@ -688,8 +645,6 @@ class dba { return $stmt->rowCount(); case 'mysqli': return $stmt->num_rows; - case 'mysql': - return mysql_num_rows($stmt); } return 0; } @@ -697,33 +652,41 @@ class dba { /** * @brief Fetch a single row * - * @param object $stmt statement object + * @param mixed $stmt statement object * @return array current row */ public static function fetch($stmt) { + $a = get_app(); + + $stamp1 = microtime(true); + + $columns = []; + if (!is_object($stmt)) { return false; } switch (self::$driver) { case 'pdo': - return $stmt->fetch(PDO::FETCH_ASSOC); + $columns = $stmt->fetch(PDO::FETCH_ASSOC); + break; case 'mysqli': if (get_class($stmt) == 'mysqli_result') { - return $stmt->fetch_assoc(); + $columns = $stmt->fetch_assoc(); + break; } // This code works, but is slow // Bind the result to a result array - $cols = array(); + $cols = []; - $cols_num = array(); + $cols_num = []; for ($x = 0; $x < $stmt->field_count; $x++) { $cols[] = &$cols_num[$x]; } - call_user_func_array(array($stmt, 'bind_result'), $cols); + call_user_func_array([$stmt, 'bind_result'], $cols); if (!$stmt->fetch()) { return false; @@ -735,14 +698,14 @@ class dba { $result = $stmt->result_metadata(); $fields = $result->fetch_fields(); - $columns = array(); foreach ($cols_num AS $param => $col) { $columns[$fields[$param]->name] = $col; } - return $columns; - case 'mysql': - return mysql_fetch_array($stmt, MYSQL_ASSOC); } + + $a->save_timestamp($stamp1, 'database'); + + return $columns; } /** @@ -755,6 +718,12 @@ class dba { * @return boolean was the insert successfull? */ public static function insert($table, $param, $on_duplicate_update = false) { + + if (empty($table) || empty($param)) { + logger('Table and fields have to be set'); + return false; + } + $sql = "INSERT INTO `".self::escape($table)."` (`".implode("`, `", array_keys($param))."`) VALUES (". substr(str_repeat("?, ", count($param)), 0, -2).")"; @@ -781,9 +750,6 @@ class dba { case 'mysqli': $id = self::$db->insert_id; break; - case 'mysql': - $id = mysql_insert_id(self::$db); - break; } return $id; } @@ -868,12 +834,12 @@ class dba { /** * @brief Build the array with the table relations * - * The array is build from the database definitions in dbstructure.php + * The array is build from the database definitions in DBStructure.php * * This process must only be started once, since the value is cached. */ - private static function build_relation_data() { - $definition = db_definition(); + private static function buildRelationData() { + $definition = DBStructure::definition(); foreach ($definition AS $table => $structure) { foreach ($structure['fields'] AS $field => $field_struct) { @@ -889,18 +855,24 @@ class dba { /** * @brief Delete a row from a table * - * @param string $table Table name - * @param array $param parameter array - * @param boolean $in_process Internal use: Only do a commit after the last delete - * @param array $callstack Internal use: prevent endless loops + * @param string $table Table name + * @param array $conditions Field condition(s) + * @param boolean $in_process Internal use: Only do a commit after the last delete + * @param array $callstack Internal use: prevent endless loops * - * @return boolean|array was the delete successfull? When $in_process is set: deletion data + * @return boolean|array was the delete successful? When $in_process is set: deletion data */ - public static function delete($table, $param, $in_process = false, &$callstack = array()) { - $commands = array(); + public static function delete($table, array $conditions, $in_process = false, array &$callstack = []) + { + if (empty($table) || empty($conditions)) { + logger('Table and conditions have to be set'); + return false; + } + + $commands = []; // Create a key for the loop prevention - $key = $table.':'.implode(':', array_keys($param)).':'.implode(':', $param); + $key = $table . ':' . implode(':', array_keys($conditions)) . ':' . implode(':', $conditions); // We quit when this key already exists in the callstack. if (isset($callstack[$key])) { @@ -911,11 +883,11 @@ class dba { $table = self::escape($table); - $commands[$key] = array('table' => $table, 'param' => $param); + $commands[$key] = ['table' => $table, 'conditions' => $conditions]; // To speed up the whole process we cache the table relations if (count(self::$relation) == 0) { - self::build_relation_data(); + self::buildRelationData(); } // Is there a relation entry for the table? @@ -925,28 +897,28 @@ class dba { $rel_def = array_values(self::$relation[$table])[0]; // Create a key for preventing double queries - $qkey = $field.'-'.$table.':'.implode(':', array_keys($param)).':'.implode(':', $param); + $qkey = $field . '-' . $table . ':' . implode(':', array_keys($conditions)) . ':' . implode(':', $conditions); // When the search field is the relation field, we don't need to fetch the rows // This is useful when the leading record is already deleted in the frontend but the rest is done in the backend - if ((count($param) == 1) && ($field == array_keys($param)[0])) { + if ((count($conditions) == 1) && ($field == array_keys($conditions)[0])) { foreach ($rel_def AS $rel_table => $rel_fields) { foreach ($rel_fields AS $rel_field) { - $retval = self::delete($rel_table, array($rel_field => array_values($param)[0]), true, $callstack); + $retval = self::delete($rel_table, [$rel_field => array_values($conditions)[0]], true, $callstack); $commands = array_merge($commands, $retval); } } - // We quit when this key already exists in the callstack. + // We quit when this key already exists in the callstack. } elseif (!isset($callstack[$qkey])) { $callstack[$qkey] = true; // Fetch all rows that are to be deleted - $data = self::select($table, array($field), $param); + $data = self::select($table, [$field], $conditions); while ($row = self::fetch($data)) { // Now we accumulate the delete commands - $retval = self::delete($table, array($field => $row[$field]), true, $callstack); + $retval = self::delete($table, [$field => $row[$field]], true, $callstack); $commands = array_merge($commands, $retval); } @@ -965,24 +937,21 @@ class dba { self::transaction(); } - $compacted = array(); - $counter = array(); + $compacted = []; + $counter = []; foreach ($commands AS $command) { - $condition = $command['param']; - $array_element = each($condition); - $array_key = $array_element['key']; - if (is_int($array_key)) { - $condition_string = " WHERE ".array_shift($condition); - } else { - $condition_string = " WHERE `".implode("` = ? AND `", array_keys($condition))."` = ?"; - } + $conditions = $command['conditions']; + reset($conditions); + $first_key = key($conditions); + + $condition_string = self::buildCondition($conditions); - if ((count($command['param']) > 1) || is_int($array_key)) { - $sql = "DELETE FROM `".$command['table']."`".$condition_string; - logger(self::replace_parameters($sql, $condition), LOGGER_DATA); + if ((count($command['conditions']) > 1) || is_int($first_key)) { + $sql = "DELETE FROM `" . $command['table'] . "`" . $condition_string; + logger(self::replaceParameters($sql, $conditions), LOGGER_DATA); - if (!self::e($sql, $condition)) { + if (!self::e($sql, $conditions)) { if ($do_transaction) { self::rollback(); } @@ -990,27 +959,27 @@ class dba { } } else { $key_table = $command['table']; - $key_param = array_keys($command['param'])[0]; - $value = array_values($command['param'])[0]; + $key_condition = array_keys($command['conditions'])[0]; + $value = array_values($command['conditions'])[0]; // Split the SQL queries in chunks of 100 values // We do the $i stuff here to make the code better readable - $i = $counter[$key_table][$key_param]; - if (count($compacted[$key_table][$key_param][$i]) > 100) { + $i = $counter[$key_table][$key_condition]; + if (count($compacted[$key_table][$key_condition][$i]) > 100) { ++$i; } - $compacted[$key_table][$key_param][$i][$value] = $value; - $counter[$key_table][$key_param] = $i; + $compacted[$key_table][$key_condition][$i][$value] = $value; + $counter[$key_table][$key_condition] = $i; } } foreach ($compacted AS $table => $values) { foreach ($values AS $field => $field_value_list) { foreach ($field_value_list AS $field_values) { - $sql = "DELETE FROM `".$table."` WHERE `".$field."` IN (". - substr(str_repeat("?, ", count($field_values)), 0, -2).");"; + $sql = "DELETE FROM `" . $table . "` WHERE `" . $field . "` IN (" . + substr(str_repeat("?, ", count($field_values)), 0, -2) . ");"; - logger(self::replace_parameters($sql, $field_values), LOGGER_DATA); + logger(self::replaceParameters($sql, $field_values), LOGGER_DATA); if (!self::e($sql, $field_values)) { if ($do_transaction) { @@ -1058,32 +1027,28 @@ class dba { * * @return boolean was the update successfull? */ - public static function update($table, $fields, $condition, $old_fields = array()) { - $table = self::escape($table); + public static function update($table, $fields, $condition, $old_fields = []) { - if (count($condition) > 0) { - $array_element = each($condition); - $array_key = $array_element['key']; - if (is_int($array_key)) { - $condition_string = " WHERE ".array_shift($condition); - } else { - $condition_string = " WHERE `".implode("` = ? AND `", array_keys($condition))."` = ?"; - } - } else { - $condition_string = ""; + if (empty($table) || empty($fields) || empty($condition)) { + logger('Table, fields and condition have to be set'); + return false; } + $table = self::escape($table); + + $condition_string = self::buildCondition($condition); + if (is_bool($old_fields)) { $do_insert = $old_fields; - $old_fields = self::select($table, array(), $condition, array('limit' => 1)); + $old_fields = self::selectFirst($table, [], $condition); if (is_bool($old_fields)) { if ($do_insert) { $values = array_merge($condition, $fields); return self::insert($table, $values, $do_insert); } - $old_fields = array(); + $old_fields = []; } } @@ -1113,15 +1078,40 @@ class dba { return self::e($sql, $params); } + /** + * Retrieve a single record from a table and returns it in an associative array + * + * @brief Retrieve a single record from a table + * @param string $table + * @param array $fields + * @param array $condition + * @param array $params + * @return bool|array + * @see dba::select + */ + public static function selectFirst($table, array $fields = [], array $condition = [], $params = []) + { + $params['limit'] = 1; + $result = self::select($table, $fields, $condition, $params); + + if (is_bool($result)) { + return $result; + } else { + $row = self::fetch($result); + self::close($result); + return $row; + } + } + /** * @brief Select rows from a table * - * @param string $table Table name - * @param array $fields array of selected fields - * @param array $condition array of fields for condition - * @param array $params array of several parameters + * @param string $table Table name + * @param array $fields Array of selected fields, empty for all + * @param array $condition Array of fields for condition + * @param array $params Array of several parameters * - * @return boolean|object If "limit" is equal "1" only a single row is returned, else a query object is returned + * @return boolean|object * * Example: * $table = "item"; @@ -1131,70 +1121,136 @@ class dba { * or: * $condition = array("`uid` = ? AND `network` IN (?, ?)", 1, 'dfrn', 'dspr'); * - * $params = array("order" => array("id", "received" => true), "limit" => 1); + * $params = array("order" => array("id", "received" => true), "limit" => 10); * * $data = dba::select($table, $fields, $condition, $params); */ - public static function select($table, $fields = array(), $condition = array(), $params = array()) { + public static function select($table, array $fields = [], array $condition = [], array $params = []) + { if ($table == '') { return false; } + $table = self::escape($table); + if (count($fields) > 0) { - $select_fields = "`".implode("`, `", array_values($fields))."`"; + $select_fields = "`" . implode("`, `", array_values($fields)) . "`"; } else { $select_fields = "*"; } - if (count($condition) > 0) { - $array_element = each($condition); - $array_key = $array_element['key']; - if (is_int($array_key)) { - $condition_string = " WHERE ".array_shift($condition); - } else { - $condition_string = " WHERE `".implode("` = ? AND `", array_keys($condition))."` = ?"; - } - } else { - $condition_string = ""; - } - - $param_string = ''; - $single_row = false; + $condition_string = self::buildCondition($condition); + $order_string = ''; if (isset($params['order'])) { - $param_string .= " ORDER BY "; + $order_string = " ORDER BY "; foreach ($params['order'] AS $fields => $order) { if (!is_int($fields)) { - $param_string .= "`".$fields."` ".($order ? "DESC" : "ASC").", "; + $order_string .= "`" . $fields . "` " . ($order ? "DESC" : "ASC") . ", "; } else { - $param_string .= "`".$order."`, "; + $order_string .= "`" . $order . "`, "; } } - $param_string = substr($param_string, 0, -2); + $order_string = substr($order_string, 0, -2); } + $limit_string = ''; if (isset($params['limit']) && is_int($params['limit'])) { - $param_string .= " LIMIT ".$params['limit']; - $single_row = ($params['limit'] == 1); + $limit_string = " LIMIT " . $params['limit']; } - if (isset($params['only_query']) && $params['only_query']) { - $single_row = !$params['only_query']; + if (isset($params['limit']) && is_array($params['limit'])) { + $limit_string = " LIMIT " . intval($params['limit'][0]) . ", " . intval($params['limit'][1]); } - $sql = "SELECT ".$select_fields." FROM `".$table."`".$condition_string.$param_string; + $sql = "SELECT " . $select_fields . " FROM `" . $table . "`" . $condition_string . $order_string . $limit_string; $result = self::p($sql, $condition); - if (is_bool($result) || !$single_row) { - return $result; - } else { - $row = self::fetch($result); - self::close($result); - return $row; + return $result; + } + + /** + * @brief Counts the rows from a table satisfying the provided condition + * + * @param string $table Table name + * @param array $condition array of fields for condition + * + * @return int + * + * Example: + * $table = "item"; + * + * $condition = ["uid" => 1, "network" => 'dspr']; + * or: + * $condition = ["`uid` = ? AND `network` IN (?, ?)", 1, 'dfrn', 'dspr']; + * + * $count = dba::count($table, $condition); + */ + public static function count($table, array $condition = []) + { + if ($table == '') { + return false; } + + $condition_string = self::buildCondition($condition); + + $sql = "SELECT COUNT(*) AS `count` FROM `".$table."`".$condition_string; + + $row = self::fetch_first($sql, $condition); + + return $row['count']; } + /** + * @brief Returns the SQL condition string built from the provided condition array + * + * This function operates with two modes. + * - Supplied with a filed/value associative array, it builds simple strict + * equality conditions linked by AND. + * - Supplied with a flat list, the first element is the condition string and + * the following arguments are the values to be interpolated + * + * $condition = ["uid" => 1, "network" => 'dspr']; + * or: + * $condition = ["`uid` = ? AND `network` IN (?, ?)", 1, 'dfrn', 'dspr']; + * + * In either case, the provided array is left with the parameters only + * + * @param array $condition + * @return string + */ + private static function buildCondition(array &$condition = []) + { + $condition_string = ''; + if (count($condition) > 0) { + reset($condition); + $first_key = key($condition); + if (is_int($first_key)) { + $condition_string = " WHERE ".array_shift($condition); + } else { + $new_values = []; + $condition_string = ""; + foreach ($condition as $field => $value) { + if ($condition_string != "") { + $condition_string .= " AND "; + } + if (is_array($value)) { + $new_values = array_merge($new_values, array_values($value)); + $placeholders = substr(str_repeat("?, ", count($value)), 0, -2); + $condition_string .= "`" . $field . "` IN (" . $placeholders . ")"; + } else { + $new_values[$field] = $value; + $condition_string .= "`" . $field . "` = ?"; + } + } + $condition_string = " WHERE " . $condition_string; + $condition = $new_values; + } + } + + return $condition_string; + } /** * @brief Fills an array with data from a query @@ -1207,7 +1263,7 @@ class dba { return $stmt; } - $data = array(); + $data = []; while ($row = self::fetch($stmt)) { $data[] = $row; } @@ -1239,22 +1295,30 @@ class dba { * @brief Closes the current statement * * @param object $stmt statement object - * @return boolean was the close successfull? + * @return boolean was the close successful? */ public static function close($stmt) { + $a = get_app(); + + $stamp1 = microtime(true); + if (!is_object($stmt)) { return false; } switch (self::$driver) { case 'pdo': - return $stmt->closeCursor(); + $ret = $stmt->closeCursor(); + break; case 'mysqli': - return $stmt->free_result(); - return $stmt->close(); - case 'mysql': - return mysql_free_result($stmt); + $stmt->free_result(); + $ret = $stmt->close(); + break; } + + $a->save_timestamp($stamp1, 'database'); + + return $ret; } } @@ -1274,7 +1338,7 @@ function dbesc($str) { * dba::delete, dba::update, dba::p, dba::e * * @param $args Query parameters (1 to N parameters of different types) - * @return array Query array + * @return array|bool Query array */ function q($sql) { $args = func_get_args();