- Patch #195496 by bjaspan and hunmonk: no 'char' data type in Schema API (and removed spaces).

5 files changed, 8 insertions, 5 deletions

diff --git a/includes/common.inc b/includes/common.inc
index 00f497d4e..8c47f0036 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -1500,10 +1500,10 @@ function drupal_map_assoc($array, $function = NULL) {
  */
 function drupal_eval($code) {
   global $theme_path, $theme_info, $conf;
-  
+
   // Store current theme path.
   $old_theme_path = $theme_path;
-  
+
   // Restore theme_path to the theme, as long as drupal_eval() executes,
   // so code evaluted will not see the caller module as the current theme.
   // If theme info is not initialized get the path from theme_default.
@@ -1518,10 +1518,10 @@ function drupal_eval($code) {
   print eval('?>'. $code);
   $output = ob_get_contents();
   ob_end_clean();
-  
+
   // Recover original theme path.
   $theme_path = $old_theme_path;
-  
+
   return $output;
 }
 
diff --git a/includes/database.inc b/includes/database.inc
index 7f42e7419..0bdb115d7 100644
--- a/includes/database.inc
+++ b/includes/database.inc
@@ -503,6 +503,7 @@ function db_field_names($fields) {
 function db_type_placeholder($type) {
   switch ($type) {
     case 'varchar':
+    case 'char':
     case 'text':
     case 'datetime':
       return '\'%s\'';
diff --git a/includes/database.mysql-common.inc b/includes/database.mysql-common.inc
index 0f2c82b43..a537e7a59 100644
--- a/includes/database.mysql-common.inc
+++ b/includes/database.mysql-common.inc
@@ -199,6 +199,7 @@ function db_type_map() {
   // database types back into schema types.
   $map = array(
     'varchar:normal'  => 'VARCHAR',
+    'char:normal'     => 'CHAR',
 
     'text:tiny'       => 'SMALLTEXT',
     'text:small'      => 'SMALLTEXT',
diff --git a/includes/database.pgsql.inc b/includes/database.pgsql.inc
index deb81f7da..b4eb19dcd 100644
--- a/includes/database.pgsql.inc
+++ b/includes/database.pgsql.inc
@@ -461,6 +461,7 @@ function db_type_map() {
   // database types back into schema types.
   $map = array(
     'varchar:normal' => 'varchar',
+    'char:normal' => 'char',
 
     'text:tiny' => 'text',
     'text:small' => 'text',
diff --git a/includes/install.inc b/includes/install.inc
index 6fd8ec642..f98e56e9d 100644
--- a/includes/install.inc
+++ b/includes/install.inc
@@ -63,7 +63,7 @@ function drupal_get_schema_versions($module) {
  * @param $reset
  *   Set to TRUE after modifying the system table.
  * @param $array
- *   Set to TRUE if you want to get information about all modules in the 
+ *   Set to TRUE if you want to get information about all modules in the
  *   system.
  * @return
  *   The currently installed schema version.