lagdo / jaxon-dbadmin

src/DbAdmin/TableQueryAdmin.php

Spacing +3 added lines, -8 removed lines

@@ -100,8 +100,7 @@ 
             $maxlength = (!\preg_match('~int~', $field->type) &&
                 \preg_match('~^(\d+)(,(\d+))?$~', $field->length, $match) ?
                 ((\preg_match("~binary~", $field->type) ? 2 : 1) * $match[1] + (($match[3] ?? null) ? 1 : 0) +
-                (($match[2] ?? false) && !$unsigned ? 1 : 0)) :
-                ($this->driver->typeExists($field->type) ? $this->driver->type($field->type) + ($unsigned ? 0 : 1) : 0));
+                (($match[2] ?? false) && !$unsigned ? 1 : 0)) : ($this->driver->typeExists($field->type) ? $this->driver->type($field->type) + ($unsigned ? 0 : 1) : 0));
             if ($this->driver->jush() == 'sql' && $this->driver->minVersion(5.6) && \preg_match('~time~', $field->type)) {
                 $maxlength += 7; // microtime
             }
@@ -241,12 +240,8 @@ 
                 // }
                 $value = ($row !== null ?
                     ($row[$name] != "" && $this->driver->jush() == "sql" && \preg_match("~enum|set~", $field->type) ?
-                    (\is_array($row[$name]) ? \array_sum($row[$name]) : +$row[$name]) :
-                    (\is_bool($row[$name]) ? +$row[$name] : $row[$name])) :
-                    (!$update && $field->autoIncrement ? "" : (isset($queryOptions["select"]) ? false : $default)));
-                $function = ($queryOptions["save"] ? (string)$queryOptions["function"][$name] :
-                    ($update && \preg_match('~^CURRENT_TIMESTAMP~i', $field->onUpdate) ? "now" :
-                    ($value === false ? null : ($value !== null ? '' : 'NULL'))));
+                    (\is_array($row[$name]) ? \array_sum($row[$name]) : +$row[$name]) : (\is_bool($row[$name]) ? +$row[$name] : $row[$name])) : (!$update && $field->autoIncrement ? "" : (isset($queryOptions["select"]) ? false : $default)));
+                $function = ($queryOptions["save"] ? (string) $queryOptions["function"][$name] : ($update && \preg_match('~^CURRENT_TIMESTAMP~i', $field->onUpdate) ? "now" : ($value === false ? null : ($value !== null ? '' : 'NULL'))));
                 if (!$update && $value == $field->default && \preg_match('~^[\w.]+\(~', $value)) {
                     $function = "SQL";
                 }