diff options
author | Dries Buytaert <dries@buytaert.net> | 2006-02-27 13:22:29 +0000 |
---|---|---|
committer | Dries Buytaert <dries@buytaert.net> | 2006-02-27 13:22:29 +0000 |
commit | eda4d90645db60c8da8dc33239eff0c63789b895 (patch) | |
tree | 75e5cf8112debcc35c5705b056ff484e3a04182e | |
parent | 4ce3d625f6b2a53ec2bcf1165a026d5e20524d49 (diff) | |
download | brdo-eda4d90645db60c8da8dc33239eff0c63789b895.tar.gz brdo-eda4d90645db60c8da8dc33239eff0c63789b895.tar.bz2 |
- Patch #42390 by chx: Field 'translation' doesn't have a default value query
-rw-r--r-- | database/database.mysql | 2 | ||||
-rw-r--r-- | database/updates.inc | 10 | ||||
-rw-r--r-- | includes/locale.inc | 2 |
3 files changed, 2 insertions, 12 deletions
diff --git a/database/database.mysql b/database/database.mysql index bf09b183e..a7a9ee061 100644 --- a/database/database.mysql +++ b/database/database.mysql @@ -395,7 +395,7 @@ CREATE TABLE locales_source ( CREATE TABLE locales_target ( lid int(11) NOT NULL default '0', - translation blob NOT NULL default '', + translation blob NOT NULL, locale varchar(12) NOT NULL default '', plid int(11) NOT NULL default '0', plural int(1) NOT NULL default '0', diff --git a/database/updates.inc b/database/updates.inc index b002548f6..23fbf1ab0 100644 --- a/database/updates.inc +++ b/database/updates.inc @@ -1698,13 +1698,3 @@ function system_update_174() { } return array(); } - -function system_update_175() { - $ret = array(); - switch ($GLOBALS['db_type']) { - case 'mysql': - case 'mysqli': - $ret[] = update_sql("ALTER TABLE {locales_target} ALTER COLUMN translation SET DEFAULT ''"); - } - return $ret; -} diff --git a/includes/locale.inc b/includes/locale.inc index 7371dec2a..fcaf82ca2 100644 --- a/includes/locale.inc +++ b/includes/locale.inc @@ -16,7 +16,7 @@ function _locale_add_language($code, $name, $onlylanguage = TRUE) { db_query("INSERT INTO {locales_meta} (locale, name) VALUES ('%s','%s')", $code, $name); $result = db_query("SELECT lid FROM {locales_source}"); while ($string = db_fetch_object($result)) { - db_query("INSERT INTO {locales_target} (lid, locale) VALUES (%d,'%s')", $string->lid, $code); + db_query("INSERT INTO {locales_target} (lid, locale, translation) VALUES (%d,'%s', '')", $string->lid, $code); } // If only the language was added, and not a PO file import triggered |