Initial SQLite development #1

Merged
danieljsummers merged 25 commits from develop into main 2024-06-08 23:58:45 +00:00
2 changed files with 18 additions and 17 deletions
Showing only changes of commit c2dc111dce - Show all commits

View File

@ -18,6 +18,7 @@ class Custom
* @param array $parameters The parameters for the query * @param array $parameters The parameters for the query
* @param PDO $pdo The database connection on which the query should be run * @param PDO $pdo The database connection on which the query should be run
* @return PDOStatement The result of executing the query * @return PDOStatement The result of executing the query
* @throws DocumentException If the query execution is unsuccessful
*/ */
public static function runQuery(string $query, array $parameters, PDO $pdo): PDOStatement public static function runQuery(string $query, array $parameters, PDO $pdo): PDOStatement
{ {
@ -28,8 +29,9 @@ class Custom
$stmt->bindValue($key, $value); $stmt->bindValue($key, $value);
} }
if ($debug) echo '<pre>SQL: ' . $stmt->queryString . '</pre>'; if ($debug) echo '<pre>SQL: ' . $stmt->queryString . '</pre>';
$stmt->execute(); if ($stmt->execute()) return $stmt;
return $stmt; $keyword = explode(' ', $query, 2)[0];
throw new DocumentException("Error executing $keyword statement: " . $stmt->errorCode());
} }
/** /**
@ -87,8 +89,12 @@ class Custom
*/ */
public static function nonQuery(string $query, array $parameters, ?PDO $pdo = null): void public static function nonQuery(string $query, array $parameters, ?PDO $pdo = null): void
{ {
$stmt = self::runQuery($query, $parameters, $pdo ?? Configuration::dbConn()); try {
if ($stmt->errorCode()) throw new DocumentException('Error executing command: ' . $stmt->errorCode()); $stmt = self::runQuery($query, $parameters, is_null($pdo) ? $actualPDO = Configuration::dbConn() : $pdo);
$stmt = null;
} finally {
if (isset($actualPDO)) $actualPDO = null;
}
} }
/** /**
@ -105,9 +111,6 @@ class Custom
public static function scalar(string $query, array $parameters, Mapper $mapper, ?PDO $pdo = null): mixed public static function scalar(string $query, array $parameters, Mapper $mapper, ?PDO $pdo = null): mixed
{ {
$stmt = self::runQuery($query, $parameters, $pdo ?? Configuration::dbConn()); $stmt = self::runQuery($query, $parameters, $pdo ?? Configuration::dbConn());
if ($stmt->errorCode()) {
throw new DocumentException('Error retrieving scalar value: ' . $stmt->errorCode());
}
if ($stmt->rowCount() > 0) { if ($stmt->rowCount() > 0) {
$first = $stmt->fetch(PDO::FETCH_NUM); $first = $stmt->fetch(PDO::FETCH_NUM);
return $first ? $mapper->map($first) : false; return $first ? $mapper->map($first) : false;

View File

@ -13,16 +13,16 @@ use PDOStatement;
* *
* @template TDoc The domain class for items returned by this list * @template TDoc The domain class for items returned by this list
*/ */
readonly class DocumentList class DocumentList
{ {
/** /**
* Constructor * Constructor
* *
* @param PDO $pdo The database connection against which the query was opened * @param PDO|null $pdo The database connection against which the query was opened
* @param PDOStatement $result The result of the query * @param PDOStatement|null $result The result of the query
* @param Mapper<TDoc> $mapper The mapper to deserialize JSON * @param Mapper<TDoc> $mapper The mapper to deserialize JSON
*/ */
private function __construct(private PDO $pdo, private PDOStatement $result, private Mapper $mapper) { } private function __construct(private ?PDO $pdo, private ?PDOStatement $result, private Mapper $mapper) { }
/** /**
* Construct a new document list * Construct a new document list
@ -36,11 +36,7 @@ readonly class DocumentList
public static function create(string $query, array $parameters, Mapper $mapper): static public static function create(string $query, array $parameters, Mapper $mapper): static
{ {
$pdo = Configuration::dbConn(); $pdo = Configuration::dbConn();
$stmt = Custom::runQuery($query, $parameters, $pdo); return new static($pdo, Custom::runQuery($query, $parameters, $pdo), $mapper);
if ($stmt->errorCode()) {
throw new DocumentException('Error retrieving data: ' . $stmt->errorCode());
}
return new static($pdo, $stmt, $mapper);
} }
/** /**
@ -53,5 +49,7 @@ readonly class DocumentList
if ($this->result) { if ($this->result) {
while ($row = $this->result->fetch(PDO::FETCH_ASSOC)) yield $this->mapper->map($row); while ($row = $this->result->fetch(PDO::FETCH_ASSOC)) yield $this->mapper->map($row);
} }
$this->result = null;
$this->pdo = null;
} }
} }