diff options
| author | Gábor Hojtsy <gabor@hojtsy.hu> | 2007-05-25 15:47:57 +0000 |
|---|---|---|
| committer | Gábor Hojtsy <gabor@hojtsy.hu> | 2007-05-25 15:47:57 +0000 |
| commit | 1d7037a756f2029548be24f9a1e5df4ed3f817ec (patch) | |
| tree | c25779acbd514f8beaa22fc3034303dc9da74338 | |
| parent | 2ea8460ea9ad5f82127bd3605fcb4765bd2de56d (diff) | |
| download | brdo-1d7037a756f2029548be24f9a1e5df4ed3f817ec.tar.gz brdo-1d7037a756f2029548be24f9a1e5df4ed3f817ec.tar.bz2 | |
#128866 by myself: bjaspan noted that the pgsql and mysql updates on locale_update_6002() are reversed, I noted that the variables table got the language column inadvertently
| -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; } - |