Skip to content

feat: add customizable database connection settings for FreeRadius #18

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

Merged
jozefrebjak merged 1 commit into from
Feb 24, 2025
Merged

feat: add customizable database connection settings for FreeRadius #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 32 additions & 0 deletions src/Config/FreeRadius.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,38 @@ class FreeRadius extends BaseConfig
*/
public ?string $DBGroup = 'radius';

/**
* --------------------------------------------------------------------
* Customize the DB connection settings
* --------------------------------------------------------------------
*/
public array $database = [
'DSN' => '',
'hostname' => 'localhost',
'username' => 'radius',
'password' => 'radius',
'database' => 'radius',
'DBDriver' => 'MySQLi',
'DBPrefix' => '',
'pConnect' => false,
'DBDebug' => true,
'charset' => 'utf8mb4',
'DBCollat' => 'utf8mb4_general_ci',
'swapPre' => '',
'encrypt' => false,
'compress' => false,
'strictOn' => false,
'failover' => [],
'port' => 3306,
'numberNative' => false,
'foundRows' => false,
'dateFormat' => [
'date' => 'Y-m-d',
'datetime' => 'Y-m-d H:i:s',
'time' => 'H:i:s',
],
];

/**
* --------------------------------------------------------------------
* Customize Name of FreeRadius Tables
Expand Down
11 changes: 3 additions & 8 deletions src/Database/Migrations/2024-01-21-223112_create_radius_tables.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
use CodeIgniter\Database\Forge;
use CodeIgniter\Database\Migration;
use CodeIgniter\Database\RawSql;
use IctSolutions\CodeIgniterFreeRadius\Config\FreeRadius;

class CreateRadiusTables extends Migration
{
Expand All @@ -16,16 +15,12 @@ class CreateRadiusTables extends Migration

public function __construct(?Forge $forge = null)
{
/** @var FreeRadius $freeRadiusConfig */
$freeRadiusConfig = config('FreeRadius');

if ($freeRadiusConfig->DBGroup !== null) {
$this->DBGroup = $freeRadiusConfig->DBGroup;
}
$this->DBGroup = setting('FreeRadius.DBGroup');
$this->tables = setting('FreeRadius.tables');
$this->db = db_connect(setting('FreeRadius.database'));

parent::__construct($forge);

$this->tables = $freeRadiusConfig->tables;
$this->attributes = ($this->db->getPlatform() === 'MySQLi') ? ['ENGINE' => 'InnoDB'] : [];
}

Expand Down
19 changes: 5 additions & 14 deletions src/Models/BaseModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,17 @@
namespace IctSolutions\CodeIgniterFreeRadius\Models;

use CodeIgniter\Model;
use IctSolutions\CodeIgniterFreeRadius\Config\FreeRadius;

class BaseModel extends Model
{
protected array $tables;
protected FreeRadius $freeRadiusConfig;
protected array $tables = [];
protected $db;

public function __construct()
{
$this->freeRadiusConfig = config(FreeRadius::class);

if ($this->freeRadiusConfig->DBGroup !== null) {
$this->DBGroup = $this->freeRadiusConfig->DBGroup;
}

$this->tables = setting('FreeRadius.tables');
$this->DBGroup = setting('FreeRadius.DBGroup');
$this->db = db_connect(setting('FreeRadius.database'));
parent::__construct();
}

protected function initialize(): void
{
$this->tables = $this->freeRadiusConfig->tables;
}
}
Loading