Make user_ip in user_newtalk a TEXT, as it is not an IP field.

diff --git a/maintenance/postgres/tables.sql b/maintenance/postgres/tables.sql
index 4dca3b1..62e021e 100644 (file)
--- a/maintenance/postgres/tables.sql
+++ b/maintenance/postgres/tables.sql
@@ -42,7 +42,7 @@ CREATE UNIQUE INDEX user_groups_unique ON user_groups (ug_user, ug_group);
 
 CREATE TABLE user_newtalk (
   user_id  INTEGER NOT NULL  REFERENCES mwuser(user_id) ON DELETE CASCADE,
-  user_ip  CIDR        NULL
+  user_ip  TEXT        NULL
 );
 CREATE INDEX user_newtalk_id_idx ON user_newtalk (user_id);
 CREATE INDEX user_newtalk_ip_idx ON user_newtalk (user_ip);

diff --git a/maintenance/updaters.inc b/maintenance/updaters.inc
index 454f082..99cd39c 100644 (file)
--- a/maintenance/updaters.inc
+++ b/maintenance/updaters.inc
@@ -1222,6 +1222,8 @@ DO INSTEAD DELETE FROM archive2 a2 WHERE
   a2.ar_namespace = OLD.ar_namespace AND
   a2.ar_rev_id = OLD.ar_rev_id;
 
+-- Another misleadingly named column! :)
+ALTER TABLE user_newtalk ALTER user_ip TYPE TEXT USING host(user_ip);
 
 -- Note this upgrade
 INSERT INTO mediawiki_version (type,mw_version,notes)