SQL more strict

resources/autoload.php

@@ -34,6 +34,8 @@
 require_once __DIR__ . "/lib/exceptions/EnsureException.php";
 require_once __DIR__ . "/lib/exceptions/EncodingUnknownException.php";
 require_once __DIR__ . "/lib/exceptions/EncodingConversionException.php";
+require_once __DIR__ . "/lib/exceptions/RecordNotFoundException.php";
+require_once __DIR__ . "/lib/exceptions/RecordNotUniqueException.php";
 require_once __DIR__ . "/lib/exceptions/UnityHTTPDMessageNotFoundException.php";
 
 require_once __DIR__ . "/config.php";

resources/lib/UnitySQL.php

@@ -3,6 +3,8 @@
 namespace UnityWebPortal\lib;
 
 use PDO;
+use UnityWebPortal\lib\exceptions\RecordNotUniqueException;
+use UnityWebPortal\lib\exceptions\RecordNotFoundException;
 
 class UnitySQL
 {
@@ -31,6 +33,16 @@ public function getConn(): PDO
         return $this->conn;
     }
 
+    private function throwIfEmptyOrNotUnique(array $x, string $description): void
+    {
+        if (count($x) === 0) {
+            throw new RecordNotFoundException($description);
+        }
+        if (count($x) > 1) {
+            throw new RecordNotUniqueException($description);
+        }
+    }
+
     //
     // requests table methods
     //
@@ -80,12 +92,7 @@ public function getRequest(string $user, string $dest): array
         $stmt->bindParam(":request_for", $dest);
         $stmt->execute();
         $result = $stmt->fetchAll();
-        if (count($result) == 0) {
-            throw new \Exception("no such request: uid='$user' request_for='$dest'");
-        }
-        if (count($result) > 1) {
-            throw new \Exception("multiple requests for uid='$user' request_for='$dest'");
-        }
+        $this->throwIfEmptyOrNotUnique($result, "uid='$user' request_for='$dest'");
         return $result[0];
     }
 
@@ -170,7 +177,9 @@ public function getNotice(string $id): array
         $stmt = $this->conn->prepare("SELECT * FROM " . self::TABLE_NOTICES . " WHERE id=:id");
         $stmt->bindParam(":id", $id);
         $stmt->execute();
-        return $stmt->fetchAll()[0];
+        $output = $stmt->fetchAll();
+        $this->throwIfEmptyOrNotUnique($output, "id='$id'");
+        return $output[0];
     }
 
     public function getNotices(): array
@@ -194,7 +203,9 @@ public function getPage(string $id): array
         $stmt = $this->conn->prepare("SELECT * FROM " . self::TABLE_PAGES . " WHERE page=:id");
         $stmt->bindParam(":id", $id);
         $stmt->execute();
-        return $stmt->fetchAll()[0];
+        $output = $stmt->fetchAll();
+        $this->throwIfEmptyOrNotUnique($output, "id='$id'");
+        return $output[0];
     }
 
     public function editPage(string $id, string $content): void

resources/lib/exceptions/RecordNotFoundException.php

@@ -0,0 +1,5 @@
+<?php
+
+namespace UnityWebPortal\lib\exceptions;
+
+class RecordNotFoundException extends \Exception {}

resources/lib/exceptions/RecordNotUniqueException.php

@@ -0,0 +1,5 @@
+<?php
+
+namespace UnityWebPortal\lib\exceptions;
+
+class RecordNotUniqueException extends \Exception {}

test/phpunit-bootstrap.php

@@ -25,6 +25,8 @@
 require_once __DIR__ . "/../resources/lib/exceptions/EnsureException.php";
 require_once __DIR__ . "/../resources/lib/exceptions/EncodingUnknownException.php";
 require_once __DIR__ . "/../resources/lib/exceptions/EncodingConversionException.php";
+require_once __DIR__ . "/../resources/lib/exceptions/RecordNotFoundException.php";
+require_once __DIR__ . "/../resources/lib/exceptions/RecordNotUnique.php";
 require_once __DIR__ . "/../resources/lib/exceptions/UnityHTTPDMessageNotFoundException.php";
 
 use PHPStan\DependencyInjection\ValidateExcludePathsExtension;