Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	composer.json
  • Loading branch information
byjg committed Feb 5, 2018
2 parents d941774 + 960eb73 commit acc4614
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
2 changes: 2 additions & 0 deletions example/sqlite/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Temporary SQLite file (used in tests)
test.sqlite
8 changes: 6 additions & 2 deletions tests/SqliteDatabaseTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

class SqliteDatabaseTest extends BaseDatabase
{
protected $uri = 'sqlite:///tmp/teste.sqlite';
protected $path = __DIR__ . '/../example/sqlite/test.sqlite';

/**
* @var \ByJG\DbMigration\Migration
Expand All @@ -13,7 +13,11 @@ class SqliteDatabaseTest extends BaseDatabase

public function setUp()
{
$this->migrate = new \ByJG\DbMigration\Migration(new \ByJG\Util\Uri($this->uri), __DIR__ . '/../example/sqlite');
# Dump SQLite database.
file_put_contents($this->path, '');

$uri = new \ByJG\Util\Uri("sqlite://{$this->path}");
$this->migrate = new \ByJG\DbMigration\Migration($uri, __DIR__ . '/../example/sqlite');
parent::setUp();
}
}

0 comments on commit acc4614

Please sign in to comment.