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

[Michael Jervis]

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

Modified Files:
	mssql_1.4.1_to_1.5.0.php 
Log Message:
More upgrade updates.

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.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** mssql_1.4.1_to_1.5.0.php	22 May 2008 15:22:46 -0000	1.19
--- mssql_1.4.1_to_1.5.0.php	23 May 2008 17:25:29 -0000	1.20
***************
*** 411,439 ****
      $P_SQL[] = "ALTER TABLE {$_TABLES['polltopics']} ALTER COLUMN [topic] VARCHAR( 255 ) NULL";
      $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 ,
          [pid] [varchar] (20) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
          [question] [varchar] (255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
      ) ON [PRIMARY]";
!     $P_SQL[] = "ALTER TABLE [dbo].[{$_TABLES['pollquestions']}] ADD
!         CONSTRAINT [PK_gl_pollquestions] PRIMARY KEY  CLUSTERED
!         (
!             [qid]
!         )  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";
--- 411,435 ----
      $P_SQL[] = "ALTER TABLE {$_TABLES['polltopics']} ALTER COLUMN [topic] VARCHAR( 255 ) NULL";
      $P_SQL[] = "EXEC sp_rename '{$_TABLES['polltopics']}.qid', 'pid', 'COLUMN'";
!     $P_SQL[] = "ALTER TABLE {$_TABLES['polltopics']} ADD questions int default '0' NOT NULL";
!     $P_SQL[] = "ALTER TABLE {$_TABLES['polltopics']} ADD is_open tinyint NOT NULL default '1'";
!     $P_SQL[] = "ALTER TABLE {$_TABLES['polltopics']} ADD hideresults tinyint NOT NULL default '0'";
      $P_SQL[] = "EXEC sp_rename '{$_TABLES['pollanswers']}.qid', 'pid', 'COLUMN'";
!     $P_SQL[] = "ALTER TABLE {$_TABLES['pollanswers']} ADD qid VARCHAR(20) NOT NULL default '0'";
!     // todo: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 DEFAULT 0,
          [pid] [varchar] (20) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
          [question] [varchar] (255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
      ) ON [PRIMARY]";
!     // todo: sort out key
! //    $P_SQL[] = "ALTER TABLE [dbo].[{$_TABLES['pollquestions']}] ADD
! //        CONSTRAINT [PK_gl_pollquestions] PRIMARY KEY  CLUSTERED
! //        (
! //            [qid]
! //        )  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";
***************
*** 454,458 ****
      for ($i = 0; $i < $count_move; $i++) {
          $A = DB_fetchArray($move_rst);
!         $A[1] = mysql_real_escape_string($A[1]);
          $P_SQL[] = "INSERT INTO {$_TABLES['pollquestions']} (pid, question) VALUES ('{$A[0]}','{$A[1]}');";
      }
--- 450,454 ----
      for ($i = 0; $i < $count_move; $i++) {
          $A = DB_fetchArray($move_rst);
!         $A[1] = str_replace("'", "''", $A[1]);
          $P_SQL[] = "INSERT INTO {$_TABLES['pollquestions']} (pid, question) VALUES ('{$A[0]}','{$A[1]}');";
      }