StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix database management things to actually work correctly.

Browse source
This commit is contained in:
Dane Everitt 2017-07-22 13:55:30 -05:00
parent 580e5ac569
commit 63e39fbe58
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
14 changed files with 124 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/Models/Database.php
View file

@ -24,11 +24,12 @@
namespace Pterodactyl\Models;
use Illuminate\Database\Eloquent\Model;
use Sofa\Eloquence\Eloquence;
use Sofa\Eloquence\Validable;
use Illuminate\Database\Eloquent\Model;
use Sofa\Eloquence\Contracts\Validable as ValidableContract;
class Database extends Model
class Database extends Model implements ValidableContract
{
use Eloquence, Validable;
@ -52,7 +53,7 @@ class Database extends Model
* @var array
*/
protected $fillable = [
'server_id', 'database_host_id', 'database', 'username', 'remote',
'server_id', 'database_host_id', 'database', 'username', 'password', 'remote',
];
/**

16
app/Models/DatabaseHost.php
View file

@ -27,8 +27,9 @@ namespace Pterodactyl\Models;
use Sofa\Eloquence\Eloquence;
use Sofa\Eloquence\Validable;
use Illuminate\Database\Eloquent\Model;
use Sofa\Eloquence\Contracts\Validable as ValidableContract;
class DatabaseHost extends Model
class DatabaseHost extends Model implements ValidableContract
{
use Eloquence, Validable;
@ -52,7 +53,7 @@ class DatabaseHost extends Model
* @var array
*/
protected $fillable = [
'name', 'host', 'port', 'username', 'max_databases', 'node_id',
'name', 'host', 'port', 'username', 'password', 'max_databases', 'node_id',
];
/**
@ -79,11 +80,12 @@ class DatabaseHost extends Model
'node_id' => 'sometimes|required',
];
/**
* Validation rules to assign to this model.
*
* @var array
*/
/**
* Validation rules to assign to this model.
*
* @var array
*/
// @todo the node_id field doesn't validate correctly if no node is provided in request
protected static $dataIntegrityRules = [
'name' => 'string|max:255',
'host' => 'ip|unique:database_hosts,host',