2 Commits
1.0.2 ... 1.0.4

Author SHA1 Message Date
Gregory Letellier
35188860ce gestion du charset en mysql 2023-11-14 16:41:09 +01:00
Gregory Letellier
c8d6e911a6 meilleure gestion des noms de tables sur les modèles hérités 2023-11-14 15:55:08 +01:00
2 changed files with 22 additions and 3 deletions

View File

@@ -18,6 +18,7 @@ class Connection
private string $database;
private ?string $port;
private ?string $host;
private ?string $charset;
private string $error;
private function __construct($name, $config)
@@ -44,6 +45,7 @@ class Connection
$this->password = isset($config[$key]["PASSWORD"]) ? $config[$key]["PASSWORD"] : null;
$this->database = isset($config[$key]["DATABASE"]) ? $config[$key]["DATABASE"] : null;
$this->port = isset($config[$key]["PORT"]) ? $config[$key]["PORT"] : null;
$this->charset = isset($config[$key]["CHARSET"]) ? $config[$key]["CHARSET"] : null;
} catch (\Throwable $th) {
$this->error = $th->getMessage();
}
@@ -70,6 +72,7 @@ class Connection
$this->password = isset($_ENV[$this->getKey("PASSWORD", $key)]) ? $_ENV[$this->getKey("PASSWORD", $key)] : null;
$this->database = isset($_ENV[$this->getKey("DATABASE", $key)]) ? $_ENV[$this->getKey("DATABASE", $key)] : null;
$this->port = isset($_ENV[$this->getKey("PORT", $key)]) ? $_ENV[$this->getKey("PORT", $key)] : null;
$this->charset = isset($_ENV[$this->getKey("CHARSET", $key)]) ? $_ENV[$this->getKey("CHARSET", $key)] : null;
} catch (\Throwable $th) {
$this->error = $th->getMessage();
}
@@ -117,10 +120,19 @@ class Connection
return $stmt;
}
private function getMySQLOptions()
{
$ret = "";
if ($this->charset) {
$ret .= ";charset=" . $this->charset;
}
return $ret;
}
private function getConnString()
{
$this->connstring = match ($this->type) {
"mysql" => "mysql:host=" . $this->host . ":" . $this->port . ";dbname=" . $this->database,
"mysql" => "mysql:host=" . $this->host . ":" . $this->port . ";dbname=" . $this->database . $this->getMySQLOptions() ,
"sqlite" => "sqlite:" . $this->database,
};
}

View File

@@ -8,7 +8,7 @@ class Model implements JsonSerializable
{
protected mixed $values;
protected array $updated;
protected string $table;
protected string $table = "";
protected string $connection = "";
protected string $pk;
private bool $new;
@@ -19,7 +19,14 @@ class Model implements JsonSerializable
$this->values = array();
$this->updated = array();
$this->pk = "id";
$this->table = $this->getDefaultTableName();
$this->initTable();
}
private function initTable(): void
{
if ($this->table == "") {
$this->table = $this->getDefaultTableName();
}
}
public function getTable(): string