Skip to content

Support multiple DB connections #435

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.

Sign up for GitHub

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

Open
TomKeyte wants to merge 4 commits into
base: master
Choose a base branch
from
+25 −16
Open

Support multiple DB connections #435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9146586
Support multiple DB connections
TomKeyte Oct 9, 2024
80e6ad3
Allow laravel/framework ^12
TomKeyte Apr 17, 2026
166fa79
Allow laravel/framework ^12 (real)
TomKeyte Apr 17, 2026
e710fbb
Merge pull request #1 from onsecurity/laravel-12
TomKeyte Apr 17, 2026
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 composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
},
"require": {
"php": ">=5.4.0",
"illuminate/support": "~4.0|~5.0|~5.1|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
"laravel/framework": "~5.4|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0"
"illuminate/support": "~4.0|~5.0|~5.1|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0",
"laravel/framework": "~5.4|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0"
},
"autoload": {
"classmap": [
Expand Down
8 changes: 4 additions & 4 deletions src/Venturecraft/Revisionable/Revisionable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ public function postSave()

if (count($revisions) > 0) {
$revision = static::newModel();
\DB::table($revision->getTable())->insert($revisions);
\DB::connection($revision->getConnectionName())->table($revision->getTable())->insert($revisions);
}
}
}
Expand Down Expand Up @@ -203,7 +203,7 @@ public function postCreate()
);

$revision = static::newModel();
\DB::table($revision->getTable())->insert($revisions);
\DB::connection($revision->getConnectionName())->table($revision->getTable())->insert($revisions);
}
}

Expand All @@ -226,7 +226,7 @@ public function postDelete()
'updated_at' => new \DateTime(),
);
$revision = static::newModel();
\DB::table($revision->getTable())->insert($revisions);
\DB::connection($revision->getConnectionName())->table($revision->getTable())->insert($revisions);
}
}

Expand Down Expand Up @@ -256,7 +256,7 @@ public function postForceDelete()
);

$revision = Revisionable::newModel();
\DB::table($revision->getTable())->insert($revisions);
\DB::connection($revision->getConnectionName())->table($revision->getTable())->insert($revisions);
\Event::dispatch('revisionable.deleted', array('model' => $this, 'revisions' => $revisions));
}
}
Expand Down
29 changes: 19 additions & 10 deletions src/Venturecraft/Revisionable/RevisionableTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,21 @@ public static function bootRevisionableTrait()
});
}

/**
* Instance the revision model
* @return \Illuminate\Database\Eloquent\Model
*/
public static function newModel()
{
return Revisionable::newModel();
}

/**
* @return mixed
*/
public function revisionHistory()
{
return $this->morphMany(get_class(Revisionable::newModel()), 'revisionable');
return $this->morphMany(get_class(static::newModel()), 'revisionable');
}

/**
Expand All @@ -105,7 +114,7 @@ public function revisionHistory()
*/
public static function classRevisionHistory($limit = 100, $order = 'desc')
{
$model = Revisionable::newModel();
$model = static::newModel();
return $model->where('revisionable_type', get_called_class())
->orderBy('updated_at', $order)->limit($limit)->get();
}
Expand Down Expand Up @@ -209,8 +218,8 @@ public function postSave()
$delete->delete();
}
}
$revision = Revisionable::newModel();
\DB::table($revision->getTable())->insert($revisions);
$revision = static::newModel();
\DB::connection($revision->getConnectionName())->table($revision->getTable())->insert($revisions);
\Event::dispatch('revisionable.saved', array('model' => $this, 'revisions' => $revisions));
}
}
Expand Down Expand Up @@ -247,8 +256,8 @@ public function postCreate()
//get them into an array.
$revisions = array_merge($revisions[0], $this->getAdditionalFields());

$revision = Revisionable::newModel();
\DB::table($revision->getTable())->insert($revisions);
$revision = static::newModel();
\DB::connection($revision->getConnectionName())->table($revision->getTable())->insert($revisions);
\Event::dispatch('revisionable.created', array('model' => $this, 'revisions' => $revisions));
}

Expand Down Expand Up @@ -277,8 +286,8 @@ public function postDelete()
//Since there is only one revision because it's deleted, let's just merge into revision[0]
$revisions = array_merge($revisions[0], $this->getAdditionalFields());

$revision = Revisionable::newModel();
\DB::table($revision->getTable())->insert($revisions);
$revision = static::newModel();
\DB::connection($revision->getConnectionName())->table($revision->getTable())->insert($revisions);
\Event::dispatch('revisionable.deleted', array('model' => $this, 'revisions' => $revisions));
}
}
Expand Down Expand Up @@ -308,8 +317,8 @@ public function postForceDelete()
'updated_at' => new \DateTime(),
);

$revision = Revisionable::newModel();
\DB::table($revision->getTable())->insert($revisions);
$revision = static::newModel();
\DB::connection($revision->getConnectionName())->table($revision->getTable())->insert($revisions);
\Event::dispatch('revisionable.deleted', array('model' => $this, 'revisions' => $revisions));
}
}
Expand Down