Skip to content

[5.1] Add "max_join_size" and "sql_big_selects" session variables to sysinfo for MySQL or MariaDB databases #42559

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

[5.1] Add "max_join_size" and "sql_big_selects" session variables to sysinfo for MySQL or MariaDB databases #42559

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
7 changes: 5 additions & 2 deletions administrator/components/com_admin/src/Model/SysinfoModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,16 +310,19 @@ public function &getInfo(): array
return $this->info;
}

$db = $this->getDatabase();
$db = $this->getDatabase();
$dbType = $db->getServerType();

$this->info = [
'php' => php_uname(),
'dbserver' => $db->getServerType(),
'dbserver' => $dbType,
'dbversion' => $db->getVersion(),
'dbcollation' => $db->getCollation(),
'dbconnectioncollation' => $db->getConnectionCollation(),
'dbconnectionencryption' => $db->getConnectionEncryption(),
'dbconnencryptsupported' => $db->isConnectionEncryptionSupported(),
'dbsqlbigselects' => $dbType === 'mysql' ? $db->getSessionVarBool('sql_big_selects') : null,
'dbmaxjoinsize' => $dbType === 'mysql' ? $db->getSessionVarString('max_join_size') : null,
'phpversion' => PHP_VERSION,
'server' => $_SERVER['SERVER_SOFTWARE'] ?? getenv('SERVER_SOFTWARE'),
'sapi_name' => PHP_SAPI,
Expand Down
20 changes: 20 additions & 0 deletions administrator/components/com_admin/tmpl/sysinfo/default_system.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,26 @@
<?php echo $this->info['dbconnencryptsupported'] ? Text::_('JYES') : Text::_('JNO'); ?>
</td>
</tr>
<?php if ($this->info['dbsqlbigselects'] !== null) : ?>
<tr>
<th scope="row">
<?php echo Text::_('COM_ADMIN_DATABASE_SQL_BIG_SELECTS'); ?>
</th>
<td>
<?php echo $this->info['dbsqlbigselects'] ? Text::_('JON') : Text::_('JOFF'); ?>
</td>
</tr>
<?php endif; ?>
<?php if ($this->info['dbmaxjoinsize'] !== null) : ?>
<tr>
<th scope="row">
<?php echo Text::_('COM_ADMIN_DATABASE_MAX_JOIN_SIZE'); ?>
</th>
<td>
<?php echo $this->info['dbmaxjoinsize']; ?>
</td>
</tr>
<?php endif; ?>
<tr>
<th scope="row">
<?php echo Text::_('COM_ADMIN_PHP_VERSION'); ?>
Expand Down
2 changes: 2 additions & 0 deletions administrator/language/en-GB/com_admin.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ COM_ADMIN_DATABASE_COLLATION="Database Collation"
COM_ADMIN_DATABASE_CONNECTION_COLLATION="Database Connection Collation"
COM_ADMIN_DATABASE_CONNECTION_ENCRYPTION="Database Connection Encryption"
COM_ADMIN_DATABASE_CONNECTION_ENCRYPTION_SUPPORTED="Database Server Supports Connection Encryption"
COM_ADMIN_DATABASE_MAX_JOIN_SIZE="Database \"max_join_size\""
COM_ADMIN_DATABASE_SQL_BIG_SELECTS="Database \"sql_big_selects\""
COM_ADMIN_DATABASE_TYPE="Database Type"
COM_ADMIN_DATABASE_VERSION="Database Version"
COM_ADMIN_DIRECTORY="Folder"
Expand Down