feat: support defining MySQLi flags

wilr · Sep 14, 2024 · f61a921 · f61a921
1 parent 6a3659d
commit f61a921
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/src/ORM/Connect/MySQLiConnector.php b/src/ORM/Connect/MySQLiConnector.php
@@ -81,14 +81,20 @@ public function connect($parameters, $selectDB = false)
         // Connection charset and collation
         $connCharset = Config::inst()->get(MySQLDatabase::class, 'connection_charset');
         $connCollation = Config::inst()->get(MySQLDatabase::class, 'connection_collation');
+        $socket = Config::inst()->get(MySQLDatabase::class, 'socket');
+        $flags = Config::inst()->get(MySQLDatabase::class, 'flags');
+
+        $flags = is_array($flags) ? array_reduce($flags, function ($carry, $item) {
+            return $carry | constant($item);
+        }, 0) : $flags;
 
         $this->dbConn = mysqli_init();
 
         // Use native types (MysqlND only)
         if (defined('MYSQLI_OPT_INT_AND_FLOAT_NATIVE')) {
             $this->dbConn->options(MYSQLI_OPT_INT_AND_FLOAT_NATIVE, true);
 
-        // The alternative is not ideal, throw a notice-level error
+            // The alternative is not ideal, throw a notice-level error
         } else {
             user_error(
                 'mysqlnd PHP library is not available, numeric values will be fetched from the DB as strings',
@@ -117,7 +123,9 @@ public function connect($parameters, $selectDB = false)
             $parameters['username'],
             $parameters['password'],
             $selectedDB,
-            !empty($parameters['port']) ? $parameters['port'] : ini_get("mysqli.default_port")
+            !empty($parameters['port']) ? $parameters['port'] : ini_get("mysqli.default_port"),
+            $socket ?? null,
+            $flags ?? 0
         );
 
         if ($this->dbConn->connect_error) {
@@ -126,8 +134,8 @@ public function connect($parameters, $selectDB = false)
 
         // Set charset and collation if given and not null. Can explicitly set to empty string to omit
         $charset = isset($parameters['charset'])
-                ? $parameters['charset']
-                : $connCharset;
+            ? $parameters['charset']
+            : $connCharset;
 
         if (!empty($charset)) {
             $this->dbConn->set_charset($charset);