Merge pull request #36 from marcelovsantos/master

Correction test for 5.3 and 5.4

Author: mainginski

Database/SybaseConnection.php

@@ -457,9 +457,9 @@ private function queryStringForPrimaries($from)
     */
     public function select($query, $bindings = array(), $useReadPdo = true)
     {
-        return $this->run($query, $bindings, function($me, $query, $bindings) use ($useReadPdo)
+        return $this->run($query, $bindings, function($query, $bindings) use ($useReadPdo)
         {
-            if ($me->pretending()) {
+            if ($this->pretending()) {
                 return array();
             }
 
@@ -470,18 +470,20 @@ public function select($query, $bindings = array(), $useReadPdo = true)
             }
 
             if ($offset > 0) {
-                return $this->compileOffset($offset, $query, $bindings, $me);
+                return $this->compileOffset($offset, $query, $bindings, $this);
             } else {
                 $result = [];
                 $statement = $this->getPdo()->query($this->compileNewQuery($query, $bindings));
                 do {
-                    $result+= $statement->fetchAll($me->getFetchMode());
+                    $result+= $statement->fetchAll($this->getFetchMode());
                 } while ($statement->nextRowset());
                 return $result;
             }
         });
     }
 
+    
+
 
     /**
      * @param  string  $query
@@ -490,9 +492,9 @@ public function select($query, $bindings = array(), $useReadPdo = true)
      */
     public function statement($query, $bindings = array())
     {
-        return $this->run($query, $bindings, function($me, $query, $bindings)
+        return $this->run($query, $bindings, function($query, $bindings)
         {
-            if ($me->pretending()) {
+            if ($this->pretending()) {
                 return true;
             }
             return $this->getPdo()->query($this->compileNewQuery($query, $bindings));
@@ -501,12 +503,22 @@ public function statement($query, $bindings = array())
 
     public function affectingStatement($query, $bindings = array())
     {
-        return $this->run($query, $bindings, function($me, $query, $bindings)
+        return $this->run($query, $bindings, function($query, $bindings)
         {
-            if ($me->pretending()) {
+            if ($this->pretending()) {
                 return 0;
             }
             return $this->getPdo()->query($this->compileNewQuery($query, $bindings))->rowCount();
         });
     }
+    
+    /**
+    * Get the default fetch mode for the connection.
+    *
+    * @return int
+    */
+    public function getFetchMode()
+    {
+        return $this->fetchMode;
+    }
 }

Database/SybaseConnector.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Uepg\LaravelSybase\Database;
+
+use Illuminate\Database\Connectors\SqlServerConnector;
+
+class SybaseConnector extends SqlServerConnector
+{
+
+}

Database/SybaseServiceProvider.php

@@ -1,7 +1,9 @@
 <?php namespace Uepg\LaravelSybase\Database;
 
 use Uepg\LaravelSybase\Database\SybaseConnection;
+use Uepg\LaravelSybase\Database\SybaseConnector;
 use Illuminate\Support\ServiceProvider;
+use Illuminate\Database\Connection;
 
 class SybaseServiceProvider extends ServiceProvider
 {
@@ -12,9 +14,18 @@ class SybaseServiceProvider extends ServiceProvider
      */
     public function register()
     {
-        $this->app->bind('db.connection.sqlsrv', function ($app, $parameters) {
-            list($connection, $database, $prefix, $config) = $parameters;
+
+        Connection::resolverFor('sqlsrv', function ($connection, $database, $prefix, $config) {
             return new SybaseConnection($connection, $database, $prefix, $config);
         });
+        
+        $this->app->bind('db.connector.sqlsrv', function ($app) {
+            return new SybaseConnector();
+        });
+
+        // $this->app->bind('db.connection.sqlsrv', function ($app, $parameters) {
+        //     list($connection, $database, $prefix, $config) = $parameters;
+        //     return new SybaseConnection($connection, $database, $prefix, $config);
+        // });
     }
 }