[geeklog-cvs] Geeklog-1.x/sql/updates mssql_1.4.1_to_1.5.0.php, 1.18, 1.19

[Michael Jervis]

Update of /cvsroot/geeklog/Geeklog-1.x/sql/updates
In directory qs1489.pair.com:/tmp/cvs-serv36712/sql/updates

Modified Files:
	mssql_1.4.1_to_1.5.0.php 
Log Message:
Some further (this time blind) fixes to upgrade. Will endevour to test tomorrow.

Index: mssql_1.4.1_to_1.5.0.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/sql/updates/mssql_1.4.1_to_1.5.0.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** mssql_1.4.1_to_1.5.0.php	22 May 2008 15:07:09 -0000	1.18
--- mssql_1.4.1_to_1.5.0.php	22 May 2008 15:22:46 -0000	1.19
***************
*** 412,424 ****
      $P_SQL[] = "EXEC sp_rename '{$_TABLES['polltopics']}.qid', 'pid', 'COLUMN'";
      $P_SQL[] = "ALTER TABLE {$_TABLES['polltopics']} CHANGE [pid] VARCHAR( 20 ) NOT NULL";
!     // TODO: sort out constraints and sql errors:
      $P_SQL[] = "ALTER TABLE {$_TABLES['polltopics']} ADD COLUMN questions int(11) default '0' NOT NULL";
!     $P_SQL[] = "ALTER TABLE {$_TABLES['polltopics']} ADD is_open tinyint(1) NOT NULL default '1' AFTER display";
!     $P_SQL[] = "ALTER TABLE {$_TABLES['polltopics']} ADD hideresults tinyint(1) NOT NULL default '0' AFTER is_open";
!     $P_SQL[] = "ALTER TABLE {$_TABLES['polltopics']} CHANGE qid pid VARCHAR( 20 ) NOT NULL";
!     $P_SQL[] = "ALTER TABLE {$_TABLES['polltopics']} ADD qid VARCHAR( 20 ) NOT NULL DEFAULT '0' AFTER pid;";
!     $P_SQL[] = "ALTER TABLE {$_TABLES['polltopics']} DROP PRIMARY KEY;";
!     $P_SQL[] = "ALTER TABLE {$_TABLES['polltopics']} ADD INDEX (pid, qid, aid);";
!     $P_SQL[] = "ALTER TABLE {$_TABLES['pollvoters']} CHANGE qid pid VARCHAR( 20 ) NOT NULL";
      $P_SQL[] = "CREATE TABLE [dbo].[{$_TABLES['pollquestions']}] (
          [qid] [int] NOT NULL ,
--- 412,429 ----
      $P_SQL[] = "EXEC sp_rename '{$_TABLES['polltopics']}.qid', 'pid', 'COLUMN'";
      $P_SQL[] = "ALTER TABLE {$_TABLES['polltopics']} CHANGE [pid] VARCHAR( 20 ) NOT NULL";
!     // TODO: test changes here.:
      $P_SQL[] = "ALTER TABLE {$_TABLES['polltopics']} ADD COLUMN questions int(11) default '0' NOT NULL";
!     $P_SQL[] = "ALTER TABLE {$_TABLES['polltopics']} ADD COLUMN is_open tinyint(1) NOT NULL default '1'";
!     $P_SQL[] = "ALTER TABLE {$_TABLES['polltopics']} ADD COLUMN hideresults tinyint(1) NOT NULL default '0'";
!     $P_SQL[] = "EXEC sp_rename '{$_TABLES['pollanswers']}.qid', 'pid', 'COLUMN'";
!     $P_SQL[] = "ALTER TABLE {$_TABLES['pollanswers']} ALTER COLUMN [pid] VARCHAR( 20 ) NOT NULL";
!     $P_SQL[] = "ALTER TABLE {$_TABLES['pollanswers']} ALTER COLUMN [qid] VARCHAR( 20 ) NOT NULL;";
!     $P_SQL[] = "ALTER TABLE {$_TABLES['pollanswers']} ADD CONSTRAINT 
!                 [DF_gl_pollanswers_qid] DEFAULT ('0') FOR [qid]";
!     // to do:sort out primary key/indexes here:
!     $P_SQL[] = "ALTER TABLE {$_TABLES['pollanswers']} DROP PRIMARY KEY;";
!     $P_SQL[] = "ALTER TABLE {$_TABLES['pollanswers']} ADD INDEX (pid, qid, aid);";
!     $P_SQL[] = "EXEC sp_rename '{$_TABLES['pollvoters']}.qid', 'pid', 'COLUMN'";
!     $P_SQL[] = "ALTER TABLE {$_TABLES['pollvoters']} ALTER COLUMN [pid] VARCHAR( 20 ) NOT NULL";
      $P_SQL[] = "CREATE TABLE [dbo].[{$_TABLES['pollquestions']}] (
          [qid] [int] NOT NULL ,
***************
*** 432,436 ****
          )  ON [PRIMARY]";
      // in 1.4.1, "don't display poll" was equivalent to "closed"
!     $P_SQL[] = "UPDATE {$_TABLES['pollquestions']} SET is_open = 0 WHERE display = 0";
      $P_SQL[] = "UPDATE {$_TABLES['plugins']} SET pi_version = '2.0.1', pi_gl_version = '1.5.0' WHERE pi_name = 'polls'";
  
--- 437,441 ----
          )  ON [PRIMARY]";
      // in 1.4.1, "don't display poll" was equivalent to "closed"
!     $P_SQL[] = "UPDATE {$_TABLES['polltopics']} SET is_open = 0 WHERE display = 0";
      $P_SQL[] = "UPDATE {$_TABLES['plugins']} SET pi_version = '2.0.1', pi_gl_version = '1.5.0' WHERE pi_name = 'polls'";
  
***************
*** 444,448 ****
      $P_SQL = array();
  
!     $move_sql = "SELECT pid, topic FROM {$_TABLES['pollquestions']}";
      $move_rst = DB_query ($move_sql);
      $count_move = DB_numRows($move_rst);
--- 449,453 ----
      $P_SQL = array();
  
!     $move_sql = "SELECT pid, topic FROM {$_TABLES['polltopics']}";
      $move_rst = DB_query ($move_sql);
      $count_move = DB_numRows($move_rst);
***************
*** 492,496 ****
  
      $P_SQL = array();
!     $P_SQL[] = "ALTER TABLE {$_TABLES['staticpage']} ADD commentcode tinyint(4) NOT NULL default '0' AFTER sp_label";
      // disable comments on all existing static pages
      $P_SQL[] = "UPDATE {$_TABLES['staticpage']} SET commentcode = -1";
--- 497,501 ----
  
      $P_SQL = array();
!     $P_SQL[] = "ALTER TABLE {$_TABLES['staticpage']} ADD COLUMN commentcode tinyint(4) NOT NULL default '0' AFTER sp_label";
      // disable comments on all existing static pages
      $P_SQL[] = "UPDATE {$_TABLES['staticpage']} SET commentcode = -1";
***************
*** 661,666 ****
  
      $P_SQL[] = "ALTER TABLE {$_TABLES['linksubmission']} ADD owner_id mediumint(8) unsigned NOT NULL default '1' AFTER date";
!     $P_SQL[] = "ALTER TABLE {$_TABLES['linksubmission']} CHANGE category cid varchar(32) NOT NULL";
!     $P_SQL[] = "ALTER TABLE {$_TABLES['links']} CHANGE category cid varchar(32) NOT NULL";
      $P_SQL[] = "INSERT INTO {$_TABLES['linkcategories']} (cid, pid, category, description, tid, created, modified, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) VALUES ('{$root}', 'root', 'Root', 'Website root', NULL, NOW(), NOW(), 5, 2, 3, 3, 2, 2)";
      $P_SQL[] = "UPDATE {$_TABLES['plugins']} SET pi_version = '2.0.0', pi_gl_version='1.5.0' WHERE pi_name='links'";
--- 666,673 ----
  
      $P_SQL[] = "ALTER TABLE {$_TABLES['linksubmission']} ADD owner_id mediumint(8) unsigned NOT NULL default '1' AFTER date";
!     $P_SQL[] = "EXEC sp_rename '{$_TABLES['linksubmission']}.category', 'cid', 'COLUMN'";
!     $P_SQL[] = "ALTER TABLE {$_TABLES['linksubmission']} ALTER COLUMN [cid] varchar(32) NOT NULL";
!     $P_SQL[] = "EXEC sp_rename '{$_TABLES['links']}.category', 'cid', 'COLUMN'";
!     $P_SQL[] = "ALTER TABLE {$_TABLES['links']} ALTER COLUMN [cid] varchar(32) NOT NULL";
      $P_SQL[] = "INSERT INTO {$_TABLES['linkcategories']} (cid, pid, category, description, tid, created, modified, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) VALUES ('{$root}', 'root', 'Root', 'Website root', NULL, NOW(), NOW(), 5, 2, 3, 3, 2, 2)";
      $P_SQL[] = "UPDATE {$_TABLES['plugins']} SET pi_version = '2.0.0', pi_gl_version='1.5.0' WHERE pi_name='links'";