Skip to content

Commit b10cf73

Browse files
author
Afonso Gloeden
committed
Renamed files
1 parent 1800c46 commit b10cf73

File tree

9 files changed

+51
-48
lines changed

9 files changed

+51
-48
lines changed

Database/SybaseConnection.php renamed to Database/Connection.php

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@
66
use Exception;
77
use Doctrine\DBAL\Driver\PDOSqlsrv\Driver as DoctrineDriver;
88
use Illuminate\Database\Query\Processors\SqlServerProcessor;
9-
use Uepg\LaravelSybase\Database\Query\SybaseGrammar as QueryGrammar;
10-
use Uepg\LaravelSybase\Database\Schema\BlueprintSybase;
11-
use Uepg\LaravelSybase\Database\Schema\SybaseGrammar as SchemaGrammar;
12-
use Illuminate\Database\Connection;
9+
use Uepg\LaravelSybase\Database\Query\Grammar as QueryGrammar;
10+
use Uepg\LaravelSybase\Database\Schema\Blueprint;
11+
use Uepg\LaravelSybase\Database\Schema\Grammar as SchemaGrammar;
12+
use Illuminate\Database\Connection as IlluminateConnection;
1313
use Illuminate\Database\Query\Builder;
1414

15-
class SybaseConnection extends Connection {
15+
class Connection extends IlluminateConnection
16+
{
1617
/**
1718
* All types without quotes in Sybase's query.
1819
*
@@ -90,7 +91,7 @@ protected function getDefaultSchemaGrammar()
9091
/**
9192
* Get the default post processor instance.
9293
*
93-
* @return \Illuminate\Database\Query\Processors\Processor
94+
* @return \Illuminate\Database\Query\Processors\SqlServerProcessor
9495
*/
9596
protected function getDefaultPostProcessor()
9697
{
@@ -719,7 +720,7 @@ public function getSchemaBuilder()
719720
}
720721
$builder = new \Illuminate\Database\Schema\Builder($this);
721722
$builder->blueprintResolver(function ($table, $callback) {
722-
return new BlueprintSybase($table, $callback);
723+
return new Blueprint($table, $callback);
723724
});
724725
return $builder;
725726
}

Database/SybaseConnector.php renamed to Database/Connector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
use Illuminate\Database\Connectors\SqlServerConnector;
66

7-
class SybaseConnector extends SqlServerConnector
7+
class Connector extends SqlServerConnector
88
{
99
//
1010
}

Database/Query/SybaseGrammar.php renamed to Database/Query/Grammar.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
namespace Uepg\LaravelSybase\Database\Query;
44

55
use Illuminate\Database\Query\Builder;
6-
use Illuminate\Database\Query\Grammars\Grammar;
6+
use Illuminate\Database\Query\Grammars\Grammar as IlluminateGrammar;
77

8-
class SybaseGrammar extends Grammar {
8+
class Grammar extends IlluminateGrammar
9+
{
910
/**
1011
* All of the available clause operators.
1112
*

‎Database/Query/Processor.php‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?php
2+
3+
namespace Uepg\LaravelSybase\Database\Query;
4+
5+
use Illuminate\Database\Query\Processors\Processor as IlluminateProcessor;
6+
7+
class Processor extends IlluminateProcessor
8+
{
9+
//
10+
}

‎Database/Query/SybaseProcessor.php‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

Database/Schema/BlueprintSybase.php renamed to Database/Schema/Blueprint.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
namespace Uepg\LaravelSybase\Database\Schema;
44

5-
use Illuminate\Database\Schema\Blueprint;
5+
use Illuminate\Database\Schema\Blueprint as IlluminateBlueprint;
66

7-
class BlueprintSybase extends Blueprint
7+
class Blueprint extends IlluminateBlueprint
88
{
99
public function numeric($column, $total = 8, $autoIncrement = false)
1010
{

Database/Schema/SybaseGrammar.php renamed to Database/Schema/Grammar.php

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22

33
namespace Uepg\LaravelSybase\Database\Schema;
44

5-
use Illuminate\Database\Schema\Grammars\Grammar;
5+
use Illuminate\Database\Schema\Grammars\Grammar as IlluminateGrammar;
66
use Illuminate\Support\Fluent;
7-
use Uepg\LaravelSybase\Database\Schema\BlueprintSybase as Blueprint;
7+
use Uepg\LaravelSybase\Database\Schema\Blueprint;
88

9-
class SybaseGrammar extends Grammar {
9+
class Grammar extends IlluminateGrammar
10+
{
1011
/**
1112
* The possible column modifiers.
1213
*
@@ -80,7 +81,7 @@ public function compileColumnExists($table)
8081
/**
8182
* Compile a create table command.
8283
*
83-
* @param \Illuminate\Database\Schema\Blueprint $blueprint
84+
* @param \Uepg\LaravelSybase\Database\Schema\Blueprint $blueprint
8485
* @param \Illuminate\Support\Fluent $command
8586
* @return string
8687
*/
@@ -96,7 +97,7 @@ public function compileCreate(Blueprint $blueprint, Fluent $command)
9697
/**
9798
* Compile a create table command.
9899
*
99-
* @param \Illuminate\Database\Schema\Blueprint $blueprint
100+
* @param \Uepg\LaravelSybase\Database\Schema\Blueprint $blueprint
100101
* @param \Illuminate\Support\Fluent $command
101102
* @return string
102103
*/
@@ -112,7 +113,7 @@ public function compileAdd(Blueprint $blueprint, Fluent $command)
112113
/**
113114
* Compile a primary key command.
114115
*
115-
* @param \Illuminate\Database\Schema\Blueprint $blueprint
116+
* @param \Uepg\LaravelSybase\Database\Schema\Blueprint $blueprint
116117
* @param \Illuminate\Support\Fluent $command
117118
* @return string
118119
*/
@@ -133,7 +134,7 @@ public function compilePrimary(Blueprint $blueprint, Fluent $command)
133134
/**
134135
* Compile a unique key command.
135136
*
136-
* @param \Illuminate\Database\Schema\Blueprint $blueprint
137+
* @param \Uepg\LaravelSybase\Database\Schema\Blueprint $blueprint
137138
* @param \Illuminate\Support\Fluent $command
138139
* @return string
139140
*/
@@ -151,7 +152,7 @@ public function compileUnique(Blueprint $blueprint, Fluent $command)
151152
/**
152153
* Compile a plain index key command.
153154
*
154-
* @param \Illuminate\Database\Schema\Blueprint $blueprint
155+
* @param \Uepg\LaravelSybase\Database\Schema\Blueprint $blueprint
155156
* @param \Illuminate\Support\Fluent $command
156157
* @return string
157158
*/
@@ -169,7 +170,7 @@ public function compileIndex(Blueprint $blueprint, Fluent $command)
169170
/**
170171
* Compile a drop table command.
171172
*
172-
* @param \Illuminate\Database\Schema\Blueprint $blueprint
173+
* @param \Uepg\LaravelSybase\Database\Schema\Blueprint $blueprint
173174
* @param \Illuminate\Support\Fluent $command
174175
* @return string
175176
*/
@@ -181,7 +182,7 @@ public function compileDrop(Blueprint $blueprint, Fluent $command)
181182
/**
182183
* Compile a drop table (if exists) command.
183184
*
184-
* @param \Illuminate\Database\Schema\Blueprint $blueprint
185+
* @param \Uepg\LaravelSybase\Database\Schema\Blueprint $blueprint
185186
* @param \Illuminate\Support\Fluent $command
186187
* @return string
187188
*/
@@ -201,7 +202,7 @@ public function compileDropIfExists(Blueprint $blueprint, Fluent $command)
201202
/**
202203
* Compile a drop column command.
203204
*
204-
* @param \Illuminate\Database\Schema\Blueprint $blueprint
205+
* @param \Uepg\LaravelSybase\Database\Schema\Blueprint $blueprint
205206
* @param \Illuminate\Support\Fluent $command
206207
* @return string
207208
*/
@@ -218,7 +219,7 @@ public function compileDropColumn(Blueprint $blueprint, Fluent $command)
218219
/**
219220
* Compile a drop primary key command.
220221
*
221-
* @param \Illuminate\Database\Schema\Blueprint $blueprint
222+
* @param \Uepg\LaravelSybase\Database\Schema\Blueprint $blueprint
222223
* @param \Illuminate\Support\Fluent $command
223224
* @return string
224225
*/
@@ -232,7 +233,7 @@ public function compileDropPrimary(Blueprint $blueprint, Fluent $command)
232233
/**
233234
* Compile a drop unique key command.
234235
*
235-
* @param \Illuminate\Database\Schema\Blueprint $blueprint
236+
* @param \Uepg\LaravelSybase\Database\Schema\Blueprint $blueprint
236237
* @param \Illuminate\Support\Fluent $command
237238
* @return string
238239
*/
@@ -246,7 +247,7 @@ public function compileDropUnique(Blueprint $blueprint, Fluent $command)
246247
/**
247248
* Compile a drop index command.
248249
*
249-
* @param \Illuminate\Database\Schema\Blueprint $blueprint
250+
* @param \Uepg\LaravelSybase\Database\Schema\Blueprint $blueprint
250251
* @param \Illuminate\Support\Fluent $command
251252
* @return string
252253
*/
@@ -260,7 +261,7 @@ public function compileDropIndex(Blueprint $blueprint, Fluent $command)
260261
/**
261262
* Compile a drop foreign key command.
262263
*
263-
* @param \Illuminate\Database\Schema\Blueprint $blueprint
264+
* @param \Uepg\LaravelSybase\Database\Schema\Blueprint $blueprint
264265
* @param \Illuminate\Support\Fluent $command
265266
* @return string
266267
*/
@@ -274,7 +275,7 @@ public function compileDropForeign(Blueprint $blueprint, Fluent $command)
274275
/**
275276
* Compile a rename table command.
276277
*
277-
* @param \Illuminate\Database\Schema\Blueprint $blueprint
278+
* @param \Uepg\LaravelSybase\Database\Schema\Blueprint $blueprint
278279
* @param \Illuminate\Support\Fluent $command
279280
* @return string
280281
*/
@@ -576,7 +577,7 @@ protected function typeBinary(Fluent $column)
576577
/**
577578
* Get the SQL for a nullable column modifier.
578579
*
579-
* @param \Illuminate\Database\Schema\Blueprint $blueprint
580+
* @param \Uepg\LaravelSybase\Database\Schema\Blueprint $blueprint
580581
* @param \Illuminate\Support\Fluent $column
581582
* @return string|null
582583
*/
@@ -588,7 +589,7 @@ protected function modifyNullable(Blueprint $blueprint, Fluent $column)
588589
/**
589590
* Get the SQL for a default column modifier.
590591
*
591-
* @param \Illuminate\Database\Schema\Blueprint $blueprint
592+
* @param \Uepg\LaravelSybase\Database\Schema\Blueprint $blueprint
592593
* @param \Illuminate\Support\Fluent $column
593594
* @return string|null
594595
*/
@@ -602,7 +603,7 @@ protected function modifyDefault(Blueprint $blueprint, Fluent $column)
602603
/**
603604
* Get the SQL for an auto-increment column modifier.
604605
*
605-
* @param \Illuminate\Database\Schema\Blueprint $blueprint
606+
* @param \Uepg\LaravelSybase\Database\Schema\Blueprint $blueprint
606607
* @param \Illuminate\Support\Fluent $column
607608
* @return string|null
608609
*/

‎Database/SybaseServiceProvider.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
namespace Uepg\LaravelSybase\Database;
44

5-
use Uepg\LaravelSybase\Database\SybaseConnection;
6-
use Uepg\LaravelSybase\Database\SybaseConnector;
5+
use Uepg\LaravelSybase\Database\Connection as SybaseConnection;
6+
use Uepg\LaravelSybase\Database\Connector;
77
use Illuminate\Support\ServiceProvider;
8-
use Illuminate\Database\Connection;
8+
use Illuminate\Database\Connection as IlluminateConnection;
99

1010
class SybaseServiceProvider extends ServiceProvider
1111
{
@@ -16,7 +16,7 @@ class SybaseServiceProvider extends ServiceProvider
1616
*/
1717
public function register()
1818
{
19-
Connection::resolverFor('sqlsrv', function (
19+
IlluminateConnection::resolverFor('sqlsrv', function (
2020
$connection,
2121
$database,
2222
$prefix,
@@ -31,7 +31,7 @@ public function register()
3131
});
3232

3333
$this->app->bind('db.connector.sqlsrv', function ($app) {
34-
return new SybaseConnector();
34+
return new Connector();
3535
});
3636

3737
// $this->app->bind('db.connection.sqlsrv', function (

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,14 +92,14 @@ The file is usualy found in **/etc/freetds/freetds.conf**. Set the configuration
9292

9393
## Setting to use numeric data type
9494

95-
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:
95+
In the migration file you must replace `use Illuminate\Database\Schema\Blueprint;` with `use Uepg\LaravelSybase\Database\Schema\Blueprint;`. See the following example:
9696

9797
```php
9898
<?php
9999

100100
use Illuminate\Support\Facades\Schema;
101101
// use Illuminate\Database\Schema\Blueprint;
102-
use Uepg\LaravelSybase\Database\Schema\BlueprintSybase as Blueprint;
102+
use Uepg\LaravelSybase\Database\Schema\Blueprint;
103103
use Illuminate\Database\Migrations\Migration;
104104

105105
class CreateTable extends Migration

0 commit comments

Comments
 (0)