Merge pull request #5862 from nupplaphil/rename_App_Methods

[friendica.git] / src / Database / DBA.php

diff --git a/src/Database/DBA.php b/src/Database/DBA.php
index bf480dad2c769ce0dce42c2f22878958c25536f5..c33fa2152fb5aebfd5b9ad84ac04ed4dd3d57776 100644 (file)
--- a/src/Database/DBA.php
+++ b/src/Database/DBA.php
@@ -91,6 +91,7 @@ class DBA
                                self::$connection->setAttribute(PDO::ATTR_EMULATE_PREPARES, false);
                                self::$connected = true;
                        } catch (PDOException $e) {
+                               /// @TODO At least log exception, don't ignore it!
                        }
                }
 
@@ -255,6 +256,7 @@ class DBA
                        switch (self::$driver) {
                                case 'pdo':
                                        return substr(@self::$connection->quote($str, PDO::PARAM_STR), 1, -1);
+
                                case 'mysqli':
                                        return @self::$connection->real_escape_string($str);
                        }
@@ -568,7 +570,7 @@ class DBA
                        self::$errorno = $errorno;
                }
 
-               $a->save_timestamp($stamp1, 'database');
+               $a->saveTimestamp($stamp1, 'database');
 
                if ($a->getConfigValue('system', 'db_log')) {
                        $stamp2 = microtime(true);
@@ -639,7 +641,7 @@ class DBA
                        self::$errorno = $errorno;
                }
 
-               $a->save_timestamp($stamp, "database_write");
+               $a->saveTimestamp($stamp, "database_write");
 
                return $retval;
        }
@@ -807,7 +809,7 @@ class DBA
                                }
                }
 
-               $a->save_timestamp($stamp1, 'database');
+               $a->saveTimestamp($stamp1, 'database');
 
                return $columns;
        }
@@ -932,13 +934,11 @@ class DBA
 
                switch (self::$driver) {
                        case 'pdo':
-                               if (self::$connection->inTransaction()) {
-                                       break;
-                               }
-                               if (!self::$connection->beginTransaction()) {
+                               if (!self::$connection->inTransaction() && !self::$connection->beginTransaction()) {
                                        return false;
                                }
                                break;
+
                        case 'mysqli':
                                if (!self::$connection->begin_transaction()) {
                                        return false;
@@ -957,10 +957,13 @@ class DBA
                                if (!self::$connection->inTransaction()) {
                                        return true;
                                }
+
                                return self::$connection->commit();
+
                        case 'mysqli':
                                return self::$connection->commit();
                }
+
                return true;
        }
 
@@ -993,6 +996,7 @@ class DBA
                                }
                                $ret = self::$connection->rollBack();
                                break;
+
                        case 'mysqli':
                                $ret = self::$connection->rollback();
                                break;
@@ -1543,7 +1547,7 @@ class DBA
                                break;
                }
 
-               $a->save_timestamp($stamp1, 'database');
+               $a->saveTimestamp($stamp1, 'database');
 
                return $ret;
        }