From 5d9db66a2f42435e6ae281189b22eccb48a5458c Mon Sep 17 00:00:00 2001 From: Skylar Ittner Date: Fri, 26 Jun 2020 20:28:37 -0600 Subject: [PATCH] Specify a few column types --- database.mwb | Bin 19273 -> 19268 bytes lib/Component.lib.php | 2 +- lib/Machine.lib.php | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/database.mwb b/database.mwb index ba250e8ffd7abd902e923a59599fff423f205b92..71c7d85cf9136ef26f163e817af63badcaf6e7ed 100644 GIT binary patch delta 6372 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 = $componentid; if (Component::exists($componentid)) { $this->exists = true; - $this->component = $database->get("components", ["machineid", "serial", "typeid", "tested", "capacity", "model", "price", "manufacturer", "publicnotes", "privatenotes"], ["compid" => $componentid]); + $this->component = $database->get("components", ["machineid", "serial", "typeid [Int]", "tested", "capacity", "model", "price [Number]", "manufacturer", "publicnotes", "privatenotes"], ["compid" => $componentid]); } } diff --git a/lib/Machine.lib.php b/lib/Machine.lib.php index 3eb0073..a1744e9 100644 --- a/lib/Machine.lib.php +++ b/lib/Machine.lib.php @@ -20,8 +20,8 @@ class Machine implements JsonSerializable { $this->machineid = $machineid; if (Machine::exists($machineid)) { $this->exists = true; - $this->machine = $database->get('machines', ['type', 'model', 'condition', 'price', 'os', 'serial', 'manufacturer', 'clientid', 'privatenotes', 'publicnotes'], ['machineid' => $machineid]); - $typeinfo = $database->get("machine_types", ["machinetypeid (id)", "typename (label)", "icon"], ["machinetypeid" => $this->machine["type"]]); + $this->machine = $database->get('machines', ['type [Int]', 'model', 'condition [Number]', 'price [Number]', 'os', 'serial', 'manufacturer', 'clientid [Int]', 'privatenotes', 'publicnotes'], ['machineid' => $machineid]); + $typeinfo = $database->get("machine_types", ["machinetypeid (id) [Int]", "typename (label)", "icon"], ["machinetypeid" => $this->machine["type"]]); $this->icon = $typeinfo["icon"]; $this->typeid = $typeinfo["id"]; $this->typelabel = $typeinfo["label"];