Commit 172ebcb0 authored by Franz Liedke's avatar Franz Liedke

Fix Pivot table losing its connection.

This hopefully fixes #1198 and while it doesn't solve the underlying problem mentioned in #1429, it does the tackle the resulting mess. :)
parent d2fefa65
...@@ -7,7 +7,14 @@ class Pivot extends Model { ...@@ -7,7 +7,14 @@ class Pivot extends Model {
* *
* @var string * @var string
*/ */
public $pivot_table; protected $pivot_table;
/**
* The database connection used for this model.
*
* @var Laravel\Database\Connection
*/
protected $pivot_connection;
/** /**
* Indicates if the model has update and creation timestamps. * Indicates if the model has update and creation timestamps.
...@@ -26,7 +33,7 @@ class Pivot extends Model { ...@@ -26,7 +33,7 @@ class Pivot extends Model {
public function __construct($table, $connection = null) public function __construct($table, $connection = null)
{ {
$this->pivot_table = $table; $this->pivot_table = $table;
static::$connection = $connection; $this->pivot_connection = $connection;
parent::__construct(array(), true); parent::__construct(array(), true);
} }
...@@ -41,4 +48,14 @@ class Pivot extends Model { ...@@ -41,4 +48,14 @@ class Pivot extends Model {
return $this->pivot_table; return $this->pivot_table;
} }
/**
* Get the connection used by the pivot table.
*
* @return string
*/
public function connection()
{
return $this->pivot_connection;
}
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment