[phpmix-cvs] drupal/modules/akismet akismet.install,1.4,1.5

[<php...@li...>]

Update of /cvsroot/phpmix/drupal/modules/akismet
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4345

Modified Files:
	akismet.install 
Log Message:
Update 2: Add columns hostname and mail to {akismet_spam_marks} table.

Index: akismet.install
===================================================================
RCS file: /cvsroot/phpmix/drupal/modules/akismet/akismet.install,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** akismet.install	12 Jun 2006 05:27:44 -0000	1.4
--- akismet.install	19 Jun 2006 21:03:58 -0000	1.5
***************
*** 13,18 ****
            content_id int(10) unsigned NOT NULL default 0,
            spam_created int(11) unsigned NOT NULL default 0,
            UNIQUE content (content_type, content_id),
!           INDEX spam_created (spam_created)
          ) /*!40100 DEFAULT CHARACTER SET utf8 */;");
        db_query("CREATE TABLE {akismet_moderator} (
--- 13,22 ----
            content_id int(10) unsigned NOT NULL default 0,
            spam_created int(11) unsigned NOT NULL default 0,
+           hostname varchar(128) NOT NULL default '',
+           mail varchar(128) NOT NULL default '',
            UNIQUE content (content_type, content_id),
!           INDEX spam_created (spam_created),
!           INDEX hostname (hostname),
!           INDEX mail (mail)
          ) /*!40100 DEFAULT CHARACTER SET utf8 */;");
        db_query("CREATE TABLE {akismet_moderator} (
***************
*** 28,35 ****
            content_type varchar(20) NOT NULL default '',
            content_id integer NOT NULL default 0 CHECK (content_id >= 0),
!           spam_created integer NOT NULL default 0 CHECK (spam_created >= 0)
          )");
        db_query("CREATE UNIQUE INDEX {akismet_spam_marks_content} ON {akismet_spam_marks} (content_type, content_id)");
        db_query("CREATE INDEX {akismet_spam_marks_spamcreated} ON {akismet_spam_marks} (spam_created)");
        db_query("CREATE TABLE {akismet_moderator} (
            uid INTEGER NOT NULL DEFAULT 0 CHECK (uid >= 0),
--- 32,43 ----
            content_type varchar(20) NOT NULL default '',
            content_id integer NOT NULL default 0 CHECK (content_id >= 0),
!           spam_created integer NOT NULL default 0 CHECK (spam_created >= 0),
!           hostname varchar(128) NOT NULL default '',
!           mail varchar(128) NOT NULL default ''
          )");
        db_query("CREATE UNIQUE INDEX {akismet_spam_marks_content} ON {akismet_spam_marks} (content_type, content_id)");
        db_query("CREATE INDEX {akismet_spam_marks_spamcreated} ON {akismet_spam_marks} (spam_created)");
+       db_query("CREATE INDEX {akismet_spam_marks_hostname} ON {akismet_spam_marks} (hostname)");
+       db_query("CREATE INDEX {akismet_spam_marks_mail} ON {akismet_spam_marks} (mail)");
        db_query("CREATE TABLE {akismet_moderator} (
            uid INTEGER NOT NULL DEFAULT 0 CHECK (uid >= 0),
***************
*** 43,47 ****
  
  /**
!  * Update 1: Add table for user extensions.
   */
  function akismet_update_1() {
--- 51,55 ----
  
  /**
!  * Update 1: Add table for moderator extensions.
   */
  function akismet_update_1() {
***************
*** 71,72 ****
--- 79,114 ----
    return $ret;
  }
+ 
+ /**
+  * Update 2: Add columns hostname and mail to {akismet_spam_marks} table.
+  */
+ function akismet_update_2() {
+   $ret = array();
+ 
+   switch ($GLOBALS['db_type']) {
+     case 'mysql':
+     case 'mysqli':
+       $ret[] = update_sql("ALTER TABLE {akismet_spam_marks} ADD COLUMN hostname varchar(128) NOT NULL default ''");
+       $ret[] = update_sql("ALTER TABLE {akismet_spam_marks} ADD INDEX hostname (hostname)");
+ 
+       $ret[] = update_sql("ALTER TABLE {akismet_spam_marks} ADD COLUMN mail varchar(128) NOT NULL default ''");
+       $ret[] = update_sql("ALTER TABLE {akismet_spam_marks} ADD INDEX mail (mail)");
+       break;
+ 
+     case 'pgsql':
+       $ret[] = update_sql("ALTER TABLE {akismet_spam_marks} ADD COLUMN hostname VARCHAR(128)");
+       $ret[] = update_sql("ALTER TABLE {akismet_spam_marks} ALTER COLUMN hostname SET DEFAULT ''");
+       $ret[] = update_sql("UPDATE TABLE {akismet_spam_marks} SET hostname = '' WHERE hostname IS NULL");
+       $ret[] = update_sql("ALTER TABLE {akismet_spam_marks} ALTER COLUMN hostname SET NOT NULL");
+       $ret[] = update_sql("CREATE INDEX {akismet_spam_marks_hostname} ON {akismet_spam_marks} (hostname)");
+ 
+       $ret[] = update_sql("ALTER TABLE {akismet_spam_marks} ADD COLUMN mail VARCHAR(128)");
+       $ret[] = update_sql("ALTER TABLE {akismet_spam_marks} ALTER COLUMN mail SET DEFAULT ''");
+       $ret[] = update_sql("UPDATE TABLE {akismet_spam_marks} SET mail = '' WHERE mail IS NULL");
+       $ret[] = update_sql("ALTER TABLE {akismet_spam_marks} ALTER COLUMN mail SET NOT NULL");
+       $ret[] = update_sql("CREATE INDEX {akismet_spam_marks_mail} ON {akismet_spam_marks} (mail)");
+       break;
+   }
+ 
+   return $ret;
+ }