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

Merge branch 'MDL-66110-36-fix' of git://github.com/junpataleta/moodle into MOODLE_36_STABLE

Browse Source
This commit is contained in:
Jun Pataleta
2019-08-22 16:26:55 +08:00
parent 955937a856 14404f91ea
commit 67cf6f02c3
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/dml/mysqli_native_moodle_database.php
+14 -8
View File
@@ -675,7 +675,8 @@ class mysqli_native_moodle_database extends moodle_database {
*/
public function get_indexes($table) {
$indexes = array();
$sql = "SHOW INDEXES FROM {$this->prefix}$table";
$fixedtable = $this->fix_table_name($table);
$sql = "SHOW INDEXES FROM $fixedtable";
$this->query_start($sql, null, SQL_QUERY_AUX);
$result = $this->mysqli->query($sql);
try {
@@ -746,7 +747,8 @@ class mysqli_native_moodle_database extends moodle_database {
} else {
// temporary tables are not in information schema, let's try it the old way
$result->close();
$sql = "SHOW COLUMNS FROM {$this->prefix}$table";
$fixedtable = $this->fix_table_name($table);
$sql = "SHOW COLUMNS FROM $fixedtable";
$this->query_start($sql, null, SQL_QUERY_AUX);
$result = $this->mysqli->query($sql);
$this->query_end(true);
@@ -1317,8 +1319,8 @@ class mysqli_native_moodle_database extends moodle_database {
$fields = implode(',', array_keys($params));
$qms = array_fill(0, count($params), '?');
$qms = implode(',', $qms);
$sql = "INSERT INTO {$this->prefix}$table ($fields) VALUES($qms)";
$fixedtable = $this->fix_table_name($table);
$sql = "INSERT INTO $fixedtable ($fields) VALUES($qms)";
list($sql, $params, $type) = $this->fix_sql_params($sql, $params);
$rawsql = $this->emulate_bound_params($sql, $params);
@@ -1483,7 +1485,8 @@ class mysqli_native_moodle_database extends moodle_database {
}
}
$sql = "INSERT INTO {$this->prefix}$table $fieldssql VALUES $valuessql";
$fixedtable = $this->fix_table_name($table);
$sql = "INSERT INTO $fixedtable $fieldssql VALUES $valuessql";
list($sql, $params, $type) = $this->fix_sql_params($sql, $params);
$rawsql = $this->emulate_bound_params($sql, $params);
@@ -1547,7 +1550,8 @@ class mysqli_native_moodle_database extends moodle_database {
$params[] = $id; // last ? in WHERE condition
$sets = implode(',', $sets);
$sql = "UPDATE {$this->prefix}$table SET $sets WHERE id=?";
$fixedtable = $this->fix_table_name($table);
$sql = "UPDATE $fixedtable SET $sets WHERE id=?";
list($sql, $params, $type) = $this->fix_sql_params($sql, $params);
$rawsql = $this->emulate_bound_params($sql, $params);
@@ -1621,7 +1625,8 @@ class mysqli_native_moodle_database extends moodle_database {
$newfield = "$newfield = ?";
array_unshift($params, $normalised_value);
}
$sql = "UPDATE {$this->prefix}$table SET $newfield $select";
$fixedtable = $this->fix_table_name($table);
$sql = "UPDATE $fixedtable SET $newfield $select";
$rawsql = $this->emulate_bound_params($sql, $params);
$this->query_start($sql, $params, SQL_QUERY_UPDATE);
@@ -1644,7 +1649,8 @@ class mysqli_native_moodle_database extends moodle_database {
if ($select) {
$select = "WHERE $select";
}
$sql = "DELETE FROM {$this->prefix}$table $select";
$fixedtable = $this->fix_table_name($table);
$sql = "DELETE FROM $fixedtable $select";
list($sql, $params, $type) = $this->fix_sql_params($sql, $params);
$rawsql = $this->emulate_bound_params($sql, $params);