summaryrefslogtreecommitdiff
path: root/database
diff options
context:
space:
mode:
authorSteven Wittens <steven@10.no-reply.drupal.org>2005-03-18 08:02:10 +0000
committerSteven Wittens <steven@10.no-reply.drupal.org>2005-03-18 08:02:10 +0000
commitab700960e46a1acf042f9be995aef8bb2aa74f7b (patch)
tree076d25566a51a2cc518e16838fb7a736f086a461 /database
parent55af18a2eb8e64395c78575a5d434c66b9e17e16 (diff)
downloadbrdo-ab700960e46a1acf042f9be995aef8bb2aa74f7b.tar.gz
brdo-ab700960e46a1acf042f9be995aef8bb2aa74f7b.tar.bz2
- #18597: Resolve conflict in column name between queue.module and poll.module.
Diffstat (limited to 'database')
-rw-r--r--database/updates.inc14
1 files changed, 13 insertions, 1 deletions
diff --git a/database/updates.inc b/database/updates.inc
index 468dc0285..aa76ce719 100644
--- a/database/updates.inc
+++ b/database/updates.inc
@@ -102,7 +102,8 @@ $sql_updates = array(
"2005-01-28" => "update_123",
"2005-02-11" => "update_124",
"2005-02-23" => "update_125",
- "2005-03-03" => "update_126"
+ "2005-03-03" => "update_126",
+ "2005-03-18" => "update_127"
);
function update_32() {
@@ -2313,6 +2314,17 @@ function update_126() {
return array();
}
+function update_127() {
+ $ret = array();
+ if ($GLOBALS['db_type'] == 'pgsql') {
+ $ret[] = update_sql("ALTER TABLE {poll} RENAME voters TO polled");
+ }
+ else if ($GLOBALS['db_type'] == 'mysql') {
+ $ret[] = update_sql("ALTER TABLE {poll} CHANGE voters polled longtext");
+ }
+ return $ret;
+}
+
function update_sql($sql) {
$edit = $_POST["edit"];
$result = db_query($sql);