fixes (ThingEngineer#673)

* fixed limit variable ordering in the comments * Expand readme on autoreconnect and multipe connections usage * update release numbers * update copyright years * Bug ThingEngineer#623: Mistake in Regexp * Fix for ThingEngineer#554 Fixing Join usage with 'USING' instead of 'ON' * Fix empty exception message
ricwein · Aug 29, 2017 · f1fc9ff · f1fc9ff
1 parent f948779
commit f1fc9ff
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/MysqliDb.php b/MysqliDb.php
@@ -1004,7 +1004,7 @@ public function orHaving($havingProp, $havingValue = null, $operator = null)
      */
     public function join($joinTable, $joinCondition, $joinType = '')
     {
-        $allowedTypes = array('LEFT', 'RIGHT', 'OUTER', 'INNER', 'LEFT OUTER', 'RIGHT OUTER');
+        $allowedTypes = array('LEFT', 'RIGHT', 'OUTER', 'INNER', 'LEFT OUTER', 'RIGHT OUTER', 'NATURAL');
         $joinType = strtoupper(trim($joinType));
 
         if ($joinType && !in_array($joinType, $allowedTypes)) {
@@ -1649,7 +1649,7 @@ protected function _buildJoinOld()
                 $joinStr = $joinTable;
             }
 
-            $this->_query .= " " . $joinType . " JOIN " . $joinStr . 
+            $this->_query .= " " . $joinType . " JOIN " . $joinStr .
                 (false !== stripos($joinCondition, 'using') ? " " : " on ")
                 . $joinCondition;
         }
@@ -1900,24 +1900,23 @@ protected function _prepareQuery()
     {
         $stmt = $this->mysqli()->prepare($this->_query);
 
-        if ($stmt !== false)
-            goto release;
+        if ($stmt !== false) {
+            if ($this->traceEnabled)
+                $this->traceStartQ = microtime(true);
+            return $stmt;
+        }
 
         if ($this->mysqli()->errno === 2006 && $this->autoReconnect === true && $this->autoReconnectCount === 0) {
             $this->connect($this->defConnectionName);
             $this->autoReconnectCount++;
             return $this->_prepareQuery();
         }
 
+        $error = $this->mysqli()->error;
+        $query = $this->_query;
+        $errno = $this->mysqli()->errno;
         $this->reset();
-        throw new Exception(sprintf('%s query: %s', $this->mysqli()->error, $this->_query), $this->mysqli()->errno);
-
-        release:
-        if ($this->traceEnabled) {
-            $this->traceStartQ = microtime(true);
-        }
-
-        return $stmt;
+        throw new Exception(sprintf('%s query: %s', error, query), errno);
     }
 
     /**
@@ -2356,7 +2355,9 @@ protected function _buildJoin () {
             else
                 $joinStr = $joinTable;
 
-            $this->_query .= " " . $joinType. " JOIN " . $joinStr ." on " . $joinCondition;
+            $this->_query .= " " . $joinType. " JOIN " . $joinStr . 
+                (false !== stripos($joinCondition, 'using') ? " " : " on ") 
+                . $joinCondition;
 
             // Add join and query
             if (!empty($this->_joinAnd) && isset($this->_joinAnd[$joinStr])) {

diff --git a/dbObject.php b/dbObject.php
@@ -651,7 +651,7 @@ private function validate ($data) {
                     $regexp = "/^[0-9\.]*$/";
                     break;
                 case "bool":
-                    $regexp = '/^[yes|no|0|1|true|false]$/i';
+                    $regexp = '/^(yes|no|0|1|true|false)$/i';
                     break;
                 case "datetime":
                     $regexp = "/^[0-9a-zA-Z -:]*$/";