|
9 | 9 | * @author Alexander V. Butenko <a.butenka@gmail.com> |
10 | 10 | * @copyright Copyright (c) 2010-2017 |
11 | 11 | * @license http://opensource.org/licenses/gpl-3.0.html GNU Public License |
12 | | - * @link http://github.com/joshcam/PHP-MySQLi-Database-Class |
| 12 | + * @link http://github.com/joshcam/PHP-MySQLi-Database-Class |
13 | 13 | * @version 2.9.3 |
14 | 14 | */ |
15 | 15 |
|
@@ -243,7 +243,7 @@ class MysqliDb |
243 | 243 | * @var string the name of a default (main) mysqli connection |
244 | 244 | */ |
245 | 245 | public $defConnectionName = 'default'; |
246 | | - |
| 246 | + |
247 | 247 | public $autoReconnect = true; |
248 | 248 | protected $autoReconnectCount = 0; |
249 | 249 |
|
@@ -306,7 +306,7 @@ public function connect($connectionName = 'default') |
306 | 306 | { |
307 | 307 | if(!isset($this->connectionsSettings[$connectionName])) |
308 | 308 | throw new Exception('Connection profile not set'); |
309 | | - |
| 309 | + |
310 | 310 | $pro = $this->connectionsSettings[$connectionName]; |
311 | 311 | $params = array_values($pro); |
312 | 312 | $charset = array_pop($params); |
@@ -724,10 +724,10 @@ public function withTotalCount() |
724 | 724 | /** |
725 | 725 | * A convenient SELECT * function. |
726 | 726 | * |
727 | | - * @param string $tableName The name of the database table to work with. |
728 | | - * @param int|array $numRows Array to define SQL limit in format Array ($offset, $count) |
729 | | - * or only $count |
730 | | - * @param string $columns Desired columns |
| 727 | + * @param string $tableName The name of the database table to work with. |
| 728 | + * @param int|array $numRows Array to define SQL limit in format Array ($offset, $count) |
| 729 | + * or only $count |
| 730 | + * @param string|array $columns Desired columns |
731 | 731 | * |
732 | 732 | * @return array|MysqliDb Contains the returned rows from the select query. |
733 | 733 | * @throws Exception |
@@ -766,8 +766,8 @@ public function get($tableName, $numRows = null, $columns = '*') |
766 | 766 | /** |
767 | 767 | * A convenient SELECT * function to get one record. |
768 | 768 | * |
769 | | - * @param string $tableName The name of the database table to work with. |
770 | | - * @param string $columns Desired columns |
| 769 | + * @param string $tableName The name of the database table to work with. |
| 770 | + * @param string|array $columns Desired columns |
771 | 771 | * |
772 | 772 | * @return array Contains the returned rows from the select query. |
773 | 773 | * @throws Exception |
@@ -2464,8 +2464,8 @@ protected function _buildJoin () { |
2464 | 2464 | else |
2465 | 2465 | $joinStr = $joinTable; |
2466 | 2466 |
|
2467 | | - $this->_query .= " " . $joinType. " JOIN " . $joinStr . |
2468 | | - (false !== stripos($joinCondition, 'using') ? " " : " on ") |
| 2467 | + $this->_query .= " " . $joinType. " JOIN " . $joinStr . |
| 2468 | + (false !== stripos($joinCondition, 'using') ? " " : " on ") |
2469 | 2469 | . $joinCondition; |
2470 | 2470 |
|
2471 | 2471 | // Add join and query |
|
0 commit comments