Fix: Only echo on verbose

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

diff --git a/src/Database/DBA.php b/src/Database/DBA.php
index 273c87690b45b6b61b2944f3e7cc7e6cdd94fef0..8b25f617f61195dd903de1a27995903840e417b7 100644 (file)
--- a/src/Database/DBA.php
+++ b/src/Database/DBA.php
@@ -72,6 +72,16 @@ class DBA
                return DI::dba()->getConnection();
        }
 
+       /**
+        * Return the database driver string
+        *
+        * @return string with either "pdo" or "mysqli"
+        */
+       public static function getDriver()
+       {
+               return DI::dba()->getDriver();
+       }
+
        /**
         * Returns the MySQL server version string
         *
@@ -280,16 +290,16 @@ class DBA
        /**
         * Insert a row into a table
         *
-        * @param string|array $table               Table name or array [schema => table]
-        * @param array        $param               parameter array
-        * @param bool         $on_duplicate_update Do an update on a duplicate entry
+        * @param string|array $table          Table name or array [schema => table]
+        * @param array        $param          parameter array
+        * @param int          $duplicate_mode What to do on a duplicated entry
         *
         * @return boolean was the insert successful?
         * @throws \Exception
         */
-       public static function insert($table, $param, $on_duplicate_update = false)
+       public static function insert($table, array $param, int $duplicate_mode = Database::INSERT_DEFAULT)
        {
-               return DI::dba()->insert($table, $param, $on_duplicate_update);
+               return DI::dba()->insert($table, $param, $duplicate_mode);
        }
 
        /**
@@ -669,10 +679,18 @@ class DBA
         */
        public static function mergeConditions(array ...$conditions)
        {
+               if (count($conditions) == 1) {
+                       return current($conditions);
+               }
+
                $conditionStrings = [];
                $result = [];
 
                foreach ($conditions as $key => $condition) {
+                       if (!$condition) {
+                               continue;
+                       }
+
                        $condition = self::collapseCondition($condition);
 
                        $conditionStrings[] = array_shift($condition);