[geeklog-cvs] Geeklog-1.x/sql/updates mssql_1.4.1_to_1.5.0.php, 1.17, 1.18
Michael Jervis
mjervis at qs1489.pair.com
Thu May 22 11:07:11 EDT 2008
Update of /cvsroot/geeklog/Geeklog-1.x/sql/updates
In directory qs1489.pair.com:/tmp/cvs-serv36190/sql/updates
Modified Files:
mssql_1.4.1_to_1.5.0.php
Log Message:
PARTIAL fixes for the MS SQL upgrade, more work to do. Less broken.
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.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** mssql_1.4.1_to_1.5.0.php 13 May 2008 19:42:17 -0000 1.17
--- mssql_1.4.1_to_1.5.0.php 22 May 2008 15:07:09 -0000 1.18
***************
*** 7,17 ****
// remove time zone table since its included into PEAR now
$_SQL[] = "DROP TABLE " . $_DB_table_prefix . 'tzcodes';
! $_SQL[] = "ALTER TABLE {$_TABLES['userprefs']} CHANGE tzid tzid VARCHAR(125) NOT NULL DEFAULT ''";
// change former default values to '' so users dont all have edt for no reason
$_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(1) 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
--- 7,18 ----
// remove time zone table since its included into PEAR now
$_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 = ''";
// 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
***************
*** 19,27 ****
// Increase block function size to accept arguments:
! $_SQL[] = "ALTER TABLE {$_TABLES['blocks']} CHANGE phpblockfn phpblockfn VARCHAR(128)";
// 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
--- 20,28 ----
// Increase block function size to accept arguments:
! $_SQL[] = "ALTER TABLE {$_TABLES['blocks']} ALTER COLUMN [phpblockfn] VARCHAR(128)";
// 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
***************
*** 45,49 ****
CONSTRAINT [PK_gl_tokens] PRIMARY KEY CLUSTERED
(
! [toekn]
) ON [PRIMARY]
";
--- 46,50 ----
CONSTRAINT [PK_gl_tokens] PRIMARY KEY CLUSTERED
(
! [token]
) ON [PRIMARY]
";
***************
*** 68,71 ****
--- 69,90 ----
ON [PRIMARY]
");
+
+ DB_Query ("
+ ALTER function [dbo].[DESCRIBE](@d as varchar(100)='', @c as varchar(100)=null)
+ RETURNS table AS
+
+ RETURN
+ (select top 1000 a.name as Field, c.name +'(' + cast(a.prec as varchar) + ')' as Type,
+ case when a.status=(0x08) then 'NULL' else '' end as [Null],
+ ' ' as [Key],
+ ' ' as [Default],
+ ' ' as [Extra]
+ from syscolumns a
+ join sysobjects b on a.id=b.id
+ join systypes c on a.xtype=c.xtype
+ where b.name = @d
+ AND (a.name=@c OR @c IS NULL)
+ order by colorder asc)
+ ");
require_once $_CONF['path_system'] . 'classes/config.class.php';
***************
*** 387,400 ****
$P_SQL = array();
! $P_SQL[] = "RENAME TABLE {$_TABLES['pollquestions']} TO {$_TABLES['polltopics']};";
! $P_SQL[] = "ALTER TABLE {$_TABLES['polltopics']} CHANGE question topic VARCHAR( 255 ) NULL DEFAULT NULL";
! $P_SQL[] = "ALTER TABLE {$_TABLES['polltopics']} CHANGE qid pid VARCHAR( 20 ) NOT NULL";
! $P_SQL[] = "ALTER TABLE {$_TABLES['polltopics']} ADD questions int(11) default '0' NOT NULL AFTER voters";
$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['pollanswers']} CHANGE qid pid VARCHAR( 20 ) NOT NULL";
! $P_SQL[] = "ALTER TABLE {$_TABLES['pollanswers']} ADD qid VARCHAR( 20 ) NOT NULL DEFAULT '0' AFTER pid;";
! $P_SQL[] = "ALTER TABLE {$_TABLES['pollanswers']} DROP PRIMARY KEY;";
! $P_SQL[] = "ALTER TABLE {$_TABLES['pollanswers']} 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']}] (
--- 406,423 ----
$P_SQL = array();
! //$P_SQL[] = "ALTER TABLE {$_TABLES['polltopics']} RENAME TO {$_TABLES['pollquestions']};";
! $P_SQL[] = "EXEC sp_rename '{$_TABLES['pollquestions']}', '{$_TABLES['polltopics']}'";
! $P_SQL[] = "EXEC sp_rename '{$_TABLES['polltopics']}.question', 'topic', 'COLUMN'";
! $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: 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']}] (
***************
*** 409,413 ****
) 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'";
--- 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'";
***************
*** 421,425 ****
$P_SQL = array();
! $move_sql = "SELECT pid, topic FROM {$_TABLES['polltopics']}";
$move_rst = DB_query ($move_sql);
$count_move = DB_numRows($move_rst);
--- 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);
***************
*** 512,518 ****
}
! $P_SQL[] = "ALTER TABLE {$_TABLES['events']} CHANGE state state varchar(40) default NULL";
! $P_SQL[] = "ALTER TABLE {$_TABLES['eventsubmission']} CHANGE state state varchar(40) default NULL";
! $P_SQL[] = "ALTER TABLE {$_TABLES['personal_events']} CHANGE state state varchar(40) default NULL";
$P_SQL[] = "UPDATE {$_TABLES['plugins']} SET pi_version = '1.0.2', pi_gl_version = '1.5.0' WHERE pi_name = 'calendar'";
--- 535,541 ----
}
! $P_SQL[] = "ALTER TABLE {$_TABLES['events']} ALTER COLUMN [state] varchar(40)";
! $P_SQL[] = "ALTER TABLE {$_TABLES['eventsubmission']} ALTER COLUMN [state] varchar(40)";
! $P_SQL[] = "ALTER TABLE {$_TABLES['personal_events']} ALTER COLUMN [state] varchar(40)";
$P_SQL[] = "UPDATE {$_TABLES['plugins']} SET pi_version = '1.0.2', pi_gl_version = '1.5.0' WHERE pi_name = 'calendar'";
More information about the geeklog-cvs
mailing list