From ab700960e46a1acf042f9be995aef8bb2aa74f7b Mon Sep 17 00:00:00 2001
From: Steven Wittens <steven@10.no-reply.drupal.org>
Date: Fri, 18 Mar 2005 08:02:10 +0000
Subject: - #18597: Resolve conflict in column name between queue.module and
 poll.module.

---
 database/updates.inc | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'database')

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);
-- 
cgit v1.2.3