1 files changed, 24 insertions, 22 deletions

diff --git a/modules/simpletest/tests/schema.test b/modules/simpletest/tests/schema.test
index 16d1058c1..eeafc7796 100644
--- a/modules/simpletest/tests/schema.test
+++ b/modules/simpletest/tests/schema.test
@@ -23,71 +23,73 @@ class SchemaTestCase extends DrupalWebTestCase {
    */
   function testSchema() {
     // Try creating a table.
-    $table_name = 'test';
     $table_specification = array(
       'fields' => array(
         'id'  => array(
           'type' => 'int',
           'default' => NULL,
         ),
-        'test'  => array(
+        'test_field'  => array(
           'type' => 'int',
           'not null' => TRUE,
         ),
       ),
     );
     $ret = array();
-    db_create_table($ret, $table_name, $table_specification);
+    db_create_table($ret, 'test_table', $table_specification);
 
     // Assert that the table exists.
-    $this->assertTrue(db_table_exists($table_name), t('The table exists.'));
+    $this->assertTrue(db_table_exists('test_table'), t('The table exists.'));
 
-    // An insert without a value for the column 'test' should fail.
-    $field_name = 'test';
+    // An insert without a value for the column 'test_table' should fail.
     $this->assertFalse($this->tryInsert(), t('Insert without a default failed.'));
 
     // Add a default value to the column.
-    db_field_set_default($ret, $table_name, $field_name, 0);
+    db_field_set_default($ret, 'test_table', 'test_field', 0);
     // The insert should now succeed.
     $this->assertTrue($this->tryInsert(), t('Insert with a default succeeded.'));
 
     // Remove the default.
-    db_field_set_no_default($ret, $table_name, $field_name);
+    db_field_set_no_default($ret, 'test_table', 'test_field');
     // The insert should fail again.
     $this->assertFalse($this->tryInsert(), t('Insert without a default failed.'));
 
     // Rename the table.
-    db_rename_table($ret, $table_name, $table_name . '_test');
+    db_rename_table($ret, 'test_table', 'test_table2');
     // We need the default so that we can insert after the rename.
-    db_field_set_default($ret, $table_name . '_test', $field_name, 0);
+    db_field_set_default($ret, 'test_table2', 'test_field', 0);
     $this->assertFalse($this->tryInsert(), t('Insert into the old table failed.'));
-    $this->assertTrue($this->tryInsert('_test'), t('Insert into the new table succeeded.'));
+    $this->assertTrue($this->tryInsert('test_table2'), t('Insert into the new table succeeded.'));
+
+    // We should have successfully inserted exactly two rows.
+    $count = db_query('SELECT COUNT(*) FROM {test_table2}')->fetchField();
+    $this->assertEqual($count, 2, t('Two fields were successfully inserted.'));
 
     // Try to drop the table.
-    db_drop_table($ret, $table_name . '_test');
-    $this->assertFalse(db_table_exists($table_name . '_test'), t('The renamed table does not exist.'));
+    db_drop_table($ret, 'test_table2');
+    $this->assertFalse(db_table_exists('test_table2'), t('The dropped table does not exist.'));
 
     // Recreate the table.
-    db_create_table($ret, $table_name, $table_specification);
-    db_field_set_default($ret, $table_name, $field_name, 0);
-    db_add_field($ret, $table_name, 'test2', array('type' => 'int', 'not null' => TRUE, 'default' => 0));
+    db_create_table($ret, 'test_table', $table_specification);
+    db_field_set_default($ret, 'test_table', 'test_field', 0);
+    db_add_field($ret, 'test_table', 'test_serial', array('type' => 'int', 'not null' => TRUE, 'default' => 0));
 
     // Change the new field to a serial column.
-    db_change_field($ret, $table_name, 'test2', 'test2', array('type' => 'serial', 'not null' => TRUE), array('primary key' => array('test2')));
+    db_change_field($ret, 'test_table', 'test_serial', 'test_serial', array('type' => 'serial', 'not null' => TRUE), array('primary key' => array('test_serial')));
 
     $this->assertTrue($this->tryInsert(), t('Insert with a serial succeeded.'));
-    $max1 = db_query('SELECT MAX(test2) FROM test')->fetchField();
+    $max1 = db_query('SELECT MAX(test_serial) FROM {test_table}')->fetchField();
     $this->assertTrue($this->tryInsert(), t('Insert with a serial succeeded.'));
-    $max2 = db_query('SELECT MAX(test2) FROM test')->fetchField();
+    $max2 = db_query('SELECT MAX(test_serial) FROM {test_table}')->fetchField();
     $this->assertTrue($max2 > $max1, t('The serial is monotone.'));
 
-    $count = db_query('SELECT COUNT(test2) FROM test')->fetchField();
+    $count = db_query('SELECT COUNT(*) FROM {test_table}')->fetchField();
     $this->assertEqual($count, 2, t('There were two rows.'));
   }
 
-  function tryInsert($tablepostfix = '') {
+  function tryInsert($table = 'test_table') {
     try {
-      db_query("INSERT INTO {test$tablepostfix} (id) VALUES (:id)", array(':id' => mt_rand(10,20)));
+      db_query("INSERT INTO {" . $table . "} (id) VALUES (:id)", array(':id' => mt_rand(10,20)));
       return TRUE;
     }
     catch (Exception $e) {