Skip to content

Commit

Permalink
Merge pull request #11383 from wilr/features/9394-mysqli-flags
Browse files Browse the repository at this point in the history
feat: support defining MySQLi flags
  • Loading branch information
GuySartorelli authored Sep 18, 2024
2 parents 6a3659d + 5fa8866 commit c7ba8d1
Showing 1 changed file with 14 additions and 5 deletions.
19 changes: 14 additions & 5 deletions src/ORM/Connect/MySQLiConnector.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
use mysqli_sql_exception;
use mysqli_stmt;
use SilverStripe\Core\Config\Config;
use SilverStripe\Core\Environment;

/**
* Connector for MySQL using the MySQLi method
Expand Down Expand Up @@ -81,15 +82,21 @@ 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 = Environment::getEnv('SS_DATABASE_SOCKET');
$flags = Environment::getEnv('SS_DATABASE_FLAGS');

$flags = $flags ? array_reduce(explode(',', $flags), function ($carry, $item) {
$item = trim($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
} else {
// The alternative is not ideal, throw a notice-level error
user_error(
'mysqlnd PHP library is not available, numeric values will be fetched from the DB as strings',
E_USER_NOTICE
Expand Down Expand Up @@ -117,7 +124,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) {
Expand All @@ -126,8 +135,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);
Expand Down

0 comments on commit c7ba8d1

Please sign in to comment.