Merge remote-tracking branch 'upstream/3.5.2rc' into 1705-dbclean-advanced

[friendica.git] / include / dba.php

diff --git a/include/dba.php b/include/dba.php
index 39eb1f460744ee3408ce2d303dc3e64215a9d9aa..b9e6c32d56acff766aeec3ffc91af5b09f5a023c 100644 (file)
--- a/include/dba.php
+++ b/include/dba.php
@@ -22,7 +22,7 @@ class dba {
        public  $connected = false;
        public  $error = false;
        private $_server_info = '';
-       private $in_transaction = false;
+       private static $in_transaction = false;
        private static $dbo;
        private static $relation = array();
 
@@ -459,6 +459,27 @@ class dba {
                return $sql;
        }
 
+       /**
+        * @brief beautifies the query - useful for "SHOW PROCESSLIST"
+        *
+        * This is safe when we bind the parameters later.
+        * The parameter values aren't part of the SQL.
+        *
+        * @param string $sql An SQL string without the values
+        * @return string The input SQL string modified if necessary.
+        */
+       public function clean_query($sql) {
+               $search = array("\t", "\n", "\r", "  ");
+               $replace = array(' ', ' ', ' ', ' ');
+               do {
+                       $oldsql = $sql;
+                       $sql = str_replace($search, $replace, $sql);
+               } while ($oldsql != $sql);
+
+               return $sql;
+       }
+
+
        /**
         * @brief Replaces the ? placeholders with the parameters in the $args array
         *
@@ -521,6 +542,7 @@ class dba {
                        logger('Parameter mismatch. Query "'.$sql.'" - Parameters '.print_r($args, true), LOGGER_DEBUG);
                }
 
+               $sql = self::$dbo->clean_query($sql);
                $sql = self::$dbo->any_value_fallback($sql);
 
                if (x($a->config,'system') && x($a->config['system'], 'db_callstack')) {
@@ -708,6 +730,9 @@ class dba {
         * @return int Number of rows
         */
        static public function num_rows($stmt) {
+               if (!is_object($stmt)) {
+                       return 0;
+               }
                switch (self::$dbo->driver) {
                        case 'pdo':
                                return $stmt->rowCount();
@@ -845,7 +870,7 @@ class dba {
        }
 
        /**
-        * @brief Insert a row into a table
+        * @brief Delete a row from a table
         *
         * @param string $table Table name
         * @param array $param parameter array
@@ -918,7 +943,9 @@ class dba {
 
                if (!$in_process) {
                        // Now we finalize the process
-                       if (!self::$in_transaction) {
+                       $do_transaction = !self::$in_transaction;
+
+                       if ($do_transaction) {
                                self::transaction();
                        }
 
@@ -932,7 +959,7 @@ class dba {
                                        logger(dba::replace_parameters($sql, $command['param']), LOGGER_DATA);
 
                                        if (!self::e($sql, $command['param'])) {
-                                               if (!self::$in_transaction) {
+                                               if ($do_transaction) {
                                                        self::rollback();
                                                }
                                                return false;
@@ -962,7 +989,7 @@ class dba {
                                                logger(dba::replace_parameters($sql, $field_values), LOGGER_DATA);
 
                                                if (!self::e($sql, $field_values)) {
-                                                       if (!self::$in_transaction) {
+                                                       if ($do_transaction) {
                                                                self::rollback();
                                                        }
                                                        return false;
@@ -970,7 +997,7 @@ class dba {
                                        }
                                }
                        }
-                       if (!self::$in_transaction) {
+                       if ($do_transaction) {
                                self::commit();
                        }
                        return true;
@@ -1198,6 +1225,7 @@ function q($sql) {
        unset($args[0]);
 
        if ($db && $db->connected) {
+               $sql = $db->clean_query($sql);
                $sql = $db->any_value_fallback($sql);
                $stmt = @vsprintf($sql,$args); // Disabled warnings
                //logger("dba: q: $stmt", LOGGER_ALL);
@@ -1235,6 +1263,7 @@ function qu($sql) {
        unset($args[0]);
 
        if ($db && $db->connected) {
+               $sql = $db->clean_query($sql);
                $sql = $db->any_value_fallback($sql);
                $stmt = @vsprintf($sql,$args); // Disabled warnings
                if ($stmt === false)