diff options
| -rw-r--r-- | modules/locale/locale.install | 4 | ||||
| -rw-r--r-- | modules/system/system.schema | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/modules/locale/locale.install b/modules/locale/locale.install index b2c4f85e1..1d87d6ccc 100644 --- a/modules/locale/locale.install +++ b/modules/locale/locale.install @@ -82,10 +82,10 @@ function locale_update_6002() { switch ($GLOBALS['db_type']) { case 'mysql': case 'mysqli': - db_add_column($ret, 'locales_source', 'textgroup', 'varchar(255)', array('default' => "''", 'not null' => TRUE)); + $ret[] = update_sql("ALTER TABLE {locales_source} ADD textgroup varchar(255) NOT NULL default ''"); break; case 'pgsql': - $ret[] = update_sql("ALTER TABLE {locales_source} ADD textgroup varchar(255) NOT NULL default ''"); + db_add_column($ret, 'locales_source', 'textgroup', 'varchar(255)', array('default' => "''", 'not null' => TRUE)); break; } return $ret; diff --git a/modules/system/system.schema b/modules/system/system.schema index 2df482d2e..e8c6c829c 100644 --- a/modules/system/system.schema +++ b/modules/system/system.schema @@ -129,11 +129,9 @@ function system_schema() { 'fields' => array( 'name' => array('type' => 'varchar', 'length' => 128, 'not null' => TRUE, 'default' => ''), 'value' => array('type' => 'text', 'not null' => TRUE, 'size' => 'big'), - 'language' => array('type' => 'varchar', 'length' => 12, 'not null' => TRUE, 'default' => '') ), - 'primary key' => array('name', 'language'), + 'primary key' => array('name'), ); return $schema; } - |