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

[Michael Jervis]

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

Modified Files:
	mssql_1.4.1_to_1.5.0.php 
Log Message:
Fixed table prefix issues with constraints (bug #0000702)

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.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** mssql_1.4.1_to_1.5.0.php	5 Aug 2008 17:52:16 -0000	1.22
--- mssql_1.4.1_to_1.5.0.php	12 Aug 2008 18:13:35 -0000	1.23
***************
*** 8,12 ****
  $_SQL[] = "DROP TABLE " . $_DB_table_prefix . 'tzcodes';
  $_SQL[] = "ALTER TABLE {$_TABLES['userprefs']} ALTER COLUMN [tzid] VARCHAR(125) NOT NULL";
! $_SQL[] = "ALTER TABLE {$_TABLES['userprefs']} ADD CONSTRAINT [DF_gl_userprefs_tzid] DEFAULT ('') FOR [tzid]";
  // change former default values to '' so users dont all have edt for no reason
  $_SQL[] = "UPDATE {$_TABLES['userprefs']} set tzid = ''";
--- 8,12 ----
  $_SQL[] = "DROP TABLE " . $_DB_table_prefix . 'tzcodes';
  $_SQL[] = "ALTER TABLE {$_TABLES['userprefs']} ALTER COLUMN [tzid] VARCHAR(125) NOT NULL";
! $_SQL[] = "ALTER TABLE {$_TABLES['userprefs']} ADD CONSTRAINT [DF_{$_TABLES['userprefs']}_tzid] DEFAULT ('') FOR [tzid]";
  // change former default values to '' so users dont all have edt for no reason
  $_SQL[] = "UPDATE {$_TABLES['userprefs']} set tzid = ''";
***************
*** 44,48 ****
   
  $_SQL[] = "ALTER TABLE [dbo].[{$_TABLES['tokens']}] ADD
!     CONSTRAINT [PK_gl_tokens] PRIMARY KEY  CLUSTERED
      (
          [token]
--- 44,48 ----
   
  $_SQL[] = "ALTER TABLE [dbo].[{$_TABLES['tokens']}] ADD
!     CONSTRAINT [PK_{$_TABLES['tokens']}] PRIMARY KEY  CLUSTERED
      (
          [token]
***************
*** 418,422 ****
      $P_SQL[] = "ALTER TABLE {$_TABLES['pollanswers']} ADD qid VARCHAR(20) NOT NULL default '0'";
      $P_SQL[] = "ALTER TABLE {$_TABLES['pollanswers']} DROP CONSTRAINT [PK_gl_pollanswers];";
!     $P_SQL[] = "ALTER TABLE {$_TABLES['pollanswers']} ADD CONSTRAINT [PK_gl_pollanswers] PRIMARY KEY CLUSTERED ([pid], [qid], [aid]) ON [PRIMARY];";
      $P_SQL[] = "EXEC sp_rename '{$_TABLES['pollvoters']}.qid', 'pid', 'COLUMN'";
      $P_SQL[] = "ALTER TABLE {$_TABLES['pollvoters']} ALTER COLUMN [pid] VARCHAR( 20 ) NOT NULL";
--- 418,422 ----
      $P_SQL[] = "ALTER TABLE {$_TABLES['pollanswers']} ADD qid VARCHAR(20) NOT NULL default '0'";
      $P_SQL[] = "ALTER TABLE {$_TABLES['pollanswers']} DROP CONSTRAINT [PK_gl_pollanswers];";
!     $P_SQL[] = "ALTER TABLE {$_TABLES['pollanswers']} ADD CONSTRAINT [PK_{$_TABLES['pollanswers']}] PRIMARY KEY CLUSTERED ([pid], [qid], [aid]) ON [PRIMARY];";
      $P_SQL[] = "EXEC sp_rename '{$_TABLES['pollvoters']}.qid', 'pid', 'COLUMN'";
      $P_SQL[] = "ALTER TABLE {$_TABLES['pollvoters']} ALTER COLUMN [pid] VARCHAR( 20 ) NOT NULL";
***************
*** 425,429 ****
          [pid] [varchar] (20) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
          [question] [varchar] (255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
!         CONSTRAINT [PK_gl_pollquestions] PRIMARY KEY  CLUSTERED 
  	    (
  		    [qid]
--- 425,429 ----
          [pid] [varchar] (20) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
          [question] [varchar] (255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
!         CONSTRAINT [PK_{$_TABLES['pollquestions']}] PRIMARY KEY  CLUSTERED 
  	    (
  		    [qid]
***************
*** 651,655 ****
      ) ON [PRIMARY]";
      $P_SQL[] = "ALTER TABLE [dbo].[{$_TABLES['linkcategories']}] ADD
!         CONSTRAINT [PK_gl_linkcategories] PRIMARY KEY  CLUSTERED
          (
              [pid]
--- 651,655 ----
      ) ON [PRIMARY]";
      $P_SQL[] = "ALTER TABLE [dbo].[{$_TABLES['linkcategories']}] ADD
!         CONSTRAINT [PK_{$_TABLES['linkcategories']}] PRIMARY KEY  CLUSTERED
          (
              [pid]