Commit 1d7037a7 authored by Gábor Hojtsy's avatar Gábor Hojtsy

#128866 by myself: bjaspan noted that the pgsql and mysql updates on...

#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
parent 2ea8460e
......@@ -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;
......
......@@ -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;
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment