mirror of
https://codeberg.org/vlw/scaffold.git
synced 2026-02-26 11:31:57 +01:00
Compare commits
8 commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ffd809f76d | |||
| 71a9f12b02 | |||
| 2d55d954a1 | |||
| fd0c8cbbcd | |||
| 19e15c0b23 | |||
| c858cd111a | |||
| 8a04cab4b5 | |||
| f4b8f8673e |
2 changed files with 25 additions and 11 deletions
|
|
@ -19,6 +19,8 @@
|
||||||
private const DEFAULT_USERNAME = "www-data";
|
private const DEFAULT_USERNAME = "www-data";
|
||||||
private const DEFAULT_PASSWORD = "";
|
private const DEFAULT_PASSWORD = "";
|
||||||
|
|
||||||
|
private static ?Database $instance = null;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a new Database instance from credentials
|
* Create a new Database instance from credentials
|
||||||
*
|
*
|
||||||
|
|
@ -26,16 +28,16 @@
|
||||||
* @param string $username
|
* @param string $username
|
||||||
* @param string $password
|
* @param string $password
|
||||||
* @param string $database
|
* @param string $database
|
||||||
* @return static
|
* @return void
|
||||||
*/
|
*/
|
||||||
public static function from_credentials(
|
public static function set_credentials(
|
||||||
?string $host = self::DEFAULT_HOSTNAME,
|
?string $host = self::DEFAULT_HOSTNAME,
|
||||||
?string $username = self::DEFAULT_USERNAME,
|
?string $username = self::DEFAULT_USERNAME,
|
||||||
?string $password = self::DEFAULT_PASSWORD,
|
?string $password = self::DEFAULT_PASSWORD,
|
||||||
string $database
|
?string $database = ""
|
||||||
) {
|
) {
|
||||||
// Create key if it does not exist
|
// Create key if it does not exist
|
||||||
if (!$_ENV["mariadb"]) {
|
if (!array_key_exists("mariadb", $_ENV)) {
|
||||||
$_ENV["mariadb"] = [];
|
$_ENV["mariadb"] = [];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -45,6 +47,14 @@
|
||||||
$_ENV["mariadb"]["pass"] = $password;
|
$_ENV["mariadb"]["pass"] = $password;
|
||||||
$_ENV["mariadb"]["db"] = $database;
|
$_ENV["mariadb"]["db"] = $database;
|
||||||
|
|
||||||
|
self::$instance = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function instance(): static {
|
||||||
|
if (self::$instance) {
|
||||||
|
return self::$instance;
|
||||||
|
}
|
||||||
|
|
||||||
return new static();
|
return new static();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -58,6 +68,8 @@
|
||||||
$_ENV["mariadb"]["pass"],
|
$_ENV["mariadb"]["pass"],
|
||||||
$_ENV["mariadb"]["db"],
|
$_ENV["mariadb"]["db"],
|
||||||
);
|
);
|
||||||
|
|
||||||
|
self::$instance = $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -13,9 +13,10 @@
|
||||||
public const DATE_FORMAT = Database::DATE_FORMAT;
|
public const DATE_FORMAT = Database::DATE_FORMAT;
|
||||||
public const DATETIME_FORMAT = Database::DATETIME_FORMAT;
|
public const DATETIME_FORMAT = Database::DATETIME_FORMAT;
|
||||||
|
|
||||||
abstract public string $id { get; }
|
abstract public int|string $id { get; }
|
||||||
|
|
||||||
|
public readonly Database $db;
|
||||||
|
|
||||||
protected readonly Database $db;
|
|
||||||
private bool $_resolved = false;
|
private bool $_resolved = false;
|
||||||
private bool $_isset;
|
private bool $_isset;
|
||||||
private ?array $_row;
|
private ?array $_row;
|
||||||
|
|
@ -26,7 +27,7 @@
|
||||||
* @param string $table The target database table
|
* @param string $table The target database table
|
||||||
*/
|
*/
|
||||||
protected static function create(string $table, array $values): bool {
|
protected static function create(string $table, array $values): bool {
|
||||||
return new Database()->from($table)->insert($values);
|
return Database::instance()->from($table)->insert($values);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -41,7 +42,7 @@
|
||||||
public readonly array $columns,
|
public readonly array $columns,
|
||||||
public readonly array $where
|
public readonly array $where
|
||||||
) {
|
) {
|
||||||
$this->db = new Database();
|
$this->db = Database::instance();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -74,7 +75,7 @@
|
||||||
* @return bool Entity exists
|
* @return bool Entity exists
|
||||||
*/
|
*/
|
||||||
public function isset(): bool {
|
public function isset(): bool {
|
||||||
return $this->_isset ??= new Database()
|
return $this->_isset ??= Database::instance()
|
||||||
->from($this->table)
|
->from($this->table)
|
||||||
->where($this->where)
|
->where($this->where)
|
||||||
->limit(1)
|
->limit(1)
|
||||||
|
|
@ -97,9 +98,10 @@
|
||||||
*
|
*
|
||||||
* @param string $key Target column to update
|
* @param string $key Target column to update
|
||||||
* @param mixed $value New value of target column
|
* @param mixed $value New value of target column
|
||||||
|
* @param return $return (optional) Return this instead of $value when set
|
||||||
* @return mixed The value that was sent to $value
|
* @return mixed The value that was sent to $value
|
||||||
*/
|
*/
|
||||||
public function set(string $key, mixed $value): mixed {
|
public function set(string $key, mixed $value, mixed $return = null): mixed {
|
||||||
$this->_row[$key] = $value;
|
$this->_row[$key] = $value;
|
||||||
|
|
||||||
$this->db
|
$this->db
|
||||||
|
|
@ -107,6 +109,6 @@
|
||||||
->where($this->where)
|
->where($this->where)
|
||||||
->update([$key => $value]);
|
->update([$key => $value]);
|
||||||
|
|
||||||
return $value;
|
return func_num_args() === 2 ? $value : $return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue