Changeset 951 for trunk/Packages/Common

Timestamp:

Jul 12, 2023, 9:02:24 PM (18 months ago)

Author:

chronos

Message:

• Modified: Improved client contract generation.
• Fixed: SQL query logging into file.

File:

• trunk/Packages/Common/Database.php (modified) (4 diffs)

trunk/Packages/Common/Database.php

@@ -43 +43 @@
   public bool $ShowSQLQuery;
   public bool $LogSQLQuery;
+  public bool $MeasureDuration;
   public string $LogFile;
   public string $Database;
@@ -56 +57 @@
     $this->ShowSQLQuery = false;
     $this->LogSQLQuery = false;
+    $this->MeasureDuration = false;
     $this->LogFile = dirname(__FILE__).'/../../Query.log';
     $this->Database = '';
@@ -93 +95 @@
   {
     if (!$this->Connected()) throw new Exception(T('Not connected to database'));
-    if (($this->ShowSQLQuery == true) or ($this->LogSQLQuery == true)) $QueryStartTime = microtime_float();
+    $Duration = '';
+    if ($this->MeasureDuration) 
+    {
+      $QueryStartTime = microtime_float();
+    }
     $this->LastQuery = $Query;
-    if (($this->ShowSQLQuery == true) or ($this->LogSQLQuery == true))
-    {
-      $Time = round(microtime_float() - $QueryStartTime, 4);
-      $Duration = ' ; '.$Time. ' s';
-    }
-    if (($this->LogSQLQuery == true) and ($Time != 0))
-      file_put_contents($this->LogFile, $Query.$Duration."\n", FILE_APPEND);
-    if ($this->ShowSQLQuery == true)
-      echo('<div style="border-bottom-width: 1px; border-bottom-style: solid; '.
-      'padding-bottom: 3px; padding-top: 3px; font-size: 12px; font-family: Arial;">'.$Query.$Duration.'</div>'."\n");
     $Result = new DatabaseResult();
     $Statement = $this->PDO->query($Query);
@@ -119 +115 @@
         echo('<div><strong>SQL Error: </strong>'.$this->Error.'<br />'.$Query.'</div>');
         throw new Exception('SQL Error: '.$this->Error.', Query: '.$Query);
+    }
+    if ($this->MeasureDuration)
+    {
+      $Time = round(microtime_float() - $QueryStartTime, 4);
+      $Duration = ' ; '.$Time. ' s';
+    }
+    if ($this->ShowSQLQuery == true)
+    {
+       echo('<div style="border-bottom-width: 1px; border-bottom-style: solid; '.
+      'padding-bottom: 3px; padding-top: 3px; font-size: 12px; font-family: Arial;">'.$Query.$Duration.'</div>'."\n");
+    }
+    if ($this->LogSQLQuery == true)
+    {
+      file_put_contents($this->LogFile, $Query.$Duration."\n", FILE_APPEND);
     }
     return $Result;