Skip to content

[3.x-dev] New option to set sql_big_selects on MySQL/MariaDB #293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
richard67 wants to merge 1 commit into from
Closed

[3.x-dev] New option to set sql_big_selects on MySQL/MariaDB #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/Mysql/MysqlDriver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,9 @@ public function __construct(array $options)
$options['charset'] = $options['charset'] ?? 'utf8';
$options['sqlModes'] = isset($options['sqlModes']) ? (array) $options['sqlModes'] : $sqlModes;

// Use sqlBigSelects only if explicitly set.
$options['sqlBigSelects'] = isset($options['sqlBigSelects']) ? (bool) $options['sqlBigSelects'] : null;

$this->charset = $options['charset'];

/*
Expand Down Expand Up @@ -221,6 +224,12 @@ public function connect()
$this->connection->query('SET @@SESSION.sql_mode = \'' . implode(',', $this->options['sqlModes']) . '\';');
}

// Set sql_big_selects if value provided in options
if ($this->options['sqlBigSelects'] !== null)
{
$this->connection->query('SET @@SESSION.sql_big_selects = ' . ($this->options['sqlBigSelects'] ? '1' : '0') . ';');
}

$this->setOption(\PDO::ATTR_EMULATE_PREPARES, true);
}

Expand Down
8 changes: 8 additions & 0 deletions src/Mysqli/MysqliDriver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,9 @@ public function __construct(array $options)
$options['ssl']['verify_server_cert'] = isset($options['ssl']['verify_server_cert']) ? $options['ssl']['verify_server_cert'] : null;
}

// Use sqlBigSelects only if explicitly set.
$options['sqlBigSelects'] = isset($options['sqlBigSelects']) ? (bool) $options['sqlBigSelects'] : null;

// Finalize initialisation.
parent::__construct($options);
}
Expand Down Expand Up @@ -307,6 +310,11 @@ public function connect()
// And read the real sql mode to mitigate changes in mysql > 5.7.+
$this->options['sqlModes'] = explode(',', $this->setQuery('SELECT @@SESSION.sql_mode;')->loadResult());

// Set sql_big_selects if value provided in options
if ($this->options['sqlBigSelects'] !== null)
{
$this->connection->query('SET @@SESSION.sql_big_selects = ' . ($this->options['sqlBigSelects'] ? '1' : '0') . ';');
}
// If auto-select is enabled select the given database.
if ($this->options['select'] && !empty($this->options['database'])) {
$this->select($this->options['database']);
Expand Down