-
-
Notifications
You must be signed in to change notification settings - Fork 717
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
Add database connection #568
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
2d63e1b
Add database connection
leMaur e1fe0b7
Add unit test and update TestCase
leMaur eebe57f
Add .idea folder to .gitignore
leMaur c222676
Delete .idea folder from the repository
leMaur 94623c9
fix .gitignore and config file
leMaur f41a854
Add database connection on migration file
leMaur File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
<?php | ||
|
||
namespace Spatie\Activitylog\Test; | ||
|
||
use Spatie\Activitylog\Models\Activity; | ||
use Spatie\Activitylog\Test\Models\CustomDatabaseConnectionOnActivityModel; | ||
|
||
class CustomDatabaseConnectionActivityModelTest extends TestCase | ||
{ | ||
/** @test */ | ||
public function it_uses_the_database_connection_from_the_configuration() | ||
{ | ||
$model = new Activity(); | ||
|
||
$this->assertEquals($model->getConnectionName(), config('activitylog.database_connection')); | ||
} | ||
|
||
/** @test */ | ||
public function it_uses_a_custom_database_connection() | ||
{ | ||
$model = new Activity(); | ||
|
||
$model->setConnection('custom_sqlite'); | ||
|
||
$this->assertNotEquals($model->getConnectionName(), config('activitylog.database_connection')); | ||
$this->assertEquals($model->getConnectionName(), 'custom_sqlite'); | ||
} | ||
|
||
/** @test */ | ||
public function it_uses_the_database_connection_from_model() | ||
{ | ||
$model = new CustomDatabaseConnectionOnActivityModel(); | ||
|
||
$this->assertNotEquals($model->getConnectionName(), config('activitylog.database_connection')); | ||
$this->assertEquals($model->getConnectionName(), 'custom_connection_name'); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
<?php | ||
|
||
namespace Spatie\Activitylog\Test\Models; | ||
|
||
use Spatie\Activitylog\Models\Activity; | ||
|
||
class CustomDatabaseConnectionOnActivityModel extends Activity | ||
{ | ||
protected $connection = 'custom_connection_name'; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wonder if this should default to
DB_CONNECTION
instead ofmysql
, since a lot of unit tests set onlyDB_CONNECTION
inphpunit.xml
and therefore test suites will break without explicitly setting this config. Case in point, sqlite :memory: connections.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good point - now the philosophic question: should we use another
env()
in the fallback or just useDB_CONNECTION
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
https://github.com/spatie/laravel-activitylog/releases/tag/3.7.1
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @drbyte to pointed out. I was in doubt when I did the pull request but I think this is best solution!
I will think twice about this config. It'll be helpfull for future projects! 👍