L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-71000 lib/dml: New query type SQL_QUERY_AUX_READONLY

Browse Source 
For SQL_QUERY_AUX queries that can go to readonly, conditions permitting.
This commit is contained in:
Srdjan
2022-08-23 10:39:43 +10:00
parent 17ee072693
commit 5248067884
6 changed files with 261 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/dml/pgsql_native_moodle_database.php
+22 -12
View File
@@ -44,6 +44,9 @@ class pgsql_native_moodle_database extends moodle_database {
query_end as read_slave_query_end;
}
/** @var array $serverinfo cache */
private $serverinfo = [];
/** @var array $dbhcursor keep track of open cursors */
private $dbhcursor = [];
@@ -336,7 +339,12 @@ class pgsql_native_moodle_database extends moodle_database {
error_reporting($this->last_error_reporting);
try {
$this->read_slave_query_end($result);
if ($this->savepointpresent and $this->last_type != SQL_QUERY_AUX and $this->last_type != SQL_QUERY_SELECT) {
if ($this->savepointpresent &&
!in_array(
$this->last_type,
[SQL_QUERY_AUX, SQL_QUERY_AUX_READONLY, SQL_QUERY_SELECT],
true
)) {
$res = @pg_query($this->pgsql, "RELEASE SAVEPOINT moodle_pg_savepoint; SAVEPOINT moodle_pg_savepoint");
if ($res) {
pg_free_result($res);
@@ -357,14 +365,16 @@ class pgsql_native_moodle_database extends moodle_database {
* Returns database server info array
* @return array Array containing 'description' and 'version' info
*/
public function get_server_info() {
static $info;
if (!$info) {
$this->query_start("--pg_version()", null, SQL_QUERY_AUX);
$info = pg_version($this->pgsql);
public function get_server_info(): array {
if (empty($this->serverinfo)) {
$this->query_start('--pg_version()', null, SQL_QUERY_AUX);
$this->serverinfo = pg_version($this->pgsql);
$this->query_end(true);
}
return array('description'=>$info['server'], 'version'=>$info['server']);
return [
'description' => $this->serverinfo['server'],
'version' => $this->serverinfo['server'],
];
}
/**
@@ -400,7 +410,7 @@ class pgsql_native_moodle_database extends moodle_database {
WHERE c.relname LIKE '$prefix%' ESCAPE '|'
AND c.relkind = 'r'
AND (ns.nspname = current_schema() OR ns.oid = pg_my_temp_schema())";
$this->query_start($sql, null, SQL_QUERY_AUX);
$this->query_start($sql, null, SQL_QUERY_AUX_READONLY);
$result = pg_query($this->pgsql, $sql);
$this->query_end($result);
@@ -492,7 +502,7 @@ class pgsql_native_moodle_database extends moodle_database {
WHERE i.tablename = '$tablename'
AND (i.schemaname = current_schema() OR ns.oid = pg_my_temp_schema())";
$this->query_start($sql, null, SQL_QUERY_AUX);
$this->query_start($sql, null, SQL_QUERY_AUX_READONLY);
$result = pg_query($this->pgsql, $sql);
$this->query_end($result);
@@ -545,7 +555,7 @@ class pgsql_native_moodle_database extends moodle_database {
AND (ns.nspname = current_schema() OR ns.oid = pg_my_temp_schema())
ORDER BY a.attnum";
$this->query_start($sql, null, SQL_QUERY_AUX);
$this->query_start($sql, null, SQL_QUERY_AUX_READONLY);
$result = pg_query($this->pgsql, $sql);
$this->query_end($result);
@@ -766,8 +776,8 @@ class pgsql_native_moodle_database extends moodle_database {
*/
public function setup_is_unicodedb() {
// Get PostgreSQL server_encoding value
$sql = "SHOW server_encoding";
$this->query_start($sql, null, SQL_QUERY_AUX);
$sql = 'SHOW server_encoding';
$this->query_start($sql, null, SQL_QUERY_AUX_READONLY);
$result = pg_query($this->pgsql, $sql);
$this->query_end($result);