cvs diff -r HEAD -u -wb -- database.mysql database.pgsql updates.inc (in directory D:\devsites\aggregator_engine\database\) Index: database.mysql =================================================================== RCS file: /cvs/drupal/drupal/database/database.mysql,v retrieving revision 1.201 diff -u -w -b -r1.201 database.mysql --- database.mysql 18 Oct 2005 14:41:26 -0000 1.201 +++ database.mysql 19 Oct 2005 17:36:30 -0000 @@ -78,13 +78,14 @@ checked int(10) NOT NULL default '0', link varchar(255) NOT NULL default '', description longtext NOT NULL, + copyright longtext NOT NULL, image longtext NOT NULL, etag varchar(255) NOT NULL default '', modified int(10) NOT NULL default '0', block tinyint(2) NOT NULL default '0', PRIMARY KEY (fid), - UNIQUE KEY link (url), - UNIQUE KEY title (title) + UNIQUE KEY title (title), + UNIQUE KEY link (url) ) TYPE=MyISAM; -- @@ -97,7 +98,10 @@ title varchar(255) NOT NULL default '', link varchar(255) NOT NULL default '', author varchar(255) NOT NULL default '', + categories longtext NOT NULL, description longtext NOT NULL, + enclosure longtext NOT NULL, + enclosure_retrieved int(11) NOT NULL default '0', timestamp int(11) default NULL, PRIMARY KEY (iid) ) TYPE=MyISAM; Index: database.pgsql =================================================================== RCS file: /cvs/drupal/drupal/database/database.pgsql,v retrieving revision 1.140 diff -u -w -b -r1.140 database.pgsql --- database.pgsql 18 Oct 2005 14:41:26 -0000 1.140 +++ database.pgsql 19 Oct 2005 17:36:30 -0000 @@ -73,13 +73,14 @@ checked integer NOT NULL default '0', link varchar(255) NOT NULL default '', description text, + copyright text, image text, etag varchar(255) NOT NULL default '', modified integer NOT NULL default '0', block smallint NOT NULL default '0', PRIMARY KEY (fid), - UNIQUE (url), - UNIQUE (title) + UNIQUE (title), + UNIQUE (url) ); -- @@ -87,15 +88,18 @@ -- CREATE TABLE aggregator_item ( - iid SERIAL, + iid serial, fid integer NOT NULL default '0', title varchar(255) NOT NULL default '', link varchar(255) NOT NULL default '', author varchar(255) NOT NULL default '', - description text, - timestamp integer default NULL, + categories text NOT NULL, + description text NOT NULL, + enclosure text NOT NULL, + enclosure_retrieved integer NOT NULL default '0', + timestamp int(11) default NULL, PRIMARY KEY (iid) -); +) TYPE=MyISAM; -- -- Table structure for authmap Index: updates.inc =================================================================== RCS file: /cvs/drupal/drupal/database/updates.inc,v retrieving revision 1.139 diff -u -w -b -r1.139 updates.inc --- updates.inc 18 Oct 2005 14:41:26 -0000 1.139 +++ updates.inc 22 Oct 2005 14:52:16 -0000 @@ -68,6 +68,7 @@ "2005-09-18" => "update_148", "2005-09-27" => "update_149", "2005-10-15" => "update_150" + "2005-10-22" => "update_151" ); function update_110() { @@ -919,6 +920,26 @@ return $ret; } +function update_151() { + $ret = array(); + switch ($GLOBALS['db_type']) { + case 'mysqli': + case 'mysql': + $ret[] = update_sql("ALTER TABLE {aggregator_feed} ADD copyright longtext NOT NULL"); + $ret[] = update_sql("ALTER TABLE {aggregator_item} ADD categories longtext NOT NULL"); + $ret[] = update_sql("ALTER TABLE {aggregator_item} ADD enclosure longtext NOT NULL"); + $ret[] = update_sql("ALTER TABLE {aggregator_item} ADD enclosure_retrieved int(11) NOT NULL default '0'"); + break; + case 'pgsql': + $ret[] = update_sql("ALTER TABLE {aggregator_feed} ADD copyright text NOT NULL"); + $ret[] = update_sql("ALTER TABLE {aggregator_item} ADD categories text NOT NULL"); + $ret[] = update_sql("ALTER TABLE {aggregator_item} ADD enclosure text NOT NULL"); + $ret[] = update_sql("ALTER TABLE {aggregator_item} ADD enclosure_retrieved integer NOT NULL default '0'"); + break; + } + return $ret; +} + function update_sql($sql) { $edit = $_POST["edit"]; $result = db_query($sql);