v2.0-alpha

core/Driver/Logger/Logger.class.php

@@ -34,13 +34,16 @@ class Logger {
   }
 
   protected function getStackTrace(int $pop = 2): string {
-    $debugTrace = debug_backtrace();
+    $debugTrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
     if ($pop > 0) {
       array_splice($debugTrace, 0, $pop);
     }
-
     return implode("\n", array_map(function ($trace) {
-      return $trace["file"] . "#" . $trace["line"] . ": " . $trace["function"] . "()";
+      if (isset($trace["file"])) {
+        return $trace["file"] . "#" . $trace["line"] . ": " . $trace["function"] . "()";
+      } else {
+        return $trace["function"] . "()";
+      }
     }, $debugTrace));
   }
 
@@ -93,8 +96,8 @@ class Logger {
     return $message;
   }
 
-  public function debug(string $message): string {
-    $this->log($message, "debug");
+  public function debug(string $message, bool $appendStackTrace = false): string {
+    $this->log($message, "debug", $appendStackTrace);
     return $message;
   }
 

core/Driver/SQL/Query/Select.class.php

@@ -43,6 +43,11 @@ class Select extends Query {
     return $this;
   }
 
+  public function addValue($value): Select {
+    $this->selectValues[] = $value;
+    return $this;
+  }
+
   public function where(...$conditions): Select {
     $this->conditions[] = (count($conditions) === 1 ? $conditions : new CondOr($conditions));
     return $this;
@@ -63,6 +68,11 @@ class Select extends Query {
     return $this;
   }
 
+  public function addJoin(Join $join): Select {
+    $this->joins[] = $join;
+    return $this;
+  }
+
   public function groupBy(...$columns): Select {
     $this->groupColumns = $columns;
     return $this;

core/Driver/SQL/SQL.class.php

@@ -52,16 +52,19 @@ abstract class SQL {
   protected ConnectionData $connectionData;
   protected int $lastInsertId;
 
+  protected bool $logQueries;
+
   public function __construct($connectionData) {
     $this->connection = NULL;
     $this->lastError = 'Unknown Error';
     $this->connectionData = $connectionData;
     $this->lastInsertId = 0;
     $this->logger = new Logger(getClassName($this), $this);
+    $this->logQueries = false;
   }
 
   public function isConnected(): bool {
-    return !is_null($this->connection);
+    return !is_null($this->connection) && !is_bool($this->connection);
   }
 
   public function getLastError(): string {
@@ -131,7 +134,7 @@ abstract class SQL {
     $parameters = [];
     $queryStr = $query->build($parameters);
 
-    if($query->dump) {
+    if ($query->dump) {
       var_dump($queryStr);
       var_dump($parameters);
     }
@@ -149,6 +152,31 @@ abstract class SQL {
       $this->fetchReturning($res, $generatedColumn);
     }
 
+    if ($this->logQueries && (!($query instanceof Insert) || $query->getTableName() !== "SystemLog")) {
+
+      if ($success === false || $fetchType == self::FETCH_NONE) {
+        $result = var_export($success, true);
+      } else if ($fetchType === self::FETCH_ALL) {
+        $result = count($res) . " rows";
+      } else if ($fetchType === self::FETCH_ONE) {
+        $result = ($res === null ? "(empty)" : "1 row");
+      } else if ($fetchType === self::FETCH_ITERATIVE) {
+        $result = $res->getNumRows() .  " rows (iterative)";
+      } else {
+        $result = "Unknown";
+      }
+
+      $message = sprintf("Query: %s, Parameters: %s, Result: %s",
+        var_export($queryStr, true), var_export($parameters, true), $result
+      );
+
+      if ($success === false) {
+        $message .= "Error: " . var_export($this->lastError, true);
+      }
+
+      $this->logger->debug($message);
+    }
+
     return $fetchType === self::FETCH_NONE ? $success : $res;
   }