From 1800c46ccfa3316e34126e40c9fd054c5ba0108f Mon Sep 17 00:00:00 2001
From: Afonso Gloeden <afgloeden@gmail.com>
Date: Wed, 8 May 2019 21:03:45 -0300
Subject: [PATCH 01/11] Connection port separate from connection host

---
 README.md | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 4ec59e0..64f0c16 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ Update the package dependencies executing:
 composer update
 ```
 
-Add the following entry to your providers array in **config/app.php** file: 
+Add the following entry to your providers array in **config/app.php** file:
 
 ```php
 Uepg\LaravelSybase\Database\SybaseServiceProvider::class
@@ -46,13 +46,14 @@ return [
         ...
 
         'sqlsrv' => [
-            'driver'   => 'sqlsrv',
-            'host'     => env('DB_HOST', 'sybase.myserver.br:5000'),
+            'driver' => 'sqlsrv',
+            'host' => env('DB_HOST', 'sybase.myserver.com'),
+            'port' => env('DB_PORT', '5000'),
             'database' => env('DB_DATABASE', 'mydatabase'),
-            'username' => env('DB_USERNAME', 'forge'),
-            'password' => env('DB_PASSWORD', 'secret'),
-            'charset'  => 'utf8',
-            'prefix'   => '',
+            'username' => env('DB_USERNAME', 'user'),
+            'password' => env('DB_PASSWORD', 'password'),
+            'charset' => 'utf8',
+            'prefix' => '',
         ],
 
         ...
@@ -62,6 +63,21 @@ return [
 ]
 ```
 
+Update your **.env** with the settings for the **sqlsrv** or your custom odbc. See the following example:
+
+```text
+...
+
+DB_CONNECTION=sqlsrv
+DB_HOST=sybase.myserver.com
+DB_PORT=5000
+DB_DATABASE=mydatabase
+DB_USERNAME=user
+DB_PASSWORD=password
+
+...
+```
+
 ## Configuration of freetds driver
 
 In Linux systems the driver version must be set in **freetds.conf** file to the right use of charset pages.

From b10cf7314b951ae26ff2b692b5f4a7acdf5f233f Mon Sep 17 00:00:00 2001
From: Afonso Gloeden <afgloeden@gmail.com>
Date: Wed, 8 May 2019 21:52:02 -0300
Subject: [PATCH 02/11] Renamed files

---
 .../{SybaseConnection.php => Connection.php}  | 15 +++----
 .../{SybaseConnector.php => Connector.php}    |  2 +-
 .../Query/{SybaseGrammar.php => Grammar.php}  |  5 ++-
 Database/Query/Processor.php                  | 10 +++++
 Database/Query/SybaseProcessor.php            | 10 -----
 .../{BlueprintSybase.php => Blueprint.php}    |  4 +-
 .../Schema/{SybaseGrammar.php => Grammar.php} | 39 ++++++++++---------
 Database/SybaseServiceProvider.php            | 10 ++---
 README.md                                     |  4 +-
 9 files changed, 51 insertions(+), 48 deletions(-)
 rename Database/{SybaseConnection.php => Connection.php} (98%)
 rename Database/{SybaseConnector.php => Connector.php} (69%)
 rename Database/Query/{SybaseGrammar.php => Grammar.php} (96%)
 create mode 100644 Database/Query/Processor.php
 delete mode 100644 Database/Query/SybaseProcessor.php
 rename Database/Schema/{BlueprintSybase.php => Blueprint.php} (74%)
 rename Database/Schema/{SybaseGrammar.php => Grammar.php} (91%)

diff --git a/Database/SybaseConnection.php b/Database/Connection.php
similarity index 98%
rename from Database/SybaseConnection.php
rename to Database/Connection.php
index 0a60df7..883c75f 100644
--- a/Database/SybaseConnection.php
+++ b/Database/Connection.php
@@ -6,13 +6,14 @@
 use Exception;
 use Doctrine\DBAL\Driver\PDOSqlsrv\Driver as DoctrineDriver;
 use Illuminate\Database\Query\Processors\SqlServerProcessor;
-use Uepg\LaravelSybase\Database\Query\SybaseGrammar as QueryGrammar;
-use Uepg\LaravelSybase\Database\Schema\BlueprintSybase;
-use Uepg\LaravelSybase\Database\Schema\SybaseGrammar as SchemaGrammar;
-use Illuminate\Database\Connection;
+use Uepg\LaravelSybase\Database\Query\Grammar as QueryGrammar;
+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 SybaseConnection extends Connection {
+class Connection extends IlluminateConnection
+{
     /**
      * All types without quotes in Sybase's query.
      *
@@ -90,7 +91,7 @@ protected function getDefaultSchemaGrammar()
     /**
      * Get the default post processor instance.
      *
-     * @return \Illuminate\Database\Query\Processors\Processor
+     * @return \Illuminate\Database\Query\Processors\SqlServerProcessor
      */
     protected function getDefaultPostProcessor()
     {
@@ -719,7 +720,7 @@ public function getSchemaBuilder()
         }
         $builder = new \Illuminate\Database\Schema\Builder($this);
         $builder->blueprintResolver(function ($table, $callback) {
-            return new BlueprintSybase($table, $callback);
+            return new Blueprint($table, $callback);
         });
         return $builder;
     }
diff --git a/Database/SybaseConnector.php b/Database/Connector.php
similarity index 69%
rename from Database/SybaseConnector.php
rename to Database/Connector.php
index 2efa81c..a753cbe 100644
--- a/Database/SybaseConnector.php
+++ b/Database/Connector.php
@@ -4,7 +4,7 @@
 
 use Illuminate\Database\Connectors\SqlServerConnector;
 
-class SybaseConnector extends SqlServerConnector
+class Connector extends SqlServerConnector
 {
     //
 }
diff --git a/Database/Query/SybaseGrammar.php b/Database/Query/Grammar.php
similarity index 96%
rename from Database/Query/SybaseGrammar.php
rename to Database/Query/Grammar.php
index 65bceae..3da71d4 100644
--- a/Database/Query/SybaseGrammar.php
+++ b/Database/Query/Grammar.php
@@ -3,9 +3,10 @@
 namespace Uepg\LaravelSybase\Database\Query;
 
 use Illuminate\Database\Query\Builder;
-use Illuminate\Database\Query\Grammars\Grammar;
+use Illuminate\Database\Query\Grammars\Grammar as IlluminateGrammar;
 
-class SybaseGrammar extends Grammar {
+class Grammar extends IlluminateGrammar
+{
     /**
      * All of the available clause operators.
      *
diff --git a/Database/Query/Processor.php b/Database/Query/Processor.php
new file mode 100644
index 0000000..395f4c2
--- /dev/null
+++ b/Database/Query/Processor.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Uepg\LaravelSybase\Database\Query;
+
+use Illuminate\Database\Query\Processors\Processor as IlluminateProcessor;
+
+class Processor extends IlluminateProcessor
+{
+    //
+}
diff --git a/Database/Query/SybaseProcessor.php b/Database/Query/SybaseProcessor.php
deleted file mode 100644
index 5424f71..0000000
--- a/Database/Query/SybaseProcessor.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace Uepg\LaravelSybase\Database\Query;
-
-use Illuminate\Database\Query\Processors\Processor;
-
-class SybaseProcessor extends Processor
-{
-    //
-}
diff --git a/Database/Schema/BlueprintSybase.php b/Database/Schema/Blueprint.php
similarity index 74%
rename from Database/Schema/BlueprintSybase.php
rename to Database/Schema/Blueprint.php
index 47ff44f..6d7ff8c 100644
--- a/Database/Schema/BlueprintSybase.php
+++ b/Database/Schema/Blueprint.php
@@ -2,9 +2,9 @@
 
 namespace Uepg\LaravelSybase\Database\Schema;
 
-use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Schema\Blueprint as IlluminateBlueprint;
 
-class BlueprintSybase extends Blueprint
+class Blueprint extends IlluminateBlueprint
 {
     public function numeric($column, $total = 8, $autoIncrement = false)
     {
diff --git a/Database/Schema/SybaseGrammar.php b/Database/Schema/Grammar.php
similarity index 91%
rename from Database/Schema/SybaseGrammar.php
rename to Database/Schema/Grammar.php
index 214ac05..1145e63 100644
--- a/Database/Schema/SybaseGrammar.php
+++ b/Database/Schema/Grammar.php
@@ -2,11 +2,12 @@
 
 namespace Uepg\LaravelSybase\Database\Schema;
 
-use Illuminate\Database\Schema\Grammars\Grammar;
+use Illuminate\Database\Schema\Grammars\Grammar as IlluminateGrammar;
 use Illuminate\Support\Fluent;
-use Uepg\LaravelSybase\Database\Schema\BlueprintSybase as Blueprint;
+use Uepg\LaravelSybase\Database\Schema\Blueprint;
 
-class SybaseGrammar extends Grammar {
+class Grammar extends IlluminateGrammar
+{
     /**
      * The possible column modifiers.
      *
@@ -80,7 +81,7 @@ public function compileColumnExists($table)
     /**
      * Compile a create table command.
      *
-     * @param  \Illuminate\Database\Schema\Blueprint  $blueprint
+     * @param  \Uepg\LaravelSybase\Database\Schema\Blueprint  $blueprint
      * @param  \Illuminate\Support\Fluent  $command
      * @return string
      */
@@ -96,7 +97,7 @@ public function compileCreate(Blueprint $blueprint, Fluent $command)
     /**
      * Compile a create table command.
      *
-     * @param  \Illuminate\Database\Schema\Blueprint  $blueprint
+     * @param  \Uepg\LaravelSybase\Database\Schema\Blueprint  $blueprint
      * @param  \Illuminate\Support\Fluent  $command
      * @return string
      */
@@ -112,7 +113,7 @@ public function compileAdd(Blueprint $blueprint, Fluent $command)
     /**
      * Compile a primary key command.
      *
-     * @param  \Illuminate\Database\Schema\Blueprint  $blueprint
+     * @param  \Uepg\LaravelSybase\Database\Schema\Blueprint  $blueprint
      * @param  \Illuminate\Support\Fluent  $command
      * @return string
      */
@@ -133,7 +134,7 @@ public function compilePrimary(Blueprint $blueprint, Fluent $command)
     /**
      * Compile a unique key command.
      *
-     * @param  \Illuminate\Database\Schema\Blueprint  $blueprint
+     * @param  \Uepg\LaravelSybase\Database\Schema\Blueprint  $blueprint
      * @param  \Illuminate\Support\Fluent  $command
      * @return string
      */
@@ -151,7 +152,7 @@ public function compileUnique(Blueprint $blueprint, Fluent $command)
     /**
      * Compile a plain index key command.
      *
-     * @param  \Illuminate\Database\Schema\Blueprint  $blueprint
+     * @param  \Uepg\LaravelSybase\Database\Schema\Blueprint  $blueprint
      * @param  \Illuminate\Support\Fluent  $command
      * @return string
      */
@@ -169,7 +170,7 @@ public function compileIndex(Blueprint $blueprint, Fluent $command)
     /**
      * Compile a drop table command.
      *
-     * @param  \Illuminate\Database\Schema\Blueprint  $blueprint
+     * @param  \Uepg\LaravelSybase\Database\Schema\Blueprint  $blueprint
      * @param  \Illuminate\Support\Fluent  $command
      * @return string
      */
@@ -181,7 +182,7 @@ public function compileDrop(Blueprint $blueprint, Fluent $command)
     /**
      * Compile a drop table (if exists) command.
      *
-     * @param  \Illuminate\Database\Schema\Blueprint  $blueprint
+     * @param  \Uepg\LaravelSybase\Database\Schema\Blueprint  $blueprint
      * @param  \Illuminate\Support\Fluent  $command
      * @return string
      */
@@ -201,7 +202,7 @@ public function compileDropIfExists(Blueprint $blueprint, Fluent $command)
     /**
      * Compile a drop column command.
      *
-     * @param  \Illuminate\Database\Schema\Blueprint  $blueprint
+     * @param  \Uepg\LaravelSybase\Database\Schema\Blueprint  $blueprint
      * @param  \Illuminate\Support\Fluent  $command
      * @return string
      */
@@ -218,7 +219,7 @@ public function compileDropColumn(Blueprint $blueprint, Fluent $command)
     /**
      * Compile a drop primary key command.
      *
-     * @param  \Illuminate\Database\Schema\Blueprint  $blueprint
+     * @param  \Uepg\LaravelSybase\Database\Schema\Blueprint  $blueprint
      * @param  \Illuminate\Support\Fluent  $command
      * @return string
      */
@@ -232,7 +233,7 @@ public function compileDropPrimary(Blueprint $blueprint, Fluent $command)
     /**
      * Compile a drop unique key command.
      *
-     * @param  \Illuminate\Database\Schema\Blueprint  $blueprint
+     * @param  \Uepg\LaravelSybase\Database\Schema\Blueprint  $blueprint
      * @param  \Illuminate\Support\Fluent  $command
      * @return string
      */
@@ -246,7 +247,7 @@ public function compileDropUnique(Blueprint $blueprint, Fluent $command)
     /**
      * Compile a drop index command.
      *
-     * @param  \Illuminate\Database\Schema\Blueprint  $blueprint
+     * @param  \Uepg\LaravelSybase\Database\Schema\Blueprint  $blueprint
      * @param  \Illuminate\Support\Fluent  $command
      * @return string
      */
@@ -260,7 +261,7 @@ public function compileDropIndex(Blueprint $blueprint, Fluent $command)
     /**
      * Compile a drop foreign key command.
      *
-     * @param  \Illuminate\Database\Schema\Blueprint  $blueprint
+     * @param  \Uepg\LaravelSybase\Database\Schema\Blueprint  $blueprint
      * @param  \Illuminate\Support\Fluent  $command
      * @return string
      */
@@ -274,7 +275,7 @@ public function compileDropForeign(Blueprint $blueprint, Fluent $command)
     /**
      * Compile a rename table command.
      *
-     * @param  \Illuminate\Database\Schema\Blueprint  $blueprint
+     * @param  \Uepg\LaravelSybase\Database\Schema\Blueprint  $blueprint
      * @param  \Illuminate\Support\Fluent  $command
      * @return string
      */
@@ -576,7 +577,7 @@ protected function typeBinary(Fluent $column)
     /**
      * Get the SQL for a nullable column modifier.
      *
-     * @param  \Illuminate\Database\Schema\Blueprint  $blueprint
+     * @param  \Uepg\LaravelSybase\Database\Schema\Blueprint  $blueprint
      * @param  \Illuminate\Support\Fluent  $column
      * @return string|null
      */
@@ -588,7 +589,7 @@ protected function modifyNullable(Blueprint $blueprint, Fluent $column)
     /**
      * Get the SQL for a default column modifier.
      *
-     * @param  \Illuminate\Database\Schema\Blueprint  $blueprint
+     * @param  \Uepg\LaravelSybase\Database\Schema\Blueprint  $blueprint
      * @param  \Illuminate\Support\Fluent  $column
      * @return string|null
      */
@@ -602,7 +603,7 @@ protected function modifyDefault(Blueprint $blueprint, Fluent $column)
     /**
      * Get the SQL for an auto-increment column modifier.
      *
-     * @param  \Illuminate\Database\Schema\Blueprint  $blueprint
+     * @param  \Uepg\LaravelSybase\Database\Schema\Blueprint  $blueprint
      * @param  \Illuminate\Support\Fluent  $column
      * @return string|null
      */
diff --git a/Database/SybaseServiceProvider.php b/Database/SybaseServiceProvider.php
index 968bbdd..783572e 100644
--- a/Database/SybaseServiceProvider.php
+++ b/Database/SybaseServiceProvider.php
@@ -2,10 +2,10 @@
 
 namespace Uepg\LaravelSybase\Database;
 
-use Uepg\LaravelSybase\Database\SybaseConnection;
-use Uepg\LaravelSybase\Database\SybaseConnector;
+use Uepg\LaravelSybase\Database\Connection as SybaseConnection;
+use Uepg\LaravelSybase\Database\Connector;
 use Illuminate\Support\ServiceProvider;
-use Illuminate\Database\Connection;
+use Illuminate\Database\Connection as IlluminateConnection;
 
 class SybaseServiceProvider extends ServiceProvider
 {
@@ -16,7 +16,7 @@ class SybaseServiceProvider extends ServiceProvider
      */
     public function register()
     {
-        Connection::resolverFor('sqlsrv', function (
+        IlluminateConnection::resolverFor('sqlsrv', function (
             $connection,
             $database,
             $prefix,
@@ -31,7 +31,7 @@ public function register()
         });
 
         $this->app->bind('db.connector.sqlsrv', function ($app) {
-            return new SybaseConnector();
+            return new Connector();
         });
 
         // $this->app->bind('db.connection.sqlsrv', function (
diff --git a/README.md b/README.md
index 64f0c16..581664c 100644
--- a/README.md
+++ b/README.md
@@ -92,14 +92,14 @@ The file is usualy found in **/etc/freetds/freetds.conf**. Set the configuration
 
 ## Setting to use numeric data type
 
-In the migration file you must replace `use Illuminate\Database\Schema\Blueprint;` with `use Uepg\LaravelSybase\Database\Schema\BlueprintSybase as Blueprint;`. See the following example:
+In the migration file you must replace `use Illuminate\Database\Schema\Blueprint;` with `use Uepg\LaravelSybase\Database\Schema\Blueprint;`. See the following example:
 
 ```php
 <?php
 
 use Illuminate\Support\Facades\Schema;
 // use Illuminate\Database\Schema\Blueprint;
-use Uepg\LaravelSybase\Database\Schema\BlueprintSybase as Blueprint;
+use Uepg\LaravelSybase\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
 class CreateTable extends Migration

From d08d93ec33a7832d2bdde3be44015d7ef3ac4c9b Mon Sep 17 00:00:00 2001
From: Afonso Gloeden <afgloeden@gmail.com>
Date: Wed, 8 May 2019 22:36:45 -0300
Subject: [PATCH 03/11] Refactored files

---
 Database/Connection.php            | 23 ++++----
 Database/Query/Builder.php         | 10 ++++
 Database/Query/Grammar.php         | 14 ++---
 Database/Query/Processor.php       |  4 +-
 Database/Schema/Grammar.php        | 86 +++++++++++++++---------------
 Database/SybaseServiceProvider.php |  4 +-
 Support/Fluent.php                 | 10 ++++
 composer.json                      |  3 +-
 8 files changed, 88 insertions(+), 66 deletions(-)
 create mode 100644 Database/Query/Builder.php
 create mode 100644 Support/Fluent.php

diff --git a/Database/Connection.php b/Database/Connection.php
index 883c75f..f27db2f 100644
--- a/Database/Connection.php
+++ b/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);
         });
diff --git a/Database/Query/Builder.php b/Database/Query/Builder.php
new file mode 100644
index 0000000..3731bb8
--- /dev/null
+++ b/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
+{
+    //
+}
diff --git a/Database/Query/Grammar.php b/Database/Query/Grammar.php
index 3da71d4..407221d 100644
--- a/Database/Query/Grammar.php
+++ b/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)
diff --git a/Database/Query/Processor.php b/Database/Query/Processor.php
index 395f4c2..bdded68 100644
--- a/Database/Query/Processor.php
+++ b/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
 {
     //
 }
diff --git a/Database/Schema/Grammar.php b/Database/Schema/Grammar.php
index 1145e63..9b0b176 100644
--- a/Database/Schema/Grammar.php
+++ b/Database/Schema/Grammar.php
@@ -3,8 +3,8 @@
 namespace Uepg\LaravelSybase\Database\Schema;
 
 use Illuminate\Database\Schema\Grammars\Grammar as IlluminateGrammar;
-use Illuminate\Support\Fluent;
 use Uepg\LaravelSybase\Database\Schema\Blueprint;
+use Uepg\LaravelSybase\Support\Fluent;
 
 class Grammar extends IlluminateGrammar
 {
@@ -82,7 +82,7 @@ public function compileColumnExists($table)
      * Compile a create table command.
      *
      * @param  \Uepg\LaravelSybase\Database\Schema\Blueprint  $blueprint
-     * @param  \Illuminate\Support\Fluent  $command
+     * @param  \Uepg\LaravelSybase\Support\Fluent  $command
      * @return string
      */
     public function compileCreate(Blueprint $blueprint, Fluent $command)
@@ -98,7 +98,7 @@ public function compileCreate(Blueprint $blueprint, Fluent $command)
      * Compile a create table command.
      *
      * @param  \Uepg\LaravelSybase\Database\Schema\Blueprint  $blueprint
-     * @param  \Illuminate\Support\Fluent  $command
+     * @param  \Uepg\LaravelSybase\Support\Fluent  $command
      * @return string
      */
     public function compileAdd(Blueprint $blueprint, Fluent $command)
@@ -114,7 +114,7 @@ public function compileAdd(Blueprint $blueprint, Fluent $command)
      * Compile a primary key command.
      *
      * @param  \Uepg\LaravelSybase\Database\Schema\Blueprint  $blueprint
-     * @param  \Illuminate\Support\Fluent  $command
+     * @param  \Uepg\LaravelSybase\Support\Fluent  $command
      * @return string
      */
     public function compilePrimary(Blueprint $blueprint, Fluent $command)
@@ -135,7 +135,7 @@ public function compilePrimary(Blueprint $blueprint, Fluent $command)
      * Compile a unique key command.
      *
      * @param  \Uepg\LaravelSybase\Database\Schema\Blueprint  $blueprint
-     * @param  \Illuminate\Support\Fluent  $command
+     * @param  \Uepg\LaravelSybase\Support\Fluent  $command
      * @return string
      */
     public function compileUnique(Blueprint $blueprint, Fluent $command)
@@ -153,7 +153,7 @@ public function compileUnique(Blueprint $blueprint, Fluent $command)
      * Compile a plain index key command.
      *
      * @param  \Uepg\LaravelSybase\Database\Schema\Blueprint  $blueprint
-     * @param  \Illuminate\Support\Fluent  $command
+     * @param  \Uepg\LaravelSybase\Support\Fluent  $command
      * @return string
      */
     public function compileIndex(Blueprint $blueprint, Fluent $command)
@@ -171,7 +171,7 @@ public function compileIndex(Blueprint $blueprint, Fluent $command)
      * Compile a drop table command.
      *
      * @param  \Uepg\LaravelSybase\Database\Schema\Blueprint  $blueprint
-     * @param  \Illuminate\Support\Fluent  $command
+     * @param  \Uepg\LaravelSybase\Support\Fluent  $command
      * @return string
      */
     public function compileDrop(Blueprint $blueprint, Fluent $command)
@@ -183,7 +183,7 @@ public function compileDrop(Blueprint $blueprint, Fluent $command)
      * Compile a drop table (if exists) command.
      *
      * @param  \Uepg\LaravelSybase\Database\Schema\Blueprint  $blueprint
-     * @param  \Illuminate\Support\Fluent  $command
+     * @param  \Uepg\LaravelSybase\Support\Fluent  $command
      * @return string
      */
     public function compileDropIfExists(Blueprint $blueprint, Fluent $command)
@@ -203,7 +203,7 @@ public function compileDropIfExists(Blueprint $blueprint, Fluent $command)
      * Compile a drop column command.
      *
      * @param  \Uepg\LaravelSybase\Database\Schema\Blueprint  $blueprint
-     * @param  \Illuminate\Support\Fluent  $command
+     * @param  \Uepg\LaravelSybase\Support\Fluent  $command
      * @return string
      */
     public function compileDropColumn(Blueprint $blueprint, Fluent $command)
@@ -220,7 +220,7 @@ public function compileDropColumn(Blueprint $blueprint, Fluent $command)
      * Compile a drop primary key command.
      *
      * @param  \Uepg\LaravelSybase\Database\Schema\Blueprint  $blueprint
-     * @param  \Illuminate\Support\Fluent  $command
+     * @param  \Uepg\LaravelSybase\Support\Fluent  $command
      * @return string
      */
     public function compileDropPrimary(Blueprint $blueprint, Fluent $command)
@@ -234,7 +234,7 @@ public function compileDropPrimary(Blueprint $blueprint, Fluent $command)
      * Compile a drop unique key command.
      *
      * @param  \Uepg\LaravelSybase\Database\Schema\Blueprint  $blueprint
-     * @param  \Illuminate\Support\Fluent  $command
+     * @param  \Uepg\LaravelSybase\Support\Fluent  $command
      * @return string
      */
     public function compileDropUnique(Blueprint $blueprint, Fluent $command)
@@ -248,7 +248,7 @@ public function compileDropUnique(Blueprint $blueprint, Fluent $command)
      * Compile a drop index command.
      *
      * @param  \Uepg\LaravelSybase\Database\Schema\Blueprint  $blueprint
-     * @param  \Illuminate\Support\Fluent  $command
+     * @param  \Uepg\LaravelSybase\Support\Fluent  $command
      * @return string
      */
     public function compileDropIndex(Blueprint $blueprint, Fluent $command)
@@ -262,7 +262,7 @@ public function compileDropIndex(Blueprint $blueprint, Fluent $command)
      * Compile a drop foreign key command.
      *
      * @param  \Uepg\LaravelSybase\Database\Schema\Blueprint  $blueprint
-     * @param  \Illuminate\Support\Fluent  $command
+     * @param  \Uepg\LaravelSybase\Support\Fluent  $command
      * @return string
      */
     public function compileDropForeign(Blueprint $blueprint, Fluent $command)
@@ -276,7 +276,7 @@ public function compileDropForeign(Blueprint $blueprint, Fluent $command)
      * Compile a rename table command.
      *
      * @param  \Uepg\LaravelSybase\Database\Schema\Blueprint  $blueprint
-     * @param  \Illuminate\Support\Fluent  $command
+     * @param  \Uepg\LaravelSybase\Support\Fluent  $command
      * @return string
      */
     public function compileRename(Blueprint $blueprint, Fluent $command)
@@ -289,7 +289,7 @@ public function compileRename(Blueprint $blueprint, Fluent $command)
     /**
      * Create the column definition for a char type.
      *
-     * @param  \Illuminate\Support\Fluent  $column
+     * @param  \Uepg\LaravelSybase\Support\Fluent  $column
      * @return string
      */
     protected function typeChar(Fluent $column)
@@ -300,7 +300,7 @@ protected function typeChar(Fluent $column)
     /**
      * Create the column definition for a string type.
      *
-     * @param  \Illuminate\Support\Fluent  $column
+     * @param  \Uepg\LaravelSybase\Support\Fluent  $column
      * @return string
      */
     protected function typeString(Fluent $column)
@@ -311,7 +311,7 @@ protected function typeString(Fluent $column)
     /**
      * Create the column definition for a text type.
      *
-     * @param  \Illuminate\Support\Fluent  $column
+     * @param  \Uepg\LaravelSybase\Support\Fluent  $column
      * @return string
      */
     protected function typeText(Fluent $column)
@@ -322,7 +322,7 @@ protected function typeText(Fluent $column)
     /**
      * Create the column definition for a medium text type.
      *
-     * @param  \Illuminate\Support\Fluent  $column
+     * @param  \Uepg\LaravelSybase\Support\Fluent  $column
      * @return string
      */
     protected function typeMediumText(Fluent $column)
@@ -333,7 +333,7 @@ protected function typeMediumText(Fluent $column)
     /**
      * Create the column definition for a long text type.
      *
-     * @param  \Illuminate\Support\Fluent  $column
+     * @param  \Uepg\LaravelSybase\Support\Fluent  $column
      * @return string
      */
     protected function typeLongText(Fluent $column)
@@ -344,7 +344,7 @@ protected function typeLongText(Fluent $column)
     /**
      * Create the column definition for a integer type.
      *
-     * @param  \Illuminate\Support\Fluent  $column
+     * @param  \Uepg\LaravelSybase\Support\Fluent  $column
      * @return string
      */
     protected function typeInteger(Fluent $column)
@@ -355,7 +355,7 @@ protected function typeInteger(Fluent $column)
     /**
      * Create the column definition for a big integer type.
      *
-     * @param  \Illuminate\Support\Fluent  $column
+     * @param  \Uepg\LaravelSybase\Support\Fluent  $column
      * @return string
      */
     protected function typeBigInteger(Fluent $column)
@@ -366,7 +366,7 @@ protected function typeBigInteger(Fluent $column)
     /**
      * Create the column definition for a medium integer type.
      *
-     * @param  \Illuminate\Support\Fluent  $column
+     * @param  \Uepg\LaravelSybase\Support\Fluent  $column
      * @return string
      */
     protected function typeMediumInteger(Fluent $column)
@@ -377,7 +377,7 @@ protected function typeMediumInteger(Fluent $column)
     /**
      * Create the column definition for a tiny integer type.
      *
-     * @param  \Illuminate\Support\Fluent  $column
+     * @param  \Uepg\LaravelSybase\Support\Fluent  $column
      * @return string
      */
     protected function typeTinyInteger(Fluent $column)
@@ -388,7 +388,7 @@ protected function typeTinyInteger(Fluent $column)
     /**
      * Create the column definition for a small integer type.
      *
-     * @param  \Illuminate\Support\Fluent  $column
+     * @param  \Uepg\LaravelSybase\Support\Fluent  $column
      * @return string
      */
     protected function typeSmallInteger(Fluent $column)
@@ -399,7 +399,7 @@ protected function typeSmallInteger(Fluent $column)
     /**
      * Create the column definition for a float type.
      *
-     * @param  \Illuminate\Support\Fluent  $column
+     * @param  \Uepg\LaravelSybase\Support\Fluent  $column
      * @return string
      */
     protected function typeFloat(Fluent $column)
@@ -410,7 +410,7 @@ protected function typeFloat(Fluent $column)
     /**
      * Create the column definition for a double type.
      *
-     * @param  \Illuminate\Support\Fluent  $column
+     * @param  \Uepg\LaravelSybase\Support\Fluent  $column
      * @return string
      */
     protected function typeDouble(Fluent $column)
@@ -421,7 +421,7 @@ protected function typeDouble(Fluent $column)
     /**
      * Create the column definition for a decimal type.
      *
-     * @param  \Illuminate\Support\Fluent  $column
+     * @param  \Uepg\LaravelSybase\Support\Fluent  $column
      * @return string
      */
     protected function typeDecimal(Fluent $column)
@@ -432,7 +432,7 @@ protected function typeDecimal(Fluent $column)
     /**
      * Create the column definition for a numeric type.
      *
-     * @param \Illuminate\Support\Fluent $column
+     * @param \Uepg\LaravelSybase\Support\Fluent $column
      * @return string
      */
     protected function typeNumeric(Fluent $column)
@@ -443,7 +443,7 @@ protected function typeNumeric(Fluent $column)
     /**
      * Create the column definition for a boolean type.
      *
-     * @param  \Illuminate\Support\Fluent  $column
+     * @param  \Uepg\LaravelSybase\Support\Fluent  $column
      * @return string
      */
     protected function typeBoolean(Fluent $column)
@@ -454,7 +454,7 @@ protected function typeBoolean(Fluent $column)
     /**
      * Create the column definition for an enum type.
      *
-     * @param  \Illuminate\Support\Fluent  $column
+     * @param  \Uepg\LaravelSybase\Support\Fluent  $column
      * @return string
      */
     protected function typeEnum(Fluent $column)
@@ -465,7 +465,7 @@ protected function typeEnum(Fluent $column)
     /**
      * Create the column definition for a json type.
      *
-     * @param  \Illuminate\Support\Fluent  $column
+     * @param  \Uepg\LaravelSybase\Support\Fluent  $column
      * @return string
      */
     protected function typeJson(Fluent $column)
@@ -476,7 +476,7 @@ protected function typeJson(Fluent $column)
     /**
      * Create the column definition for a jsonb type.
      *
-     * @param  \Illuminate\Support\Fluent  $column
+     * @param  \Uepg\LaravelSybase\Support\Fluent  $column
      * @return string
      */
     protected function typeJsonb(Fluent $column)
@@ -487,7 +487,7 @@ protected function typeJsonb(Fluent $column)
     /**
      * Create the column definition for a date type.
      *
-     * @param  \Illuminate\Support\Fluent  $column
+     * @param  \Uepg\LaravelSybase\Support\Fluent  $column
      * @return string
      */
     protected function typeDate(Fluent $column)
@@ -498,7 +498,7 @@ protected function typeDate(Fluent $column)
     /**
      * Create the column definition for a date-time type.
      *
-     * @param  \Illuminate\Support\Fluent  $column
+     * @param  \Uepg\LaravelSybase\Support\Fluent  $column
      * @return string
      */
     protected function typeDateTime(Fluent $column)
@@ -509,7 +509,7 @@ protected function typeDateTime(Fluent $column)
     /**
      * Create the column definition for a date-time type.
      *
-     * @param  \Illuminate\Support\Fluent  $column
+     * @param  \Uepg\LaravelSybase\Support\Fluent  $column
      * @return string
      */
     protected function typeDateTimeTz(Fluent $column)
@@ -520,7 +520,7 @@ protected function typeDateTimeTz(Fluent $column)
     /**
      * Create the column definition for a time type.
      *
-     * @param  \Illuminate\Support\Fluent  $column
+     * @param  \Uepg\LaravelSybase\Support\Fluent  $column
      * @return string
      */
     protected function typeTime(Fluent $column)
@@ -531,7 +531,7 @@ protected function typeTime(Fluent $column)
     /**
      * Create the column definition for a time type.
      *
-     * @param  \Illuminate\Support\Fluent  $column
+     * @param  \Uepg\LaravelSybase\Support\Fluent  $column
      * @return string
      */
     protected function typeTimeTz(Fluent $column)
@@ -542,7 +542,7 @@ protected function typeTimeTz(Fluent $column)
     /**
      * Create the column definition for a timestamp type.
      *
-     * @param  \Illuminate\Support\Fluent  $column
+     * @param  \Uepg\LaravelSybase\Support\Fluent  $column
      * @return string
      */
     protected function typeTimestamp(Fluent $column)
@@ -555,7 +555,7 @@ protected function typeTimestamp(Fluent $column)
      *
      * @link https://msdn.microsoft.com/en-us/library/bb630289(v=sql.120).aspx
      *
-     * @param  \Illuminate\Support\Fluent  $column
+     * @param  \Uepg\LaravelSybase\Support\Fluent  $column
      * @return string
      */
     protected function typeTimestampTz(Fluent $column)
@@ -566,7 +566,7 @@ protected function typeTimestampTz(Fluent $column)
     /**
      * Create the column definition for a binary type.
      *
-     * @param  \Illuminate\Support\Fluent  $column
+     * @param  \Uepg\LaravelSybase\Support\Fluent  $column
      * @return string
      */
     protected function typeBinary(Fluent $column)
@@ -578,7 +578,7 @@ protected function typeBinary(Fluent $column)
      * Get the SQL for a nullable column modifier.
      *
      * @param  \Uepg\LaravelSybase\Database\Schema\Blueprint  $blueprint
-     * @param  \Illuminate\Support\Fluent  $column
+     * @param  \Uepg\LaravelSybase\Support\Fluent  $column
      * @return string|null
      */
     protected function modifyNullable(Blueprint $blueprint, Fluent $column)
@@ -590,7 +590,7 @@ protected function modifyNullable(Blueprint $blueprint, Fluent $column)
      * Get the SQL for a default column modifier.
      *
      * @param  \Uepg\LaravelSybase\Database\Schema\Blueprint  $blueprint
-     * @param  \Illuminate\Support\Fluent  $column
+     * @param  \Uepg\LaravelSybase\Support\Fluent  $column
      * @return string|null
      */
     protected function modifyDefault(Blueprint $blueprint, Fluent $column)
@@ -604,7 +604,7 @@ protected function modifyDefault(Blueprint $blueprint, Fluent $column)
      * Get the SQL for an auto-increment column modifier.
      *
      * @param  \Uepg\LaravelSybase\Database\Schema\Blueprint  $blueprint
-     * @param  \Illuminate\Support\Fluent  $column
+     * @param  \Uepg\LaravelSybase\Support\Fluent  $column
      * @return string|null
      */
     protected function modifyIncrement(Blueprint $blueprint, Fluent $column)
diff --git a/Database/SybaseServiceProvider.php b/Database/SybaseServiceProvider.php
index 783572e..cf0dda8 100644
--- a/Database/SybaseServiceProvider.php
+++ b/Database/SybaseServiceProvider.php
@@ -2,10 +2,10 @@
 
 namespace Uepg\LaravelSybase\Database;
 
+use Illuminate\Database\Connection as IlluminateConnection;
+use Illuminate\Support\ServiceProvider;
 use Uepg\LaravelSybase\Database\Connection as SybaseConnection;
 use Uepg\LaravelSybase\Database\Connector;
-use Illuminate\Support\ServiceProvider;
-use Illuminate\Database\Connection as IlluminateConnection;
 
 class SybaseServiceProvider extends ServiceProvider
 {
diff --git a/Support/Fluent.php b/Support/Fluent.php
new file mode 100644
index 0000000..eb2a9e8
--- /dev/null
+++ b/Support/Fluent.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Uepg\LaravelSybase\Support;
+
+use Illuminate\Support\Fluent as IlluminateFluent;
+
+class Fluent extends IlluminateFluent
+{
+    //
+}
diff --git a/composer.json b/composer.json
index 4250d28..0258e32 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,8 @@
     },
     "autoload": {
         "psr-4": {
-            "Uepg\\LaravelSybase\\Database\\": "Database/"
+            "Uepg\\LaravelSybase\\Database\\": "Database/",
+            "Uepg\\LaravelSybase\\Support\\": "Support/"
         }
     }
 }

From bf21288929361edfb4121ce8a1d181ba0283932e Mon Sep 17 00:00:00 2001
From: Afonso Gloeden <afgloeden@gmail.com>
Date: Fri, 10 May 2019 20:11:19 -0300
Subject: [PATCH 04/11] composer.json restructured

---
 .gitignore    |  1 +
 composer.json | 17 ++++++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 61ead86..8b7ef35 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /vendor
+composer.lock
diff --git a/composer.json b/composer.json
index 0258e32..e6175c4 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "uepg/laravel-sybase",
-    "description": "Sybase based Eloquent module extension for Laravel 5.x.",
     "type": "library",
+    "description": "Sybase based Eloquent module extension for Laravel 5.x.",
     "authors": [
         {
             "name": "Gabriel Tadra Mainginski",
@@ -12,15 +12,26 @@
             "email": "mazer@uepg.br"
         }
     ],
-    "minimum-stability": "dev",
+    "keywords": [
+        "sybase"
+    ],
+    "license": "GPL-2.0-only",
     "require": {
         "php": ">=5.5",
         "laravel/framework": "5.*"
     },
+    "require-dev": {},
+    "config": {
+        "optimize-autoloader": true,
+        "preferred-install": "dist",
+        "sort-packages": true
+    },
     "autoload": {
         "psr-4": {
             "Uepg\\LaravelSybase\\Database\\": "Database/",
             "Uepg\\LaravelSybase\\Support\\": "Support/"
         }
-    }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }

From 525ad6a04a973d7d726adbf601a0129ee85ef0ff Mon Sep 17 00:00:00 2001
From: Afonso Gloeden <afgloeden@gmail.com>
Date: Fri, 10 May 2019 20:23:08 -0300
Subject: [PATCH 05/11] Dependencies for version 2.* updated

---
 composer.json | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index e6175c4..3671c73 100644
--- a/composer.json
+++ b/composer.json
@@ -17,8 +17,10 @@
     ],
     "license": "GPL-2.0-only",
     "require": {
-        "php": ">=5.5",
-        "laravel/framework": "5.*"
+        "php": ">=5.6.4",
+        "doctrine/dbal": "^2.9",
+        "illuminate/database": "^5.4",
+        "illuminate/support": "^5.4"
     },
     "require-dev": {},
     "config": {

From a551763160968795779723c53c2c77b783c433bc Mon Sep 17 00:00:00 2001
From: Afonso Gloeden <afgloeden@gmail.com>
Date: Fri, 10 May 2019 21:06:27 -0300
Subject: [PATCH 06/11] Badges added in README.md

---
 README.md | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 581664c..ff5b416 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,11 @@
-# laravel-sybase
+# Sybase ASE based Eloquent module extension for Laravel 5.x
+
+[![Packagist Version](https://img.shields.io/packagist/v/uepg/laravel-sybase.svg)](https://packagist.org/packages/uepg/laravel-sybase)
+[![PHP from Packagist](https://img.shields.io/packagist/php-v/uepg/laravel-sybase.svg)](https://packagist.org/packages/uepg/laravel-sybase)
+[![Packagist](https://img.shields.io/packagist/dt/uepg/laravel-sybase.svg)](https://packagist.org/packages/uepg/laravel-sybase/stats)
+[![GitHub contributors](https://img.shields.io/github/contributors-anon/uepg/laravel-sybase.svg)](https://github.com/uepg/laravel-sybase/graphs/contributors)
+[![GitHub](https://img.shields.io/github/license/uepg/laravel-sybase.svg)](https://github.com/uepg/laravel-sybase/blob/master/LICENSE)
 
-Sybase ASE based Eloquent module extension for Laravel 5.x.
 * Enables use of multiple kinds of fields.
 * Use default eloquent: works with odbc and dblib!
 * Migrations! (WIP - Work in Progress)

From 521552c68db03eacefd295b58479e0d596ed973b Mon Sep 17 00:00:00 2001
From: Afonso Gloeden <afgloeden@gmail.com>
Date: Fri, 10 May 2019 21:26:36 -0300
Subject: [PATCH 07/11] Files put in src folder

---
 README.md                                              |  2 +-
 composer.json                                          | 10 ++++++++--
 .../Uepg/LaravelSybase/Database}/Connection.php        |  0
 .../Uepg/LaravelSybase/Database}/Connector.php         |  0
 .../Uepg/LaravelSybase/Database}/Query/Builder.php     |  0
 .../Uepg/LaravelSybase/Database}/Query/Grammar.php     |  0
 .../Uepg/LaravelSybase/Database}/Query/Processor.php   |  0
 .../Uepg/LaravelSybase/Database}/Schema/Blueprint.php  |  0
 .../Uepg/LaravelSybase/Database}/Schema/Grammar.php    |  0
 {Support => src/Uepg/LaravelSybase/Support}/Fluent.php |  0
 .../Uepg/LaravelSybase}/SybaseServiceProvider.php      |  2 +-
 11 files changed, 10 insertions(+), 4 deletions(-)
 rename {Database => src/Uepg/LaravelSybase/Database}/Connection.php (100%)
 rename {Database => src/Uepg/LaravelSybase/Database}/Connector.php (100%)
 rename {Database => src/Uepg/LaravelSybase/Database}/Query/Builder.php (100%)
 rename {Database => src/Uepg/LaravelSybase/Database}/Query/Grammar.php (100%)
 rename {Database => src/Uepg/LaravelSybase/Database}/Query/Processor.php (100%)
 rename {Database => src/Uepg/LaravelSybase/Database}/Schema/Blueprint.php (100%)
 rename {Database => src/Uepg/LaravelSybase/Database}/Schema/Grammar.php (100%)
 rename {Support => src/Uepg/LaravelSybase/Support}/Fluent.php (100%)
 rename {Database => src/Uepg/LaravelSybase}/SybaseServiceProvider.php (96%)

diff --git a/README.md b/README.md
index ff5b416..100f9e7 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ composer update
 Add the following entry to your providers array in **config/app.php** file:
 
 ```php
-Uepg\LaravelSybase\Database\SybaseServiceProvider::class
+Uepg\LaravelSybase\SybaseServiceProvider::class
 ```
 
 Update your **config/database.php's** default driver with the settings for the **sqlsrv** or your custom odbc. See the following example:
diff --git a/composer.json b/composer.json
index 3671c73..88a50e4 100644
--- a/composer.json
+++ b/composer.json
@@ -28,10 +28,16 @@
         "preferred-install": "dist",
         "sort-packages": true
     },
+    "extra": {
+        "laravel": {
+            "providers": [
+                "Uepg\\LaravelSybase\\SybaseServiceProvider"
+            ]
+        }
+    },
     "autoload": {
         "psr-4": {
-            "Uepg\\LaravelSybase\\Database\\": "Database/",
-            "Uepg\\LaravelSybase\\Support\\": "Support/"
+            "Uepg\\LaravelSybase\\": "src/"
         }
     },
     "minimum-stability": "dev",
diff --git a/Database/Connection.php b/src/Uepg/LaravelSybase/Database/Connection.php
similarity index 100%
rename from Database/Connection.php
rename to src/Uepg/LaravelSybase/Database/Connection.php
diff --git a/Database/Connector.php b/src/Uepg/LaravelSybase/Database/Connector.php
similarity index 100%
rename from Database/Connector.php
rename to src/Uepg/LaravelSybase/Database/Connector.php
diff --git a/Database/Query/Builder.php b/src/Uepg/LaravelSybase/Database/Query/Builder.php
similarity index 100%
rename from Database/Query/Builder.php
rename to src/Uepg/LaravelSybase/Database/Query/Builder.php
diff --git a/Database/Query/Grammar.php b/src/Uepg/LaravelSybase/Database/Query/Grammar.php
similarity index 100%
rename from Database/Query/Grammar.php
rename to src/Uepg/LaravelSybase/Database/Query/Grammar.php
diff --git a/Database/Query/Processor.php b/src/Uepg/LaravelSybase/Database/Query/Processor.php
similarity index 100%
rename from Database/Query/Processor.php
rename to src/Uepg/LaravelSybase/Database/Query/Processor.php
diff --git a/Database/Schema/Blueprint.php b/src/Uepg/LaravelSybase/Database/Schema/Blueprint.php
similarity index 100%
rename from Database/Schema/Blueprint.php
rename to src/Uepg/LaravelSybase/Database/Schema/Blueprint.php
diff --git a/Database/Schema/Grammar.php b/src/Uepg/LaravelSybase/Database/Schema/Grammar.php
similarity index 100%
rename from Database/Schema/Grammar.php
rename to src/Uepg/LaravelSybase/Database/Schema/Grammar.php
diff --git a/Support/Fluent.php b/src/Uepg/LaravelSybase/Support/Fluent.php
similarity index 100%
rename from Support/Fluent.php
rename to src/Uepg/LaravelSybase/Support/Fluent.php
diff --git a/Database/SybaseServiceProvider.php b/src/Uepg/LaravelSybase/SybaseServiceProvider.php
similarity index 96%
rename from Database/SybaseServiceProvider.php
rename to src/Uepg/LaravelSybase/SybaseServiceProvider.php
index cf0dda8..78ba1c1 100644
--- a/Database/SybaseServiceProvider.php
+++ b/src/Uepg/LaravelSybase/SybaseServiceProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Uepg\LaravelSybase\Database;
+namespace Uepg\LaravelSybase;
 
 use Illuminate\Database\Connection as IlluminateConnection;
 use Illuminate\Support\ServiceProvider;

From 9a8b9f474f053ab8b42155156c595fe62bdca821 Mon Sep 17 00:00:00 2001
From: Afonso Gloeden <afgloeden@gmail.com>
Date: Fri, 10 May 2019 22:54:41 -0300
Subject: [PATCH 08/11] CHANGELOG.md added

---
 CHANGELOG.md | 154 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 154 insertions(+)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..c5cb1fb
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,154 @@
+# Release Notes
+
+## [Unreleased](https://github.com/uepg/laravel-sybase/compare/2.1.2...master)
+
+
+## [2.1.2 (2019-04-19)](https://github.com/uepg/laravel-sybase/compare/2.1.1...2.1.2)
+
+Merge pull request [#43](https://github.com/uepg/laravel-sybase/pull/43) from afgloeden/master
+
+Problem with constraint length of the primary key fixed
+
+
+## [2.1.1 (2019-04-05)](https://github.com/uepg/laravel-sybase/compare/2.1.0...2.1.1)
+
+Merge pull request [#42](https://github.com/uepg/laravel-sybase/pull/42) from afgloeden/master
+
+Changes related to PSR's
+
+
+## [2.1.0 (2019-01-23)](https://github.com/uepg/laravel-sybase/compare/2.0...2.1.0)
+
+See README
+
+
+## [2.0 (2017-08-02)](https://github.com/uepg/laravel-sybase/compare/1.3.2...2.0)
+
+Merge pull request [#36](https://github.com/uepg/laravel-sybase/pull/36) from marcelovsantos/master
+
+Correction test for 5.3 and 5.4
+
+
+## [1.3.2 (2017-03-14)](https://github.com/uepg/laravel-sybase/compare/1.3.1...1.3.2)
+
+Better identention
+
+
+## [1.3.1 (2017-03-14)](https://github.com/uepg/laravel-sybase/compare/1.3...1.3.1)
+
+Fix [#29](https://github.com/uepg/laravel-sybase/issues/29)
+
+
+## [1.3 (2017-01-24)](https://github.com/uepg/laravel-sybase/compare/1.2.1...1.3)
+
+Merging dev in master
+
+
+## [1.2.1 (2016-09-16)](https://github.com/uepg/laravel-sybase/compare/1.2.0.7...1.2.1)
+
+Added support to multiples resultset
+
+
+## [1.2.0.7 (2016-06-09)](https://github.com/uepg/laravel-sybase/compare/1.2.0.6...1.2.0.7)
+
+Merge branch 'case_insensitive'
+
+
+## [1.2.0.6 (2016-06-06)](https://github.com/uepg/laravel-sybase/compare/1.2.0.5...1.2.0.6)
+
+Merge branch 'multiple_connections'
+
+
+## [1.2.0.5 (2016-06-02)](https://github.com/uepg/laravel-sybase/compare/1.2.0.4...1.2.0.5)
+
+Fix a offset problem in joins
+
+
+## [1.2.0.4 (2016-05-23)](https://github.com/uepg/laravel-sybase/compare/1.2.0.3...1.2.0.4)
+
+Fix [#13](https://github.com/uepg/laravel-sybase/issues/13)
+
+
+## [1.2.0.3 (2016-05-19)](https://github.com/uepg/laravel-sybase/compare/1.2.0.2...1.2.0.3)
+
+Fix [#13](https://github.com/uepg/laravel-sybase/issues/13) for insert, remove and update
+
+
+## [1.2.0.2 (2016-05-18)](https://github.com/uepg/laravel-sybase/compare/1.2.0.1...1.2.0.2)
+
+Fix [#14](https://github.com/uepg/laravel-sybase/issues/14)
+
+
+## [1.2.0.1 (2016-05-12)](https://github.com/uepg/laravel-sybase/compare/1.2...1.2.0.1)
+
+Add money to
+
+
+## [1.2 (2016-05-03)](https://github.com/uepg/laravel-sybase/compare/1.1...1.2)
+
+Merge branch 'dev'
+
+
+## [1.1 (2016-03-16)](https://github.com/uepg/laravel-sybase/compare/1.0.3...1.1)
+
+Probably fixed [#11](https://github.com/uepg/laravel-sybase/issues/11) and possible other problems with querys builded without query builder (but all binds will be considered strings by default)
+
+
+## [1.0.3 (2016-02-18)](https://github.com/uepg/laravel-sybase/compare/1.0.2...1.0.3)
+
+Fix [#8](https://github.com/uepg/laravel-sybase/issues/8)
+
+
+## [1.0.2 (2015-12-21)](https://github.com/uepg/laravel-sybase/compare/1.0.1...1.0.2)
+
+Minor fixes and better stability.
+
+
+## [1.0.1 (2015-12-21)](https://github.com/uepg/laravel-sybase/compare/1.0...1.0.1)
+
+Now offset works, but it is slow.
+
+
+## [1.0 (2015-12-21)](https://github.com/uepg/laravel-sybase/compare/0.3...1.0)
+
+Now offset works, but it is slow.
+
+
+## [0.3 (2015-12-16)](https://github.com/uepg/laravel-sybase/compare/0.2.4...0.3)
+
+Probably fixed [#4](https://github.com/uepg/laravel-sybase/issues/4) and [#5](https://github.com/uepg/laravel-sybase/issues/5)
+
+
+## [0.2.4 (2015-12-10)](https://github.com/uepg/laravel-sybase/compare/0.2.3...0.2.4)
+
+This fix [#3](https://github.com/uepg/laravel-sybase/issues/3) (workaround).
+
+
+## [0.2.3 (2015-12-10)](https://github.com/uepg/laravel-sybase/compare/0.2.2...0.2.3)
+
+Improving functions.
+
+
+## [0.2.2 (2015-12-08)](https://github.com/uepg/laravel-sybase/compare/0.2.1...0.2.2)
+
+Update Readme.
+
+
+## [0.2.1 (2015-12-07)](https://github.com/uepg/laravel-sybase/compare/0.2...0.2.1)
+
+This finally fix [#2](https://github.com/uepg/laravel-sybase/issues/2).
+
+
+## [0.2 (2015-12-04)](https://github.com/uepg/laravel-sybase/compare/0.1.1...0.2)
+
+This fix [#2](https://github.com/uepg/laravel-sybase/issues/2)
+
+
+## [0.1.1 (2015-11-27)](https://github.com/uepg/laravel-sybase/compare/0.1.0...0.1.1)
+
+Improvement in query seeking types.
+
+
+## [0.1.0 (2015-11-18)](https://github.com/uepg/laravel-sybase/compare/fd48f2b402acbfd72c3a2e903dabdb2df0a8cbc6...0.1.0)
+
+Single quote problem solved.

From 1b6dc3e38b7c25253f27882113aafaaf75340cf5 Mon Sep 17 00:00:00 2001
From: Afonso Gloeden <afgloeden@gmail.com>
Date: Sat, 11 May 2019 11:25:05 -0300
Subject: [PATCH 09/11] Path of files for composer.json's PSR-4 fixed

---
 src/{Uepg/LaravelSybase => }/Database/Connection.php       | 0
 src/{Uepg/LaravelSybase => }/Database/Connector.php        | 0
 src/{Uepg/LaravelSybase => }/Database/Query/Builder.php    | 0
 src/{Uepg/LaravelSybase => }/Database/Query/Grammar.php    | 0
 src/{Uepg/LaravelSybase => }/Database/Query/Processor.php  | 0
 src/{Uepg/LaravelSybase => }/Database/Schema/Blueprint.php | 0
 src/{Uepg/LaravelSybase => }/Database/Schema/Grammar.php   | 0
 src/{Uepg/LaravelSybase => }/Support/Fluent.php            | 0
 src/{Uepg/LaravelSybase => }/SybaseServiceProvider.php     | 0
 9 files changed, 0 insertions(+), 0 deletions(-)
 rename src/{Uepg/LaravelSybase => }/Database/Connection.php (100%)
 rename src/{Uepg/LaravelSybase => }/Database/Connector.php (100%)
 rename src/{Uepg/LaravelSybase => }/Database/Query/Builder.php (100%)
 rename src/{Uepg/LaravelSybase => }/Database/Query/Grammar.php (100%)
 rename src/{Uepg/LaravelSybase => }/Database/Query/Processor.php (100%)
 rename src/{Uepg/LaravelSybase => }/Database/Schema/Blueprint.php (100%)
 rename src/{Uepg/LaravelSybase => }/Database/Schema/Grammar.php (100%)
 rename src/{Uepg/LaravelSybase => }/Support/Fluent.php (100%)
 rename src/{Uepg/LaravelSybase => }/SybaseServiceProvider.php (100%)

diff --git a/src/Uepg/LaravelSybase/Database/Connection.php b/src/Database/Connection.php
similarity index 100%
rename from src/Uepg/LaravelSybase/Database/Connection.php
rename to src/Database/Connection.php
diff --git a/src/Uepg/LaravelSybase/Database/Connector.php b/src/Database/Connector.php
similarity index 100%
rename from src/Uepg/LaravelSybase/Database/Connector.php
rename to src/Database/Connector.php
diff --git a/src/Uepg/LaravelSybase/Database/Query/Builder.php b/src/Database/Query/Builder.php
similarity index 100%
rename from src/Uepg/LaravelSybase/Database/Query/Builder.php
rename to src/Database/Query/Builder.php
diff --git a/src/Uepg/LaravelSybase/Database/Query/Grammar.php b/src/Database/Query/Grammar.php
similarity index 100%
rename from src/Uepg/LaravelSybase/Database/Query/Grammar.php
rename to src/Database/Query/Grammar.php
diff --git a/src/Uepg/LaravelSybase/Database/Query/Processor.php b/src/Database/Query/Processor.php
similarity index 100%
rename from src/Uepg/LaravelSybase/Database/Query/Processor.php
rename to src/Database/Query/Processor.php
diff --git a/src/Uepg/LaravelSybase/Database/Schema/Blueprint.php b/src/Database/Schema/Blueprint.php
similarity index 100%
rename from src/Uepg/LaravelSybase/Database/Schema/Blueprint.php
rename to src/Database/Schema/Blueprint.php
diff --git a/src/Uepg/LaravelSybase/Database/Schema/Grammar.php b/src/Database/Schema/Grammar.php
similarity index 100%
rename from src/Uepg/LaravelSybase/Database/Schema/Grammar.php
rename to src/Database/Schema/Grammar.php
diff --git a/src/Uepg/LaravelSybase/Support/Fluent.php b/src/Support/Fluent.php
similarity index 100%
rename from src/Uepg/LaravelSybase/Support/Fluent.php
rename to src/Support/Fluent.php
diff --git a/src/Uepg/LaravelSybase/SybaseServiceProvider.php b/src/SybaseServiceProvider.php
similarity index 100%
rename from src/Uepg/LaravelSybase/SybaseServiceProvider.php
rename to src/SybaseServiceProvider.php

From c234d39a75ac8832c51b5f60960963aea5394e9b Mon Sep 17 00:00:00 2001
From: Afonso Gloeden <afgloeden@gmail.com>
Date: Sat, 11 May 2019 11:26:52 -0300
Subject: [PATCH 10/11] Templates for issues and pull requests added

---
 .github/ISSUE_TEMPLATE.md        | 20 ++++++++++++++++++++
 .github/PULL_REQUEST_TEMPLATE.md | 10 ++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE.md
 create mode 100644 .github/PULL_REQUEST_TEMPLATE.md

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000..0f0c189
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,20 @@
+## Versions
+
+  * Laravel: Run `php artisan --version` to show the version.
+  * PHP: Run `php --version` to show the version.
+  * Composer: Run `composer --version` to show the version.
+  * uepg/laravel-sybase: Get the version in `composer.lock`.
+
+## Expected behavior
+
+What should have happened? Please include as much detail as possible.
+
+## Actual behavior
+
+What actually happened? Please include as much detail as possible.
+
+## Steps to reproduce
+
+1. Step 1
+1. Step 2
+1. Step 3
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000..dcf3fa1
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,10 @@
+## Changes
+
+  * Feature 1
+  * Feature 2
+  * Change 1
+  * Change 2
+  * Change 3
+  * Deletion 1
+  * Fix #123
+  * ...

From 18d9ff40b928aaf386c1df850aae30be528e091d Mon Sep 17 00:00:00 2001
From: Afonso Gloeden <afgloeden@gmail.com>
Date: Sat, 11 May 2019 14:26:29 -0300
Subject: [PATCH 11/11] Usage of the package updated

---
 README.md     | 16 +++++++++++-----
 composer.json | 36 +++++++++++++++++-------------------
 2 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md
index 100f9e7..394f5ef 100644
--- a/README.md
+++ b/README.md
@@ -31,10 +31,16 @@ Update the package dependencies executing:
 composer update
 ```
 
-Add the following entry to your providers array in **config/app.php** file:
+Add the following entry to your providers array in **config/app.php** file, optional in Laravel 5.5 or above:
 
 ```php
-Uepg\LaravelSybase\SybaseServiceProvider::class
+Uepg\LaravelSybase\SybaseServiceProvider::class,
+```
+
+Add the following entry to your aliases array in **config/app.php** file, optional in Laravel 5.5 or above:
+
+```php
+'UepgBlueprint' => Uepg\LaravelSybase\Database\Schema\Blueprint::class,
 ```
 
 Update your **config/database.php's** default driver with the settings for the **sqlsrv** or your custom odbc. See the following example:
@@ -50,7 +56,7 @@ return [
     'connections' => [
         ...
 
-        'sqlsrv' => [
+        'sybase' => [
             'driver' => 'sqlsrv',
             'host' => env('DB_HOST', 'sybase.myserver.com'),
             'port' => env('DB_PORT', '5000'),
@@ -73,7 +79,7 @@ Update your **.env** with the settings for the **sqlsrv** or your custom odbc. S
 ```text
 ...
 
-DB_CONNECTION=sqlsrv
+DB_CONNECTION=sybase
 DB_HOST=sybase.myserver.com
 DB_PORT=5000
 DB_DATABASE=mydatabase
@@ -104,7 +110,7 @@ In the migration file you must replace `use Illuminate\Database\Schema\Blueprint
 
 use Illuminate\Support\Facades\Schema;
 // use Illuminate\Database\Schema\Blueprint;
-use Uepg\LaravelSybase\Database\Schema\Blueprint;
+use Uepg\LaravelSybase\Database\Schema\Blueprint; // or "use UepgBlueprint as Blueprint"
 use Illuminate\Database\Migrations\Migration;
 
 class CreateTable extends Migration
diff --git a/composer.json b/composer.json
index 88a50e4..fbc3387 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,10 @@
 {
     "name": "uepg/laravel-sybase",
-    "type": "library",
     "description": "Sybase based Eloquent module extension for Laravel 5.x.",
+    "keywords": [
+        "sybase"
+    ],
+    "license": "GPL-2.0-only",
     "authors": [
         {
             "name": "Gabriel Tadra Mainginski",
@@ -12,34 +15,29 @@
             "email": "mazer@uepg.br"
         }
     ],
-    "keywords": [
-        "sybase"
-    ],
-    "license": "GPL-2.0-only",
-    "require": {
-        "php": ">=5.6.4",
-        "doctrine/dbal": "^2.9",
-        "illuminate/database": "^5.4",
-        "illuminate/support": "^5.4"
+    "support": {
+        "issues": "https://github.com/uepg/laravel-sybase/issues",
+        "wiki": "https://github.com/uepg/laravel-sybase/wiki"
     },
-    "require-dev": {},
-    "config": {
-        "optimize-autoloader": true,
-        "preferred-install": "dist",
-        "sort-packages": true
+    "require": {
+        "php": "^5.6.4 || ^7.0",
+        "doctrine/dbal": "^2.5",
+        "illuminate/database": "5.4.*|5.5.*|5.6.*|5.7.*",
+        "illuminate/support": "5.4.*|5.5.*|5.6.*|5.7.*"
     },
     "extra": {
         "laravel": {
             "providers": [
                 "Uepg\\LaravelSybase\\SybaseServiceProvider"
-            ]
+            ],
+            "aliases": {
+                "UepgBlueprint": "Uepg\\LaravelSybase\\Database\\Schema\\Blueprint"
+            }
         }
     },
     "autoload": {
         "psr-4": {
             "Uepg\\LaravelSybase\\": "src/"
         }
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true
+    }
 }