mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-78787' of https://github.com/paulholden/moodle

Browse Source
This commit is contained in:
Andrew Nicols 2023-08-24 23:57:46 +08:00
commit 4de7660341
No known key found for this signature in database
GPG Key ID: 6D1E3157C8CFBF14
2 changed files with 67 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/dml/sqlsrv_native_moodle_database.php
View File

@ -1318,6 +1318,16 @@ class sqlsrv_native_moodle_database extends moodle_database {
return true;
}
/**
* Return SQL for casting to char of given field/expression
*
* @param string $field Table field or SQL expression to be cast
* @return string
*/
public function sql_cast_to_char(string $field): string {
return "CAST({$field} AS NVARCHAR(MAX))";
}
public function sql_cast_char2int($fieldname, $text = false) {
if (!$text) {
@ -1441,7 +1451,7 @@ class sqlsrv_native_moodle_database extends moodle_database {
$arr = func_get_args();
foreach ($arr as $key => $ele) {
$arr[$key] = ' CAST('.$ele.' AS NVARCHAR(255)) ';
$arr[$key] = $this->sql_cast_to_char($ele);
}
$s = implode(' + ', $arr);

73
lib/dml/tests/dml_test.php
View File

@ -4366,29 +4366,68 @@ EOD;
$tablename = $table->getName();
$table->add_field('id', XMLDB_TYPE_INTEGER, '10', null, XMLDB_NOTNULL, XMLDB_SEQUENCE, null);
$table->add_field('description', XMLDB_TYPE_TEXT, 'big', null, null, null, null);
$table->add_field('charshort', XMLDB_TYPE_CHAR, '255');
$table->add_field('charlong', XMLDB_TYPE_CHAR, '1333');
$table->add_field('description', XMLDB_TYPE_TEXT, 'big');
$table->add_key('primary', XMLDB_KEY_PRIMARY, array('id'));
$dbman->create_table($table);
$DB->insert_record($tablename, array('description'=>'áéíóú'));
$DB->insert_record($tablename, array('description'=>'dxxx'));
$DB->insert_record($tablename, array('description'=>'bcde'));
// Regarding 1300 length - all drivers except Oracle support larger values (2K+), but this hits a limit on Oracle.
$DB->insert_record($tablename, [
'charshort' => 'áéíóú',
'charlong' => str_repeat('A', 512),
'description' => str_repeat('X', 1300),
]);
$DB->insert_record($tablename, [
'charshort' => 'dxxx',
'charlong' => str_repeat('B', 512),
'description' => str_repeat('Y', 1300),
]);
$DB->insert_record($tablename, [
'charshort' => 'bcde',
'charlong' => str_repeat('C', 512),
'description' => str_repeat('Z', 1300),
]);
// Char (short) fieldnames and values.
$fieldsql = $DB->sql_concat('charshort', "'harcoded'", '?', '?');
$this->assertEqualsCanonicalizing([
'áéíóúharcoded123.45test',
'dxxxharcoded123.45test',
'bcdeharcoded123.45test',
], $DB->get_fieldset_select($tablename, $fieldsql, '', [123.45, 'test']));
// Char (long) fieldnames and values.
$fieldsql = $DB->sql_concat('charlong', "'harcoded'", '?', '?');
$this->assertEqualsCanonicalizing([
str_repeat('A', 512) . 'harcoded123.45test',
str_repeat('B', 512) . 'harcoded123.45test',
str_repeat('C', 512) . 'harcoded123.45test',
], $DB->get_fieldset_select($tablename, $fieldsql, '', [123.45, 'test']));
// Text fieldnames and values.
$fieldsql = $DB->sql_concat('description', "'harcoded'", '?', '?');
$this->assertEqualsCanonicalizing([
str_repeat('X', 1300) . 'harcoded123.45test',
str_repeat('Y', 1300) . 'harcoded123.45test',
str_repeat('Z', 1300) . 'harcoded123.45test',
], $DB->get_fieldset_select($tablename, $fieldsql, '', [123.45, 'test']));
// Fieldnames and values mixed.
$sql = 'SELECT id, ' . $DB->sql_concat('description', "'harcoded'", '?', '?') . ' AS result FROM {' . $tablename . '}';
$records = $DB->get_records_sql($sql, array(123.45, 'test'));
$this->assertCount(3, $records);
$this->assertSame('áéíóúharcoded123.45test', $records[1]->result);
// Integer fieldnames and values.
$sql = 'SELECT id, ' . $DB->sql_concat('id', "'harcoded'", '?', '?') . ' AS result FROM {' . $tablename . '}';
$records = $DB->get_records_sql($sql, array(123.45, 'test'));
$this->assertCount(3, $records);
$this->assertSame('1harcoded123.45test', $records[1]->result);
$fieldsql = $DB->sql_concat('id', "'harcoded'", '?', '?');
$this->assertEqualsCanonicalizing([
'1harcoded123.45test',
'2harcoded123.45test',
'3harcoded123.45test',
], $DB->get_fieldset_select($tablename, $fieldsql, '', [123.45, 'test']));
// All integer fieldnames.
$sql = 'SELECT id, ' . $DB->sql_concat('id', 'id', 'id') . ' AS result FROM {' . $tablename . '}';
$records = $DB->get_records_sql($sql, array());
$this->assertCount(3, $records);
$this->assertSame('111', $records[1]->result);
$fieldsql = $DB->sql_concat('id', 'id', 'id');
$this->assertEqualsCanonicalizing([
'111',
'222',
'333',
], $DB->get_fieldset_select($tablename, $fieldsql, ''));
}