Probably fixed #4 and #5

Author: Gabriel Tadra Mainginski

Database/SybaseConnection.php

@@ -99,35 +99,46 @@ private function compileForSelect(Builder $builder, $bindings) {
             if(count($bindings)==0){
                 return [];
             }
-            
             $bindings = $this->prepareBindings($bindings);
-            
 
             $arrTables = [];
             array_push($arrTables, $builder->from);
-            //var_dump($builder);
+
             if(!empty($builder->joins)){
                 foreach($builder->joins as $join){
+                    
                     array_push($arrTables, $join->table);
                 }
             }
             $new_format = [];
             foreach($arrTables as $tables){
-
-                    $queryRes = $this->getPdo()->query("select a.name, b.name AS type FROM syscolumns a noholdlock JOIN systypes b noholdlock ON a.usertype = b.usertype and object_name(a.id) = '".$tables."'");
-                    $types[$tables] = $queryRes->fetchAll(\PDO::FETCH_NAMED);
+                    preg_match("/(?:(?'table'.*)(?: as )(?'alias'.*))|(?'tables'.*)/", $tables, $alias);
+                    if(empty($alias['alias'])){
+                        $tables = $alias['tables'];
+                    }else{
+                        $tables = $alias['table'];
+                    }
 
+                    $queryRes = $this->getPdo()->query("select a.name, b.name AS type FROM syscolumns a noholdlock JOIN systypes b noholdlock ON a.usertype = b.usertype and object_name(a.id) = '".$tables."'");
+                    $types[$tables] = $queryRes->fetchAll(\PDO::FETCH_NAMED); 
+     
                     foreach ($types[$tables] as &$row) {
-                            $tipos[$row['name']] = $row['type'];
-                            $tipos[$tables.'.'.$row['name']] = $row['type'];
+                        $tipos[$row['name']] = $row['type'];
+                        $tipos[$tables.'.'.$row['name']] = $row['type'];
+                        if(!empty($alias['alias'])){
+                            $tipos[$alias['alias'].'.'.$row['name']] = $row['type'];
+                        }
                     }
 
                    $new_format[$tables] = [];
-                
             }
             $wheres = (array)$builder->wheres;
-            var_dump($wheres);
             for($ind = 0; $ind < count($wheres); $ind++ ){
+                if(!isset($wheres[$ind]['value'])){
+                     $ind++;
+                     unset($wheres[$ind]);
+                     break;
+                }
 
                 if(in_array(strtolower($tipos[$wheres[$ind]['column']]), $this->without_quotes)){
                     $new_binds[$ind] = $bindings[$ind]/1;
@@ -169,14 +180,10 @@ private function compileBindings($query, $bindings)
                 case "delete":
                     preg_match("/(?'tables'.*) where (?'attributes'.*)/i" ,$query, $matches);
                 break;
-                default:
-                    return [];
             }
 
             $desQuery = array_intersect_key($matches, array_flip(array_filter(array_keys($matches), 'is_string')));
 
-            
-            
             if(is_array($desQuery['tables'])){
                 $desQuery['tables'] = implode($desQuery['tables'], ' ');
             }
@@ -247,7 +254,6 @@ private function compileBindings($query, $bindings)
         // Detalhes: http://stackoverflow.com/questions/2718628/pdoparam-for-type-decimal
         private function compileNewQuery($query, $bindings)
         {
-            $time_start = microtime(true); 
             $newQuery = ""; 
             $bindings = $this->compileBindings($query, $bindings);
             $partQuery = explode("?", $query);
@@ -262,8 +268,6 @@ private function compileNewQuery($query, $bindings)
                         }
                     }
             }
-            echo 'Total execution time in seconds: ' . (microtime(true) - $time_start).'<br>';
-            var_dump($newQuery);
             return $newQuery;  
         }