Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2.0.4 #7

Merged
merged 21 commits into from
Mar 20, 2018
Merged
Changes from 3 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
8e8c327
The uri param should be a generic PSR UriInterface
Mar 5, 2018
a32c1a9
The uri param should be a generic PSR UriInterface for Database Inter…
Mar 5, 2018
092af17
Merge pull request #5 from Naouak/uri-generic
byjg Mar 5, 2018
52955d4
Removed unnecessary comments
byjg Mar 5, 2018
d4eb818
Drop support for PHPUnit prior PHP 5.6
byjg Mar 5, 2018
7491049
Applying some PHPCS recommendations.
byjg Mar 5, 2018
5cdcdeb
Added automated tests for MySQL, PostgresSQL and Microsoft SQL Server
byjg Mar 5, 2018
b5a187e
Added automated tests for MySQL, PostgresSQL and Microsoft SQL Server
byjg Mar 5, 2018
030c59d
Added automated tests for MySQL, PostgresSQL and Microsoft SQL Server
byjg Mar 5, 2018
5a68f58
Fix documentation for GetCurrentVersion.
Mar 6, 2018
329b78e
Merge pull request #6 from Naouak/wrong-doc-get-current-version
byjg Mar 6, 2018
732c984
Decoupling the Database classes from Migration class
byjg Mar 7, 2018
54ebb63
Trying to enable SqlServer test into travis environment
byjg Mar 7, 2018
db545a2
Disabling dblib travis -- pdo_dblib is not available on travis.
byjg Mar 7, 2018
55e1853
Updated PHPDocs
byjg Mar 11, 2018
d7d82f0
base.sql should be optionnal.
Mar 15, 2018
b4703c3
Remove now useless test.
Mar 15, 2018
f6616b7
Add a flag to choose if you want base.sql to be optionnal.
Mar 19, 2018
3020a6e
Add a check for pdo modules in different database drivers tests.
Mar 19, 2018
a10c1ee
Merge branch '2.0.4' into optionnal-base-sql
Naouak Mar 19, 2018
be3b9a3
Merge pull request #8 from Naouak/optionnal-base-sql
byjg Mar 19, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Database/DatabaseInterface.php
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

namespace ByJG\DbMigration\Database;

use ByJG\Util\Uri;
use Psr\Http\Message\UriInterface;

interface DatabaseInterface
{
public static function prepareEnvironment(Uri $dbDriver);
public static function prepareEnvironment(UriInterface $dbDriver);

public function createDatabase();

3 changes: 2 additions & 1 deletion src/Database/DblibDatabase.php
Original file line number Diff line number Diff line change
@@ -4,11 +4,12 @@

use ByJG\AnyDataset\Factory;
use ByJG\Util\Uri;
use Psr\Http\Message\UriInterface;

class DblibDatabase extends AbstractDatabase
{

public static function prepareEnvironment(Uri $uri)
public static function prepareEnvironment(UriInterface $uri)
{
$database = preg_replace('~^/~', '', $uri->getPath());

3 changes: 2 additions & 1 deletion src/Database/MysqlDatabase.php
Original file line number Diff line number Diff line change
@@ -4,11 +4,12 @@

use ByJG\AnyDataset\Factory;
use ByJG\Util\Uri;
use Psr\Http\Message\UriInterface;

class MySqlDatabase extends AbstractDatabase
{

public static function prepareEnvironment(Uri $uri)
public static function prepareEnvironment(UriInterface $uri)
{
$database = preg_replace('~^/~', '', $uri->getPath());

5 changes: 3 additions & 2 deletions src/Database/PgsqlDatabase.php
Original file line number Diff line number Diff line change
@@ -4,18 +4,19 @@

use ByJG\AnyDataset\Factory;
use ByJG\Util\Uri;
use Psr\Http\Message\UriInterface;

class PgsqlDatabase extends AbstractDatabase
{

public static function prepareEnvironment(Uri $uri)
public static function prepareEnvironment(UriInterface $uri)
{
$database = preg_replace('~^/~', '', $uri->getPath());
$dbDriver = self::getDbDriverWithoutDatabase($uri);
self::createDatabaseIfNotExists($dbDriver, $database);
}

protected static function getDbDriverWithoutDatabase(Uri $uri)
protected static function getDbDriverWithoutDatabase(UriInterface $uri)
{
$customUri = new Uri($uri->__toString());
return Factory::getDbRelationalInstance($customUri->withPath('/')->__toString());
4 changes: 2 additions & 2 deletions src/Database/SqliteDatabase.php
Original file line number Diff line number Diff line change
@@ -2,12 +2,12 @@

namespace ByJG\DbMigration\Database;

use ByJG\Util\Uri;
use Psr\Http\Message\UriInterface;

class SqliteDatabase extends AbstractDatabase
{

public static function prepareEnvironment(Uri $uri)
public static function prepareEnvironment(UriInterface $uri)
{
}

8 changes: 4 additions & 4 deletions src/Migration.php
Original file line number Diff line number Diff line change
@@ -7,12 +7,12 @@
use ByJG\DbMigration\Database\DatabaseInterface;
use ByJG\DbMigration\Exception\DatabaseIsIncompleteException;
use ByJG\DbMigration\Exception\InvalidMigrationFile;
use ByJG\Util\Uri;
use Psr\Http\Message\UriInterface;

class Migration
{
/**
* @var Uri
* @var UriInterface
*/
protected $uri;

@@ -39,11 +39,11 @@ class Migration
/**
* Migration constructor.
*
* @param Uri $uri
* @param UriInterface $uri
* @param string $folder
* @throws \ByJG\DbMigration\Exception\InvalidMigrationFile
*/
public function __construct(Uri $uri, $folder)
public function __construct(UriInterface $uri, $folder)
{
$this->uri = $uri;
$this->folder = $folder;