#150210 by bjaspan and Frando: explicit table names for create table statements and fixing a schema referencing bug

1 files changed, 8 insertions, 6 deletions

diff --git a/includes/database.mysql-common.inc b/includes/database.mysql-common.inc
index 99fde133e..982176640 100644
--- a/includes/database.mysql-common.inc
+++ b/includes/database.mysql-common.inc
@@ -49,24 +49,26 @@ function db_query($query) {
 }
 
 /**
- *  Generate SQL to create a new table from a Drupal schema definition.
+ * Generate SQL to create a new table from a Drupal schema definition.
  *
+ * @param $name
+ *   The name of the table to create.
  * @param $table
- *   A valid Drupal table definition array.
+ *   A Schema API table definition array.
  * @return
  *   An array of SQL statements to create the table.
  */
-function db_create_table_sql($table) {
+function db_create_table_sql($name, $table) {
 
   if (empty($table['mysql_suffix'])) {
     $table['mysql_suffix'] = "/*!40100 DEFAULT CHARACTER SET UTF8 */";
   }
 
-  $sql = "CREATE TABLE {". $table['name'] ."} (\n";
+  $sql = "CREATE TABLE {". $name ."} (\n";
 
   // Add the SQL statement for each field.
-  foreach ($table['fields'] as $name => $field) {
-    $sql .= _db_create_field_sql($name, _db_process_field($field)) .", \n";
+  foreach ($table['fields'] as $field_name => $field) {
+    $sql .= _db_create_field_sql($field_name, _db_process_field($field)) .", \n";
   }
 
   // Process keys & indexes.