MySQL refactored

Author: nsiatras

berry/mysql/MySQLCommandParameters.php

@@ -27,7 +27,7 @@ private function Add(int $paramIndex, $value, string $type, $length = NULL): voi
      * @param type $value
      * @param type $length 
      */
-    public function setString(int $paramIndex, string $value, $length = NULL): void
+    public function setString(int $paramIndex, ?string $value, $length = NULL): void
     {
         $this->Add($paramIndex, $value, "s", $length);
     }
@@ -38,7 +38,7 @@ public function setString(int $paramIndex, string $value, $length = NULL): void
      * @param type $value
      * @param type $length 
      */
-    public function setInteger(int $paramIndex, int $value, $length = NULL): void
+    public function setInteger(int $paramIndex, ?int $value, $length = NULL): void
     {
         $this->Add($paramIndex, $value, "i", $length);
     }
@@ -49,7 +49,7 @@ public function setInteger(int $paramIndex, int $value, $length = NULL): void
      * @param type $value
      * @param type $length 
      */
-    public function setDouble(int $paramIndex, float $value, $length = NULL): void
+    public function setDouble(int $paramIndex, ?float $value, $length = NULL): void
     {
         $this->Add($paramIndex, $value, "d", $length);
     }
@@ -65,6 +65,21 @@ public function setBlob(int $paramIndex, $value, $length = NULL): void
         $this->Add($paramIndex, $value, "b", $length);
     }
 
+    /**
+     * Adds or sets the current time measured in the number of seconds 
+     * since the Unix Epoch (January 1 1970 00:00:00 GMT). 
+     * This method should be used with DateTime MySql variables.
+     * @param int $paramIndex
+     * @param int $secondsSinceUnixEpoch is the current time measured in the number of seconds since the Unix Epoch (January 1 1970 00:00:00 GMT)
+     * @param type $length
+     * @return void
+     */
+    public function setDateTime(int $paramIndex, ?int $secondsSinceUnixEpoch): void
+    {
+        $datetime = ($secondsSinceUnixEpoch != null) ? date("Y-m-d H:i:s", $secondsSinceUnixEpoch) : null;
+        $this->Add($paramIndex, $datetime, "s", NULL);
+    }
+
     /**
      * Remove all parameters
      */
@@ -77,7 +92,6 @@ public function getParameters(): array
     {
         return $this->fParameters;
     }
-
 }
 
 ?>

berry/mysql/MySQLConnection.php

@@ -4,6 +4,7 @@ class MySQLConnection
 {
 
     private mysqli $fLink; // The mysqli link with the selected MySQL database
+    private bool $fConnectionIsOpen = false;
 
     /**
      * Constructs a new MySQLConnection
@@ -26,6 +27,7 @@ public function __construct(string $serverIP, string $database, string $user, st
         {
             $this->fLink->set_charset($charset);
         }
+        $this->fConnectionIsOpen = true;
     }
 
     /**
@@ -44,7 +46,11 @@ public function EscapeString(string $string): string
      */
     public function Close(): void
     {
-        $this->fLink->close();
+        if ($this->fConnectionIsOpen)
+        {
+            $this->fLink->close();
+            $this->fConnectionIsOpen = false;
+        }
     }
 
     /**
@@ -55,7 +61,6 @@ public function getLink(): mysqli
     {
         return $this->fLink;
     }
-
 }
 
 ?>

berry/mysql/MySQLDataReader.php

@@ -75,15 +75,40 @@ public function Close()
     }
 
     /**
-     * Return a readed value
+     * Return a read value
      * @param type $index
      * @return type 
      */
-    public function getValue($index)
+    public function getValue(int $index)
     {
         return $this->fReadValues[$index];
     }
 
+    /**
+     * DATETIME is always stored and returned as UTC, regardless of what your system's timezone is.
+     * This method reads a MySQL DATETIME value into a PHP DateTime Object and converts the TimeZone
+     * to the given TimeZone.
+     * @param int $index
+     * @param DateTimeZone $timeZone 
+     * @return DateTime
+     */
+    public function getDateTime(int $index, DateTimeZone $timeZone): DateTime
+    {
+        $dt = new DateTime($this->fReadValues[$index], new DateTimeZone('UTC'));
+        $dt->setTimezone($timeZone);
+        return $dt;
+    }
+
+    /**
+     * Return the read datetime value
+     * @param int $index
+     * @return DateTimeF
+     */
+    public function getDateTimeUTC(int $index): DateTime
+    {
+        $dt = new DateTime($this->fReadValues[$index]);
+        return $dt;
+    }
 }
 
 ?>