fix: database class singleton to use existing database connection

This commit is contained in:
Victor Westerlund 2026-02-24 10:36:08 +01:00
parent 71a9f12b02
commit 7a6be11557
Signed by: vlw
GPG key ID: D0AD730E1057DFC6
2 changed files with 17 additions and 3 deletions

View file

@ -19,6 +19,8 @@
private const DEFAULT_USERNAME = "www-data";
private const DEFAULT_PASSWORD = "";
private static ?Database $instance = null;
/**
* Create a new Database instance from credentials
*
@ -44,6 +46,16 @@
$_ENV["mariadb"]["user"] = $username;
$_ENV["mariadb"]["pass"] = $password;
$_ENV["mariadb"]["db"] = $database;
self::$instance = null;
}
public static function instance(): static {
if (self::$instance) {
return self::$instance;
}
return new static();
}
/**
@ -56,6 +68,8 @@
$_ENV["mariadb"]["pass"],
$_ENV["mariadb"]["db"],
);
self::$instance = $this;
}
/**

View file

@ -27,7 +27,7 @@
* @param string $table The target database table
*/
protected static function create(string $table, array $values): bool {
return new Database()->from($table)->insert($values);
return Database::instance()->from($table)->insert($values);
}
/**
@ -42,7 +42,7 @@
public readonly array $columns,
public readonly array $where
) {
$this->db = new Database();
$this->db = Database::instance();
}
/**
@ -75,7 +75,7 @@
* @return bool Entity exists
*/
public function isset(): bool {
return $this->_isset ??= new Database()
return $this->_isset ??= Database::instance()
->from($this->table)
->where($this->where)
->limit(1)