[evolvis-commits] r10363: updates in SQL files for 2. 5 to current CVS conv?==?UTF-8?Q?ertion↵
mirabilos at evolvis.org
mirabilos at evolvis.org
Thu Feb 24 17:44:12 CET 2011
Author: mirabilos
Date: 2011-02-24 17:44:12 +0100 (Thu, 24 Feb 2011)
New Revision: 10363
Modified:
trunk/gforge_base/evolvisforge-5.1/gforge/db/20010112.sql
trunk/gforge_base/evolvisforge-5.1/gforge/db/20010206.sql
trunk/gforge_base/evolvisforge-5.1/gforge/db/20010301.sql
trunk/gforge_base/evolvisforge-5.1/gforge/db/20010304-1.sql
trunk/gforge_base/evolvisforge-5.1/gforge/db/20010304-2.sql
trunk/gforge_base/evolvisforge-5.1/gforge/db/20010304-3.sql
trunk/gforge_base/evolvisforge-5.1/gforge/db/20010304-4-artifact-convert-files.php
trunk/gforge_base/evolvisforge-5.1/gforge/db/20021124-2_theming.sql
trunk/gforge_base/evolvisforge-5.1/gforge/db/20021124-3_gforge-debian-sf-sync.sql
trunk/gforge_base/evolvisforge-5.1/gforge/db/20021213_doc_data-migrate.php
trunk/gforge_base/evolvisforge-5.1/gforge/db/20030822.sql
trunk/gforge_base/evolvisforge-5.1/gforge/db/20040826_migrateforum.php
trunk/gforge_base/evolvisforge-5.1/gforge/db/20040826_migraterbac.php
trunk/gforge_base/evolvisforge-5.1/gforge/db/gforge2.6.sql
Log:
updates in SQL files for 2.5 to current CVS convertion
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/db/20010112.sql
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/db/20010112.sql 2011-02-24 16:44:11 UTC (rev 10362)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/db/20010112.sql 2011-02-24 16:44:12 UTC (rev 10363)
@@ -4,6 +4,17 @@
--0*24*60*60,
--15*24*60*60
-ALTER TABLE groups ADD COLUMN bug_due_period int NOT NULL DEFAULT 2592000;
-ALTER TABLE groups ADD COLUMN patch_due_period int NOT NULL DEFAULT 5184000;
-ALTER TABLE groups ADD COLUMN support_due_period int NOT NULL DEFAULT 1296000;
+ALTER TABLE groups ADD COLUMN bug_due_period int;
+UPDATE groups SET bug_due_period=(30*24*60*60);
+ALTER TABLE groups ALTER COLUMN bug_due_period SET NOT NULL;
+ALTER TABLE groups ALTER COLUMN bug_due_period SET DEFAULT 2592000;
+
+ALTER TABLE groups ADD COLUMN patch_due_period int;
+UPDATE groups SET patch_due_period=(0*24*60*60);
+ALTER TABLE groups ALTER COLUMN patch_due_period SET NOT NULL;
+ALTER TABLE groups ALTER COLUMN patch_due_period SET DEFAULT 5184000;
+
+ALTER TABLE groups ADD COLUMN support_due_period int;
+UPDATE groups SET support_due_period=(15*24*60*60);
+ALTER TABLE groups ALTER COLUMN support_due_period SET NOT NULL;
+ALTER TABLE groups ALTER COLUMN support_due_period SET DEFAULT 1296000;
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/db/20010206.sql
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/db/20010206.sql 2011-02-24 16:44:11 UTC (rev 10362)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/db/20010206.sql 2011-02-24 16:44:12 UTC (rev 10363)
@@ -1,9 +1,11 @@
-- by: pfalcon
-- purpose: add timestamp/version for stored multimedia files
-ALTER TABLE db_images ADD COLUMN upload_date int NOT NULL;
-ALTER TABLE db_images ADD COLUMN version int NOT NULL;
+ALTER TABLE db_images ADD COLUMN upload_date int;
+ALTER TABLE db_images ALTER COLUMN upload_date SET NOT NULL;
+ALTER TABLE db_images ADD COLUMN version int;
+ALTER TABLE db_images ALTER COLUMN version SET NOT NULL;
+
CREATE UNIQUE INDEX usergroup_uniq_groupid_userid ON
user_group(group_id,user_id);
-
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/db/20010301.sql
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/db/20010301.sql 2011-02-24 16:44:11 UTC (rev 10362)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/db/20010301.sql 2011-02-24 16:44:12 UTC (rev 10363)
@@ -1,7 +1,6 @@
--
-- Selected TOC Entries:
--
-\connect - www
--
-- TOC Entry ID 2 (OID 29407739)
--
@@ -9,7 +8,7 @@
--
CREATE TABLE "kernel_traffic" (
- "kt_id" serial primary key,
+ "kt_id" serial unique,
"kt_data" text,
CONSTRAINT "kernel_traffic_pkey" PRIMARY KEY ("kt_id")
);
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/db/20010304-1.sql
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/db/20010304-1.sql 2011-02-24 16:44:11 UTC (rev 10362)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/db/20010304-1.sql 2011-02-24 16:44:12 UTC (rev 10363)
@@ -11,7 +11,10 @@
--
-- user_group permissions flag
--
-ALTER TABLE user_group ADD COLUMN artifact_flags INT NOT NULL DEFAULT 0;
+ALTER TABLE user_group ADD COLUMN artifact_flags INT;
+ALTER TABLE user_group ALTER COLUMN artifact_flags SET NOT NULL;
+ALTER TABLE user_group ALTER COLUMN artifact_flags SET DEFAULT 0;
+
UPDATE user_group SET artifact_flags=0;
--
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/db/20010304-2.sql
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/db/20010304-2.sql 2011-02-24 16:44:11 UTC (rev 10362)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/db/20010304-2.sql 2011-02-24 16:44:12 UTC (rev 10363)
@@ -58,6 +58,7 @@
UPDATE bug SET close_date=0 WHERE close_date is NULL;
UPDATE bug SET summary=0 WHERE summary is NULL;
+UPDATE bug SET details='' WHERE details is NULL;
INSERT INTO artifact
(artifact_id,group_artifact_id,status_id,category_id,artifact_group_id,priority,
@@ -173,6 +174,9 @@
DELETE FROM support WHERE NOT EXISTS
(SELECT group_id FROM groups WHERE support.group_id=groups.group_id);
+UPDATE patch SET summary=0 WHERE summary is NULL;
+UPDATE patch SET details='' WHERE details is NULL;
+
INSERT INTO artifact
(artifact_id,group_artifact_id,status_id,category_id,artifact_group_id,priority,
submitted_by,assigned_to,open_date,close_date,summary,details,resolution_id)
@@ -276,7 +280,11 @@
--
-- moving the odd patch statuses to resolutions
--
-ALTER TABLE patch ADD COLUMN resolution_id INT NOT NULL DEFAULT 100;
+ALTER TABLE patch ADD COLUMN resolution_id INT;
+UPDATE patch SET resolution_id = 0;
+ALTER TABLE patch ALTER COLUMN resolution_id SET NOT NULL;
+ALTER TABLE patch ALTER COLUMN resolution_id SET DEFAULT 100;
+
UPDATE patch SET resolution_id=patch_status_id;
vacuum analyze patch;
update patch set patch_status_id=2 where patch_status_id > 3;
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/db/20010304-3.sql
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/db/20010304-3.sql 2011-02-24 16:44:11 UTC (rev 10362)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/db/20010304-3.sql 2011-02-24 16:44:12 UTC (rev 10363)
@@ -50,10 +50,7 @@
ALTER TABLE artifact_message ADD CONSTRAINT artifactmessage_submittedby_fk
FOREIGN KEY (submitted_by) REFERENCES users(user_id) MATCH FULL;
-ALTER TABLE artifact_monitor ADD CONSTRAINT artifactmonitor_artifactid_fk
- FOREIGN KEY (artifact_id) REFERENCES artifact(artifact_id) MATCH FULL;
-
-SELECT setval('artifact_grou_group_artifac_seq',(SELECT max(group_artifact_id) FROM artifact_group_list));
+SELECT setval('artifact_group_list_group_artifact_id_seq',(SELECT max(group_artifact_id) FROM artifact_group_list));
--SELECT setval('artifact_perm_id_seq',(SELECT max(id) FROM artifact_perm));
SELECT setval('artifact_category_id_seq',(SELECT max(id) FROM artifact_category));
SELECT setval('artifact_group_id_seq',(SELECT max(id) FROM artifact_group));
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/db/20010304-4-artifact-convert-files.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/db/20010304-4-artifact-convert-files.php 2011-02-24 16:44:11 UTC (rev 10362)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/db/20010304-4-artifact-convert-files.php 2011-02-24 16:44:12 UTC (rev 10363)
@@ -22,8 +22,11 @@
}
db_commit();
-echo "Done: ".db_error();
-
+if (db_error()) {
+ echo db_error()."\n";
+} else {
+ echo "SUCCESS\n";
+}
db_query("vacuum analyze;");
?>
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/db/20021124-2_theming.sql
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/db/20021124-2_theming.sql 2011-02-24 16:44:11 UTC (rev 10362)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/db/20021124-2_theming.sql 2011-02-24 16:44:12 UTC (rev 10363)
@@ -4,7 +4,7 @@
-- Re-add themes table, which I hastily dropped in 3pre2
--
CREATE TABLE themes (
-theme_id SERIAL,
+theme_id SERIAL UNIQUE,
dirname character varying(80),
fullname character varying(80)
);
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/db/20021124-3_gforge-debian-sf-sync.sql
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/db/20021124-3_gforge-debian-sf-sync.sql 2011-02-24 16:44:11 UTC (rev 10362)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/db/20021124-3_gforge-debian-sf-sync.sql 2011-02-24 16:44:12 UTC (rev 10363)
@@ -86,7 +86,7 @@
classname text,
language_code character(5));
INSERT INTO supported_languages SELECT * FROM supported_languages_old;
-SELECT SETVAL('supported_langu_language_id_seq',(select max(language_id) FROM supported_languages));
+SELECT SETVAL('supported_languages_language_id_seq',(select max(language_id) FROM supported_languages));
DROP TABLE supported_languages_old;
ALTER TABLE supported_languages ADD CONSTRAINT supported_languages_pkey PRIMARY KEY (language_id);
ALTER TABLE users ADD CONSTRAINT users_languageid_fk
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/db/20021213_doc_data-migrate.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/db/20021213_doc_data-migrate.php 2011-02-24 16:44:11 UTC (rev 10362)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/db/20021213_doc_data-migrate.php 2011-02-24 16:44:12 UTC (rev 10363)
@@ -14,11 +14,16 @@
// drop and recreate page cache
//
//SELECT * FROM doc_data WHERE filename is null;
+db_begin();
+
$res=db_query("SELECT * FROM doc_data WHERE filename IS NULL");
+if (!$res) {
+ echo db_error();
+ db_rollback();
+ exit();
+}
$rows=db_numrows($res);
-echo $rows;
-db_begin();
for ($i=0; $i<$rows; $i++) {
$res2=db_query("UPDATE doc_data
@@ -32,9 +37,8 @@
db_rollback();
exit;
}
-
}
db_commit();
-
+echo "SUCCESS\n";
?>
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/db/20030822.sql
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/db/20030822.sql 2011-02-24 16:44:11 UTC (rev 10362)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/db/20030822.sql 2011-02-24 16:44:12 UTC (rev 10363)
@@ -1,3 +1,7 @@
+DROP TRIGGER artifactgroup_update_trig ON artifact;
+
+DROP FUNCTION artifactgroup_update_agg();
+
CREATE OR REPLACE FUNCTION artifactgroup_update_agg () RETURNS OPAQUE AS '
BEGIN
--
@@ -82,3 +86,5 @@
RETURN NEW;
END;
' LANGUAGE 'plpgsql';
+
+CREATE TRIGGER "artifactgroup_update_trig" AFTER UPDATE ON "artifact" FOR EACH ROW EXECUTE PROCEDURE "artifactgroup_update_agg" ();
\ No newline at end of file
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/db/20040826_migrateforum.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/db/20040826_migrateforum.php 2011-02-24 16:44:11 UTC (rev 10362)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/db/20040826_migrateforum.php 2011-02-24 16:44:12 UTC (rev 10363)
@@ -32,7 +32,11 @@
//
db_begin();
$res=db_query("SELECT group_forum_id,forum_name FROM forum_group_list");
-echo db_error();
+if (!$res) {
+ echo db_error();
+ db_rollback();
+ exit();
+}
for ($i=0; $i<db_numrows($res); $i++) {
@@ -40,17 +44,26 @@
SET forum_name='". ereg_replace('[^_\.0-9a-z-]','-', strtolower(db_result($res,$i,'forum_name')) )."'
WHERE group_forum_id='".db_result($res,$i,'group_forum_id')."'";
$res2=db_query($sql);
- echo db_error();
-
+ if (!$res2) {
+ echo db_error();
+ db_rollback();
+ exit();
+ }
}
//
// Long-standing oddity in GForge -
// forums were ZERO-pen Discussion, not Oh-pen Discussion
//
-db_query("UPDATE forum_group_list SET forum_name='open-discussion'
+$res = db_query("UPDATE forum_group_list SET forum_name='open-discussion'
WHERE forum_name='0pen-discussion'");
+if (!$res) {
+ echo db_error();
+ db_rollback();
+ exit();
+}
+
db_commit();
-
+echo "SUCCESS\n";
?>
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/db/20040826_migraterbac.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/db/20040826_migraterbac.php 2011-02-24 16:44:11 UTC (rev 10362)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/db/20040826_migraterbac.php 2011-02-24 16:44:12 UTC (rev 10363)
@@ -31,7 +31,21 @@
//
// Set up this script to run as the site admin
//
-$id=db_result(db_query("SELECT user_id FROM user_group WHERE admin_flags='A' AND group_id='1'"),0,0);
+
+$res = db_query("SELECT user_id FROM user_group WHERE admin_flags='A' AND group_id='1'");
+
+if (!$res) {
+ echo db_error();
+ exit();
+}
+
+if (db_numrows($res) == 0) {
+ // There are no Admins yet, aborting without failing
+ echo "SUCCESS\n";
+ exit();
+}
+
+$id=db_result($res,0,0);
session_set_new($id);
//
@@ -60,9 +74,10 @@
$this->setError($role->getErrorMessage());
db_rollback();
echo "Could Not Create Default Roles: ".$arr[$i];
+ exit();
}
}
}
db_commit();
-
+echo "SUCCESS\n";
?>
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/db/gforge2.6.sql
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/db/gforge2.6.sql 2011-02-24 16:44:11 UTC (rev 10362)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/db/gforge2.6.sql 2011-02-24 16:44:12 UTC (rev 10363)
@@ -3086,10 +3086,10 @@
COPY "groups" FROM stdin;
-1 Master Group \N 0 A sourceforge shell1 \N \N cvs1 \N \N \N 0 1 \N 1 1 1 1 1 1 1 1 1 1 0 0 0 0 1 1 \N \N \N
-2 Stats Group \N 0 A stats shell1 \N \N cvs1 \N \N \N 0 1 \N 1 1 1 1 1 1 1 1 1 1 0 0 0 0 1 1 \N \N \N
-3 News Group \N 0 A news shell1 \N \N cvs1 \N \N \N 0 1 \N 1 1 1 1 1 1 1 1 1 1 0 0 0 0 1 1 \N \N \N
-4 Peer Ratings Group \N 0 A peerrating shell1 \N \N cvs1 \N \N \N 0 1 \N 1 1 1 1 1 1 1 1 1 1 0 0 0 0 1 1 \N \N \N
+1 Master Group \N 0 A sourceforge shell1 \N \N cvs1 \N \N \N 0 1 1 1 1 1 1 1 1 1 0 1
+2 Stats Group \N 0 A stats shell1 \N \N cvs1 \N \N \N 0 1 1 1 1 1 1 1 1 1 0 1
+3 News Group \N 0 A news shell1 \N \N cvs1 \N \N \N 0 1 1 1 1 1 1 1 1 1 0 1
+4 Peer Ratings Group \N 0 A peerrating shell1 \N \N cvs1 \N \N \N 0 1 1 1 1 1 1 1 1 1 0 1
\.
--
-- Data for TOC Entry ID 499 (OID 19996)
More information about the evolvis-commits
mailing list