Refactored files

Author: Afonso Gloeden

Database/Connection.php

@@ -4,13 +4,14 @@
 
 use Closure;
 use Exception;
+use PDO;
+use Illuminate\Database\Connection as IlluminateConnection;
 use Doctrine\DBAL\Driver\PDOSqlsrv\Driver as DoctrineDriver;
-use Illuminate\Database\Query\Processors\SqlServerProcessor;
+use Uepg\LaravelSybase\Database\Query\Builder;
 use Uepg\LaravelSybase\Database\Query\Grammar as QueryGrammar;
+use Uepg\LaravelSybase\Database\Query\Processor;
 use Uepg\LaravelSybase\Database\Schema\Blueprint;
 use Uepg\LaravelSybase\Database\Schema\Grammar as SchemaGrammar;
-use Illuminate\Database\Connection as IlluminateConnection;
-use Illuminate\Database\Query\Builder;
 
 class Connection extends IlluminateConnection
 {
@@ -71,7 +72,7 @@ public function transaction(Closure $callback, $attempts = 1)
     /**
      * Get the default query grammar instance.
      *
-     * @return \Illuminate\Database\Query\Grammars\SqlServerGrammar
+     * @return \Uepg\LaravelSybase\Database\Query\Grammar
      */
     protected function getDefaultQueryGrammar()
     {
@@ -81,7 +82,7 @@ protected function getDefaultQueryGrammar()
     /**
      * Get the default schema grammar instance.
      *
-     * @return \Illuminate\Database\Schema\Grammars\SqlServerGrammar
+     * @return \Uepg\LaravelSybase\Database\Schema\Grammar
      */
     protected function getDefaultSchemaGrammar()
     {
@@ -91,11 +92,11 @@ protected function getDefaultSchemaGrammar()
     /**
      * Get the default post processor instance.
      *
-     * @return \Illuminate\Database\Query\Processors\SqlServerProcessor
+     * @return \Uepg\LaravelSybase\Database\Query\Processor
      */
     protected function getDefaultPostProcessor()
     {
-        return new SqlServerProcessor;
+        return new Processor;
     }
 
     /**
@@ -130,7 +131,7 @@ private function compileForSelect(Builder $builder, $bindings) {
             }
             $queryString = $this->queryStringForSelect($tables);
             $queryRes = $this->getPdo()->query($queryString);
-            $types[$tables] = $queryRes->fetchAll(\PDO::FETCH_NAMED);
+            $types[$tables] = $queryRes->fetchAll(PDO::FETCH_NAMED);
 
             foreach ($types[$tables] as &$row) {
                 $tipos[strtolower($row['name'])] = $row['type'];
@@ -369,7 +370,7 @@ private function compileBindings($query, $bindings)
                     $queryRes = $this->getPdo()->query(
                         $this->queryStringForCompileBindings($table)
                     );
-                    $types[$table] = $queryRes->fetchAll(\PDO::FETCH_ASSOC);
+                    $types[$table] = $queryRes->fetchAll(PDO::FETCH_ASSOC);
                     for ($k = 0; $k < count($types[$table]); $k++) {
                         $types[$table][
                             $types[$table][$k]['name']
@@ -711,14 +712,14 @@ public function getFetchMode()
     }
 
     /**
-     * @return \Illuminate\Database\Schema\Builder
+     * @return \Uepg\LaravelSybase\Database\Query\Builder
      */
     public function getSchemaBuilder()
     {
         if (is_null($this->schemaGrammar)) {
             $this->useDefaultSchemaGrammar();
         }
-        $builder = new \Illuminate\Database\Schema\Builder($this);
+        $builder = new Builder($this);
         $builder->blueprintResolver(function ($table, $callback) {
             return new Blueprint($table, $callback);
         });

Database/Query/Builder.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Uepg\LaravelSybase\Database\Query;
+
+use Illuminate\Database\Query\Builder as IlluminateBuilder;
+
+class Builder extends IlluminateBuilder
+{
+    //
+}

Database/Query/Grammar.php

@@ -2,8 +2,8 @@
 
 namespace Uepg\LaravelSybase\Database\Query;
 
-use Illuminate\Database\Query\Builder;
 use Illuminate\Database\Query\Grammars\Grammar as IlluminateGrammar;
+use Uepg\LaravelSybase\Database\Query\Builder;
 
 class Grammar extends IlluminateGrammar
 {
@@ -27,7 +27,7 @@ public function getBuilder(){
     /**
      * Compile a select query into SQL.
      *
-     * @param  \Illuminate\Database\Query\Builder
+     * @param  \Uepg\LaravelSybase\Database\Query\Builder
      * @return string
      */
     public function compileSelect(Builder $query)
@@ -41,7 +41,7 @@ public function compileSelect(Builder $query)
     /**
      * Compile the "select *" portion of the query.
      *
-     * @param  \Illuminate\Database\Query\Builder  $query
+     * @param  \Uepg\LaravelSybase\Database\Query\Builder  $query
      * @param  array  $columns
      * @return string
      */
@@ -67,7 +67,7 @@ protected function compileColumns(Builder $query, $columns)
     /**
      * Compile the "from" portion of the query.
      *
-     * @param  \Illuminate\Database\Query\Builder  $query
+     * @param  \Uepg\LaravelSybase\Database\Query\Builder  $query
      * @param  string  $table
      * @return string
      */
@@ -90,7 +90,7 @@ protected function compileFrom(Builder $query, $table)
     /**
      * Compile the "limit" portions of the query.
      *
-     * @param  \Illuminate\Database\Query\Builder  $query
+     * @param  \Uepg\LaravelSybase\Database\Query\Builder  $query
      * @param  int  $limit
      * @return string
      */
@@ -102,7 +102,7 @@ protected function compileLimit(Builder $query, $limit)
     /**
      * Compile the "offset" portions of the query.
      *
-     * @param  \Illuminate\Database\Query\Builder  $query
+     * @param  \Uepg\LaravelSybase\Database\Query\Builder  $query
      * @param  int  $offset
      * @return string
      */
@@ -114,7 +114,7 @@ protected function compileOffset(Builder $query, $offset)
     /**
      * Compile a truncate table statement into SQL.
      *
-     * @param  \Illuminate\Database\Query\Builder  $query
+     * @param  \Uepg\LaravelSybase\Database\Query\Builder  $query
      * @return array
      */
     public function compileTruncate(Builder $query)

Database/Query/Processor.php

@@ -2,9 +2,9 @@
 
 namespace Uepg\LaravelSybase\Database\Query;
 
-use Illuminate\Database\Query\Processors\Processor as IlluminateProcessor;
+use Illuminate\Database\Query\Processors\SqlServerProcessor;
 
-class Processor extends IlluminateProcessor
+class Processor extends SqlServerProcessor
 {
     //
 }