Merge pull request #16 from WebFiori/dev

Dev

Author: usernane

tests/mysql/MySQLQueryBuilderTest.php

@@ -311,7 +311,7 @@ public function testSelectWithWhere012() {
             )->where('id', '!=', null)
         );
         // Expr(Expr(Cond) Cond)
-        $this->assertEquals('select * from [users] where [users].[id] is null and [users].[id] is not null', $schema->getLastQuery());
+        $this->assertEquals('select * from `users` where `users`.`id` is null and `users`.`id` is not null', $schema->getLastQuery());
     }
     /**
      * @test

webfiori/database/mssql/MSSQLConnection.php

@@ -204,8 +204,11 @@ private function _selectQuery() {
     private function _setErr() {
         $allErrs = sqlsrv_errors(SQLSRV_ERR_ERRORS);
         $lastErr = $allErrs[count($allErrs) - 1];
-        $this->sqlState = $lastErr['SQLSTATE'];
-        $this->setErrMessage($lastErr['message']);
-        $this->setErrCode($lastErr['code']);
+        
+        if (strpos($lastErr['message'], 'The statement has been terminated') === false) {
+            $this->sqlState = $lastErr['SQLSTATE'];
+            $this->setErrMessage($lastErr['message']);
+            $this->setErrCode($lastErr['code']);
+        }
     }
 }

webfiori/database/mssql/MSSQLQuery.php

@@ -301,7 +301,8 @@ private function _insertHelper(array $colsKeysArr, array $valuesToInsert) {
                     $cleanedVal = $column->cleanValue($val);
 
                     if ($type == 'binary' || $type == 'varbinary') {
-                        $fixedPath = str_replace('\\', '/', $val);
+                        //chr(0) to remove null bytes in path.
+                        $fixedPath = str_replace('\\', '/', str_replace(chr(0), '', $val));
                         set_error_handler(null);
 
                         if (strlen($fixedPath) != 0 && file_exists($fixedPath)) {

webfiori/database/mysql/MySQLQuery.php

@@ -511,7 +511,8 @@ private function _insertHelper(array $colsKeysArr, array $valuesToInsert) {
                     $cleanedVal = $column->cleanValue($val);
 
                     if ($type == 'tinyblob' || $type == 'mediumblob' || $type == 'longblob') {
-                        $fixedPath = str_replace('\\', '/', $val);
+                        //chr(0) to remove null bytes in path.
+                        $fixedPath = str_replace('\\', '/', str_replace(chr(0), '', $val));
                         set_error_handler(null);
                         $this->setIsBlobInsertOrUpdate(true);