X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fdba.php;h=1d3b432141d525e015539b5b3a6864f5153749ca;hb=b4f5311e7ff02fbfce5f9fd737d41f605499686e;hp=b1b689fdf77def7090d8b5bd54059e1fc9c1cd24;hpb=f193f01a7d6ed4946b5ec4a4b92294bb75b294cb;p=friendica.git diff --git a/include/dba.php b/include/dba.php index b1b689fdf7..1d3b432141 100644 --- a/include/dba.php +++ b/include/dba.php @@ -1,9 +1,11 @@ mode == App::MODE_INSTALL) { + // server has to be a non-empty string that is not 'localhost' and not an IP + if (strlen($server) && ($server !== 'localhost') && filter_var($server, FILTER_VALIDATE_IP) === false) { + if (! dns_get_record($server, DNS_A + DNS_CNAME)) { + self::$error = L10n::t('Cannot locate DNS info for database server \'%s\'', $server); return false; } } @@ -78,7 +77,6 @@ class dba { self::$db = @new PDO($connect, $user, $pass); self::$connected = true; } catch (PDOException $e) { - self::$connected = false; } } @@ -96,14 +94,12 @@ class dba { // No suitable SQL driver was found. if (!self::$connected) { + self::$driver = null; self::$db = null; - if (!$install) { - System::unavailable(); - } } $a->save_timestamp($stamp1, "network"); - return true; + return self::$connected; } /** @@ -144,7 +140,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"])) { @@ -187,7 +183,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". @@ -271,7 +267,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])) { @@ -412,7 +408,7 @@ class dba { // 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; @@ -475,7 +471,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; @@ -492,10 +488,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; @@ -540,7 +536,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; @@ -566,10 +562,10 @@ class dba { $fields = []; - $array_element = each($condition); - $array_key = $array_element['key']; - if (!is_int($array_key)) { - $fields = [$array_key]; + reset($condition); + $first_key = key($condition); + if (!is_int($first_key)) { + $fields = [$first_key]; } $stmt = self::select($table, $fields, $condition, ['limit' => 1]); @@ -663,16 +659,24 @@ class dba { * @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 @@ -697,12 +701,14 @@ class dba { $result = $stmt->result_metadata(); $fields = $result->fetch_fields(); - $columns = []; foreach ($cols_num AS $param => $col) { $columns[$fields[$param]->name] = $col; } - return $columns; } + + $a->save_timestamp($stamp1, 'database'); + + return $columns; } /** @@ -835,7 +841,7 @@ class dba { * * This process must only be started once, since the value is cached. */ - private static function build_relation_data() { + private static function buildRelationData() { $definition = DBStructure::definition(); foreach ($definition AS $table => $structure) { @@ -854,12 +860,15 @@ class dba { * * @param string $table Table name * @param array $conditions Field condition(s) + * @param array $options + * - cascade: If true we delete records in other tables that depend on the one we're deleting through + * relations (default: true) * @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 successful? When $in_process is set: deletion data */ - public static function delete($table, array $conditions, $in_process = false, array &$callstack = []) + public static function delete($table, array $conditions, array $options = [], $in_process = false, array &$callstack = []) { if (empty($table) || empty($conditions)) { logger('Table and conditions have to be set'); @@ -882,13 +891,15 @@ class dba { $commands[$key] = ['table' => $table, 'conditions' => $conditions]; + $cascade = defaults($options, 'cascade', true); + // To speed up the whole process we cache the table relations - if (count(self::$relation) == 0) { - self::build_relation_data(); + if ($cascade && count(self::$relation) == 0) { + self::buildRelationData(); } // Is there a relation entry for the table? - if (isset(self::$relation[$table])) { + if ($cascade && isset(self::$relation[$table])) { // We only allow a simple "one field" relation. $field = array_keys(self::$relation[$table])[0]; $rel_def = array_values(self::$relation[$table])[0]; @@ -901,7 +912,7 @@ class dba { 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, [$rel_field => array_values($conditions)[0]], true, $callstack); + $retval = self::delete($rel_table, [$rel_field => array_values($conditions)[0]], $options, true, $callstack); $commands = array_merge($commands, $retval); } } @@ -915,7 +926,7 @@ class dba { while ($row = self::fetch($data)) { // Now we accumulate the delete commands - $retval = self::delete($table, [$field => $row[$field]], true, $callstack); + $retval = self::delete($table, [$field => $row[$field]], $options, true, $callstack); $commands = array_merge($commands, $retval); } @@ -939,17 +950,14 @@ class dba { foreach ($commands AS $command) { $conditions = $command['conditions']; - $array_element = each($conditions); - $array_key = $array_element['key']; - if (is_int($array_key)) { - $condition_string = " WHERE " . array_shift($conditions); - } else { - $condition_string = " WHERE `" . implode("` = ? AND `", array_keys($conditions)) . "` = ?"; - } + reset($conditions); + $first_key = key($conditions); + + $condition_string = self::buildCondition($conditions); - if ((count($command['conditions']) > 1) || is_int($array_key)) { + if ((count($command['conditions']) > 1) || is_int($first_key)) { $sql = "DELETE FROM `" . $command['table'] . "`" . $condition_string; - logger(self::replace_parameters($sql, $conditions), LOGGER_DATA); + logger(self::replaceParameters($sql, $conditions), LOGGER_DATA); if (!self::e($sql, $conditions)) { if ($do_transaction) { @@ -965,7 +973,7 @@ class dba { // 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_condition]; - if (count($compacted[$key_table][$key_condition][$i]) > 100) { + if (isset($compacted[$key_table][$key_condition][$i]) && count($compacted[$key_table][$key_condition][$i]) > 100) { ++$i; } @@ -979,7 +987,7 @@ class dba { $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) { @@ -1036,13 +1044,7 @@ class dba { $table = self::escape($table); - $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))."` = ?"; - } + $condition_string = self::buildCondition($condition); if (is_bool($old_fields)) { $do_insert = $old_fields; @@ -1137,6 +1139,8 @@ class dba { return false; } + $table = self::escape($table); + if (count($fields) > 0) { $select_fields = "`" . implode("`, `", array_values($fields)) . "`"; } else { @@ -1145,6 +1149,7 @@ class dba { $condition_string = self::buildCondition($condition); + $order_string = ''; if (isset($params['order'])) { $order_string = " ORDER BY "; foreach ($params['order'] AS $fields => $order) { @@ -1157,6 +1162,7 @@ class dba { $order_string = substr($order_string, 0, -2); } + $limit_string = ''; if (isset($params['limit']) && is_int($params['limit'])) { $limit_string = " LIMIT " . $params['limit']; } @@ -1226,12 +1232,28 @@ class dba { { $condition_string = ''; if (count($condition) > 0) { - $array_element = each($condition); - $array_key = $array_element['key']; - if (is_int($array_key)) { + reset($condition); + $first_key = key($condition); + if (is_int($first_key)) { $condition_string = " WHERE ".array_shift($condition); } else { - $condition_string = " WHERE `".implode("` = ? AND `", array_keys($condition))."` = ?"; + $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; } } @@ -1284,17 +1306,27 @@ class dba { * @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': $stmt->free_result(); - return $stmt->close(); + $ret = $stmt->close(); + break; } + + $a->save_timestamp($stamp1, 'database'); + + return $ret; } }