Commit 1b093e04 authored by Cecilia Vela Gurovic's avatar Cecilia Vela Gurovic Committed by Gerrit Code Review
Browse files

Merge "Bug 1779243: Allowing install to complete for MySql v8"

parents 46b28f8e 3977aeb3
......@@ -1537,7 +1537,7 @@ function configure_dbconnection() {
$db->_Execute("SET NAMES 'utf8'");
if (is_mysql()) {
$db->_Execute("SET SQL_MODE='POSTGRESQL'");
$db->_Execute("SET SQL_MODE='PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE'");
$db->_Execute("SET CHARACTER SET utf8mb4");
$db->_Execute("SET SQL_BIG_SELECTS=1");
}
......
......@@ -794,7 +794,10 @@ class View {
public function get_columnsperrow() {
if (!isset($this->columnsperrow)) {
$this->columnsperrow = get_records_assoc('view_rows_columns', 'view', $this->get('id'), 'row', 'row, columns');
$this->columnsperrow = get_records_sql_assoc('SELECT "row", columns
FROM {view_rows_columns}
WHERE view = ?
ORDER BY "row" ASC', array($this->get('id')));
}
return $this->columnsperrow;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment