mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-14 04:30:15 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'wip_MDL-45945_m28_mssqlcol' of https://github.com/skodak/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2014-07-08 00:31:54 +02:00
commit 292803a4f9
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/ddl/mssql_sql_generator.php
View File

@ -218,10 +218,10 @@ class mssql_sql_generator extends sql_generator {
if (empty($xmldb_length)) {
$xmldb_length='255';
}
$dbtype .= '(' . $xmldb_length . ')';
$dbtype .= '(' . $xmldb_length . ') COLLATE database_default';
break;
case XMLDB_TYPE_TEXT:
$dbtype = 'NVARCHAR(MAX)';
$dbtype = 'NVARCHAR(MAX) COLLATE database_default';
break;
case XMLDB_TYPE_BINARY:
$dbtype = 'VARBINARY(MAX)';

29
lib/ddl/tests/ddl_test.php
View File

@ -1579,6 +1579,35 @@ class core_ddl_testcase extends database_driver_testcase {
$dbman->drop_temp_table($table1);
$this->assertFalse($dbman->table_exists('test_table1'));
$this->assertDebuggingCalled();
// Try join with normal tables - MS SQL may use incompatible collation.
$table1 = new xmldb_table('test_table');
$table1->add_field('id', XMLDB_TYPE_INTEGER, '10', null, XMLDB_NOTNULL, XMLDB_SEQUENCE, null);
$table1->add_field('name', XMLDB_TYPE_CHAR, 255, null, XMLDB_NOTNULL, null);
$table1->add_key('primary', XMLDB_KEY_PRIMARY, array('id'));
$dbman->create_table($table1);
$table2 = new xmldb_table('test_temp');
$table2->add_field('id', XMLDB_TYPE_INTEGER, '10', null, XMLDB_NOTNULL, XMLDB_SEQUENCE, null);
$table2->add_field('name', XMLDB_TYPE_CHAR, 255, null, XMLDB_NOTNULL, null);
$table2->add_key('primary', XMLDB_KEY_PRIMARY, array('id'));
$dbman->create_temp_table($table2);
$record = array('name' => 'a');
$DB->insert_record('test_table', $record);
$DB->insert_record('test_temp', $record);
$record = array('name' => 'b');
$DB->insert_record('test_table', $record);
$record = array('name' => 'c');
$DB->insert_record('test_temp', $record);
$sql = "SELECT *
FROM {test_table} n
JOIN {test_temp} t ON t.name = n.name";
$records = $DB->get_records_sql($sql);
$this->assertCount(1, $records);
}
public function test_concurrent_temp_tables() {