[geeklog-cvs] Geeklog-1.x/sql/updates mssql_1.4.1_to_1.5.0.php, 1.20, 1.21
Michael Jervis
mjervis at qs1489.pair.com
Sat May 24 11:42:28 EDT 2008
Update of /cvsroot/geeklog/Geeklog-1.x/sql/updates
In directory qs1489.pair.com:/tmp/cvs-serv977/sql/updates
Modified Files:
mssql_1.4.1_to_1.5.0.php
Log Message:
Working MSSQL Upgrade.
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.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** mssql_1.4.1_to_1.5.0.php 23 May 2008 17:25:29 -0000 1.20
--- mssql_1.4.1_to_1.5.0.php 24 May 2008 15:42:26 -0000 1.21
***************
*** 12,18 ****
$_SQL[] = "UPDATE {$_TABLES['userprefs']} set tzid = ''";
// Add new field to track the number of reminders to login and use the site or account may be deleted
! $_SQL[] = "ALTER TABLE {$_TABLES['users']} ADD num_reminders TINYINT NOT NULL default 0"; // AFTER status";
// User submissions may have body text.
! $_SQL[] = "ALTER TABLE {$_TABLES['storysubmission']} ADD bodytext TEXT"; // AFTER introtext";
// new comment code: close comments
--- 12,18 ----
$_SQL[] = "UPDATE {$_TABLES['userprefs']} set tzid = ''";
// Add new field to track the number of reminders to login and use the site or account may be deleted
! $_SQL[] = "ALTER TABLE {$_TABLES['users']} ADD num_reminders TINYINT NOT NULL default 0";
// User submissions may have body text.
! $_SQL[] = "ALTER TABLE {$_TABLES['storysubmission']} ADD bodytext TEXT";
// new comment code: close comments
***************
*** 23,28 ****
// New fields to store HTTP Last-Modified and ETag headers
! $_SQL[] = "ALTER TABLE {$_TABLES['blocks']} ADD rdf_last_modified VARCHAR(40) DEFAULT NULL";// AFTER rdfupdated";
! $_SQL[] = "ALTER TABLE {$_TABLES['blocks']} ADD rdf_etag VARCHAR(40) DEFAULT NULL"; // AFTER rdf_last_modified";
// new 'webservices.atompub' feature
--- 23,28 ----
// New fields to store HTTP Last-Modified and ETag headers
! $_SQL[] = "ALTER TABLE {$_TABLES['blocks']} ADD rdf_last_modified VARCHAR(40) DEFAULT NULL";
! $_SQL[] = "ALTER TABLE {$_TABLES['blocks']} ADD rdf_etag VARCHAR(40) DEFAULT NULL";
// new 'webservices.atompub' feature
***************
*** 34,38 ****
// add the security tokens table:
$_SQL[] = "
! CREATE TABLE {$_TABLES['tokens']} (
[token] [varchar] (32) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
[created] [datetime] NOT NULL,
--- 34,38 ----
// add the security tokens table:
$_SQL[] = "
! CREATE TABLE [dbo].[{$_TABLES['tokens']}] (
[token] [varchar] (32) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
[created] [datetime] NOT NULL,
***************
*** 71,75 ****
DB_Query ("
! ALTER function [dbo].[DESCRIBE](@d as varchar(100)='', @c as varchar(100)=null)
RETURNS table AS
--- 71,75 ----
DB_Query ("
! ALTER function [DESCRIBE](@d as varchar(100)='', @c as varchar(100)=null)
RETURNS table AS
***************
*** 407,410 ****
--- 407,411 ----
$P_SQL = array();
//$P_SQL[] = "ALTER TABLE {$_TABLES['polltopics']} RENAME TO {$_TABLES['pollquestions']};";
+ $P_SQL[] = "ALTER TABLE {$_TABLES['pollquestions']} DROP CONSTRAINT [PK_gl_pollquestions];";
$P_SQL[] = "EXEC sp_rename '{$_TABLES['pollquestions']}', '{$_TABLES['polltopics']}'";
$P_SQL[] = "EXEC sp_rename '{$_TABLES['polltopics']}.question', 'topic', 'COLUMN'";
***************
*** 416,422 ****
$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";
--- 417,422 ----
$P_SQL[] = "EXEC sp_rename '{$_TABLES['pollanswers']}.qid', 'pid', 'COLUMN'";
$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";
***************
*** 425,435 ****
[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";
--- 425,433 ----
[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]
+ ) ON [PRIMARY]
) 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";
***************
*** 493,499 ****
$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";
$P_SQL[] = "UPDATE {$_TABLES['plugins']} SET pi_version = '1.5.0', pi_gl_version = '1.5.0' WHERE pi_name = 'staticpages'";
--- 491,497 ----
$P_SQL = array();
! $P_SQL[] = "ALTER TABLE {$_TABLES['staticpage']} ADD [commentcode] TINYINT NOT NULL default '0'";
// disable comments on all existing static pages
! $P_SQL[] = "UPDATE {$_TABLES['staticpage']} SET commentcode = 0";
$P_SQL[] = "UPDATE {$_TABLES['plugins']} SET pi_version = '1.5.0', pi_gl_version = '1.5.0' WHERE pi_name = 'staticpages'";
***************
*** 642,646 ****
[category] [varchar] (32) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
[description] [varchar] (5000) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
! [tid] [varchar] (20) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
[created] [datetime] NULL ,
[modified] [datetime] NULL ,
--- 640,644 ----
[category] [varchar] (32) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
[description] [varchar] (5000) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
! [tid] [varchar] (20) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
[created] [datetime] NULL ,
[modified] [datetime] NULL ,
***************
*** 661,665 ****
"grp_name='Block Admin'");
! $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";
--- 659,663 ----
"grp_name='Block Admin'");
! $P_SQL[] = "ALTER TABLE {$_TABLES['linksubmission']} ADD owner_id INTEGER NOT NULL default '1'";
$P_SQL[] = "EXEC sp_rename '{$_TABLES['linksubmission']}.category', 'cid', 'COLUMN'";
$P_SQL[] = "ALTER TABLE {$_TABLES['linksubmission']} ALTER COLUMN [cid] varchar(32) NOT NULL";
***************
*** 689,695 ****
$category = addslashes($A['category']);
$cid = $category;
! DB_query("INSERT INTO {$_TABLES['linkcategories']} (cid,pid,category,description,tid,owner_id,group_id,created,modified) VALUES ('{$cid}','{$root}','{$category}','{$category}','all',2,'{$group_id}',NOW(),NOW())",1);
if ($cid != $category) { // still experimenting ...
! DB_query("UPDATE {$_TABLES['links']} SET cid='{$cid}' WHERE cid='{$category}'",1);
}
if (DB_error()) {
--- 687,695 ----
$category = addslashes($A['category']);
$cid = $category;
! $sql = "INSERT INTO {$_TABLES['linkcategories']} (cid,pid,category,description,tid,owner_id,group_id,created,modified, perm_owner, perm_group, perm_members, perm_anon) VALUES ('{$cid}','{$root}','{$category}','{$category}','all',2,'{$group_id}',NOW(),NOW(), 3, 3, 2, 2)";
! DB_query($sql,0);
if ($cid != $category) { // still experimenting ...
! $sql = "UPDATE {$_TABLES['links']} SET cid='{$cid}' WHERE cid='{$category}'";
! DB_query($sql,0);
}
if (DB_error()) {
More information about the geeklog-cvs
mailing list