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

Merge branch 'MDL-46918' of git://github.com/timhunt/moodle

Browse Source
This commit is contained in:
Marina Glancy
2014-08-25 12:01:10 +08:00
parent cae945d272 52953ff948
commit 2ef3ecffb7
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/ddl/database_manager.php
+1 -1
View File
@@ -497,7 +497,7 @@ class database_manager {
// Check new table doesn't exist
if ($this->table_exists($check)) {
throw new ddl_exception('ddltablealreadyexists', $xmldb_table->getName(), 'can not rename table');
throw new ddl_exception('ddltablealreadyexists', $check->getName(), 'can not rename table');
}
if (!$sqlarr = $this->generator->getRenameTableSQL($xmldb_table, $newname)) {
lib/ddl/tests/ddl_test.php
+11
View File
@@ -563,6 +563,17 @@ class core_ddl_testcase extends database_driver_testcase {
'secondname' => 'not important',
'intro' => 'not important');
$this->assertSame($insertedrows+1, $DB->insert_record('test_table_cust1', $rec));
// Verify behavior when target table already exists.
$sourcetable = $this->create_deftable('test_table0');
$targettable = $this->create_deftable('test_table1');
try {
$dbman->rename_table($sourcetable, $targettable->getName());
$this->fail('Exception expected');
} catch (moodle_exception $e) {
$this->assertInstanceOf('ddl_exception', $e);
$this->assertEquals('Table "test_table1" already exists (can not rename table)', $e->getMessage());
}
}
/**