From: <lfa...@us...> - 2004-06-01 12:11:21
|
Update of /cvsroot/tikiwiki/tiki/db In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31623/db Modified Files: tiki-1.9-mysql.sql tiki-1.9-oci8.sql tiki-1.9-pgsql.sql tiki-1.9-sqlite.sql tiki-1.9-sybase.sql Log Message: Ran convertsql script Index: tiki-1.9-mysql.sql =================================================================== RCS file: /cvsroot/tikiwiki/tiki/db/tiki-1.9-mysql.sql,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- tiki-1.9-mysql.sql 31 May 2004 12:23:03 -0000 1.28 +++ tiki-1.9-mysql.sql 1 Jun 2004 12:11:09 -0000 1.29 @@ -2741,6 +2741,7 @@ # -------------------------------------------------------- # Tables for TikiSheet +DROP TABLE IF EXISTS tiki_sheet_layout; CREATE TABLE tiki_sheet_layout ( sheetId int(8) NOT NULL default '0', begin int(10) NOT NULL default '0', @@ -2751,6 +2752,7 @@ UNIQUE KEY sheetId (sheetId,begin) ) TYPE=MyISAM; +DROP TABLE IF EXISTS tiki_sheet_values; CREATE TABLE tiki_sheet_values ( sheetId int(8) NOT NULL default '0', begin int(10) NOT NULL default '0', @@ -2765,6 +2767,7 @@ KEY sheetId_2 (sheetId,rowIndex,columnIndex) ) TYPE=MyISAM; +DROP TABLE IF EXISTS tiki_sheets; CREATE TABLE tiki_sheets ( sheetId int(8) NOT NULL auto_increment, title varchar(200) NOT NULL default '', @@ -2804,6 +2807,21 @@ # -------------------------------------------------------- # +# Table structure for table `tiki_structure_versions` +# +# Creation: Jul 03, 2003 at 07:42 PM +# Last update: Jul 03, 2003 at 07:42 PM +# + +DROP TABLE IF EXISTS tiki_structure_versions; +CREATE TABLE tiki_structure_versions ( + structure_id int(14) NOT NULL auto_increment, + version int(14) default NULL, + PRIMARY KEY (structure_id) +) TYPE=MyISAM AUTO_INCREMENT=1 ; +# -------------------------------------------------------- + +# # Table structure for table `tiki_structures` # # Creation: Jul 03, 2003 at 07:42 PM @@ -2813,8 +2831,10 @@ DROP TABLE IF EXISTS tiki_structures; CREATE TABLE tiki_structures ( page_ref_id int(14) NOT NULL auto_increment, + structure_id int(14) NOT NULL, parent_id int(14) default NULL, page_id int(14) NOT NULL, + page_version int(8) default NULL, page_alias varchar(240) NOT NULL default '', pos int(4) default NULL, PRIMARY KEY (page_ref_id), @@ -4130,6 +4150,7 @@ INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('feature_warn_on_edit','n'); INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('feature_webmail','n'); INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('feature_wiki_allowhtml','n'); +INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('feature_wiki_open_as_structure','n'); INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('feature_wiki_attachments','n'); INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('feature_wiki_comments','n'); INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('feature_wiki_description','n'); @@ -4145,7 +4166,6 @@ INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('feature_wiki_templates','n'); INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('feature_wiki_undo','n'); INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('feature_wiki_usrlock','n'); -INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('feature_wiki_open_as_structure','n'); INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('feature_wikiwords','y'); INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('feature_wiki','y'); INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('feature_workflow','n'); @@ -4193,7 +4213,7 @@ INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('https_login_required','n'); INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('https_port','443'); INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('https_prefix','/'); -INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('image_galleries_comments_default_orderin','points_desc'); +INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('image_galleries_comments_default_order','points_desc'); INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('image_galleries_comments_per_page','10'); INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('keep_versions','1'); INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('language','en'); @@ -4317,6 +4337,9 @@ INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('w_use_db','y'); INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('w_use_dir',''); INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('feature_homework','n'); +INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('feature_detect_language','n'); +INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('available_languages','a:0:{}'); +INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('available_styles','a:0:{}'); # Dynamic variables INSERT INTO users_permissions (permName, permDesc, level, type) VALUES ('tiki_p_edit_dynvar', 'Can edit dynamic variables', 'editors', 'wiki'); Index: tiki-1.9-oci8.sql =================================================================== RCS file: /cvsroot/tikiwiki/tiki/db/tiki-1.9-oci8.sql,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- tiki-1.9-oci8.sql 5 May 2004 13:55:08 -0000 1.18 +++ tiki-1.9-oci8.sql 1 Jun 2004 12:11:10 -0000 1.19 @@ -3353,6 +3353,8 @@ -- -------------------------------------------------------- -- Tables for TikiSheet +DROP TABLE "tiki_sheet_layout"; + CREATE TABLE "tiki_sheet_layout" ( "sheetId" number(8) default '0' NOT NULL, "begin" number(10) default '0' NOT NULL, @@ -3364,6 +3366,8 @@ CREATE UNIQUE INDEX "tiki_sheet_layout_sheetId" ON "tiki_sheet_layout"("sheetId","begin"); +DROP TABLE "tiki_sheet_values"; + CREATE TABLE "tiki_sheet_values" ( "sheetId" number(8) default '0' NOT NULL, "begin" number(10) default '0' NOT NULL, @@ -3378,8 +3382,10 @@ CREATE INDEX "tiki_sheet_values_sheetId_2" ON "tiki_sheet_values"("sheetId","rowIndex","columnIndex"); CREATE UNIQUE INDEX "tiki_sheet_values_sheetId" ON "tiki_sheet_values"("sheetId","begin","rowIndex","columnIndex"); -CREATE SEQUENCE "tiki_sheet_values_sequ" INCREMENT BY 1 START WITH 1; +DROP TABLE "tiki_sheets"; + +CREATE SEQUENCE "tiki_sheets_sequ" INCREMENT BY 1 START WITH 1; CREATE TABLE "tiki_sheets" ( "sheetId" number(8) NOT NULL, "title" varchar(200) default '' NOT NULL, @@ -3388,9 +3394,9 @@ PRIMARY KEY ("sheetId") ) ; -CREATE TRIGGER "tiki_sheet_values_trig" BEFORE INSERT ON "tiki_sheet_values" REFERENCING NEW AS NEW OLD AS OLD FOR EACH ROW +CREATE TRIGGER "tiki_sheets_trig" BEFORE INSERT ON "tiki_sheets" REFERENCING NEW AS NEW OLD AS OLD FOR EACH ROW BEGIN -SELECT "tiki_sheet_values_sequ".nextval into :NEW."sheetId" FROM DUAL; +SELECT "tiki_sheets_sequ".nextval into :NEW."sheetId" FROM DUAL; END; / @@ -3431,6 +3437,27 @@ -- -------------------------------------------------------- -- +-- Table structure for table `tiki_structure_versions` +-- +-- Creation: Jul 03, 2003 at 07:42 PM +-- Last update: Jul 03, 2003 at 07:42 PM +-- +DROP TABLE "tiki_structure_versions"; + +CREATE SEQUENCE "tiki_structure_versions_sequ" INCREMENT BY 1 START WITH 1; +CREATE TABLE "tiki_structure_versions" ( + "structure_id" number(14) NOT NULL, + "version" number(14) default NULL, + PRIMARY KEY ("structure_id") +) ; + +CREATE TRIGGER "tiki_structure_versions_trig" BEFORE INSERT ON "tiki_structure_versions" REFERENCING NEW AS NEW OLD AS OLD FOR EACH ROW +BEGIN +SELECT "tiki_structure_versions_sequ".nextval into :NEW."structure_id" FROM DUAL; +END; +/ +-- -------------------------------------------------------- +-- -- Table structure for table `tiki_structures` -- -- Creation: Jul 03, 2003 at 07:42 PM @@ -3441,8 +3468,10 @@ CREATE SEQUENCE "tiki_structures_sequ" INCREMENT BY 1 START WITH 1; CREATE TABLE "tiki_structures" ( "page_ref_id" number(14) NOT NULL, + "structure_id" number(14) NOT NULL, "parent_id" number(14) default NULL, "page_id" number(14) NOT NULL, + "page_version" number(8) default NULL, "page_alias" varchar(240) default '' NOT NULL, "pos" number(4) default NULL, PRIMARY KEY ("page_ref_id") @@ -5243,6 +5272,8 @@ INSERT INTO "tiki_preferences" ("name","value") VALUES ('feature_wiki_allowhtml','n'); +INSERT INTO "tiki_preferences" ("name","value") VALUES ('feature_wiki_open_as_structure','n'); + INSERT INTO "tiki_preferences" ("name","value") VALUES ('feature_wiki_attachments','n'); INSERT INTO "tiki_preferences" ("name","value") VALUES ('feature_wiki_comments','n'); @@ -5367,7 +5398,7 @@ INSERT INTO "tiki_preferences" ("name","value") VALUES ('https_prefix','/'); -INSERT INTO "tiki_preferences" ("name","value") VALUES ('image_galleries_comments_default_orderin','points_desc'); +INSERT INTO "tiki_preferences" ("name","value") VALUES ('image_galleries_comments_default_order','points_desc'); INSERT INTO "tiki_preferences" ("name","value") VALUES ('image_galleries_comments_per_page','10'); @@ -5615,6 +5646,12 @@ INSERT INTO "tiki_preferences" ("name","value") VALUES ('feature_homework','n'); +INSERT INTO "tiki_preferences" ("name","value") VALUES ('feature_detect_language','n'); + +INSERT INTO "tiki_preferences" ("name","value") VALUES ('available_languages','a:0:{}'); + +INSERT INTO "tiki_preferences" ("name","value") VALUES ('available_styles','a:0:{}'); + -- Dynamic variables INSERT INTO "users_permissions" ("permName","permDesc","level","type") VALUES ('tiki_p_edit_dynvar', 'Can edit dynamic variables', 'editors', 'wiki'); Index: tiki-1.9-pgsql.sql =================================================================== RCS file: /cvsroot/tikiwiki/tiki/db/tiki-1.9-pgsql.sql,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- tiki-1.9-pgsql.sql 5 May 2004 13:55:08 -0000 1.18 +++ tiki-1.9-pgsql.sql 1 Jun 2004 12:11:10 -0000 1.19 @@ -3218,6 +3218,8 @@ -- -------------------------------------------------------- -- Tables for TikiSheet +DROP TABLE "tiki_sheet_layout"; + CREATE TABLE "tiki_sheet_layout" ( "sheetId" integer NOT NULL default '0', "begin" bigint NOT NULL default '0', @@ -3230,6 +3232,8 @@ CREATE UNIQUE INDEX "tiki_sheet_layout_sheetId" ON "tiki_sheet_layout"("sheetId","begin"); +DROP TABLE "tiki_sheet_values"; + CREATE TABLE "tiki_sheet_values" ( "sheetId" integer NOT NULL default '0', "begin" bigint NOT NULL default '0', @@ -3247,6 +3251,8 @@ CREATE INDEX "tiki_sheet_values_sheetId_2" ON "tiki_sheet_values"("sheetId","rowIndex","columnIndex"); CREATE UNIQUE INDEX "tiki_sheet_values_sheetId" ON "tiki_sheet_values"("sheetId","begin","rowIndex","columnIndex"); +DROP TABLE "tiki_sheets"; + CREATE TABLE "tiki_sheets" ( "sheetId" serial, "title" varchar(200) NOT NULL default '', @@ -3291,6 +3297,23 @@ -- -------------------------------------------------------- -- +-- Table structure for table `tiki_structure_versions` +-- +-- Creation: Jul 03, 2003 at 07:42 PM +-- Last update: Jul 03, 2003 at 07:42 PM +-- + +DROP TABLE "tiki_structure_versions"; + +CREATE TABLE "tiki_structure_versions" ( + "structure_id" bigserial, + "version" bigint default NULL, + PRIMARY KEY ("structure_id") +) ; + +-- -------------------------------------------------------- + +-- -- Table structure for table `tiki_structures` -- -- Creation: Jul 03, 2003 at 07:42 PM @@ -3301,8 +3324,10 @@ CREATE TABLE "tiki_structures" ( "page_ref_id" bigserial, + "structure_id" bigint NOT NULL, "parent_id" bigint default NULL, "page_id" bigint NOT NULL, + "page_version" integer default NULL, "page_alias" varchar(240) NOT NULL default '', "pos" smallint default NULL, PRIMARY KEY ("page_ref_id") @@ -5060,6 +5085,8 @@ INSERT INTO "tiki_preferences" ("name","value") VALUES ('feature_wiki_allowhtml','n'); +INSERT INTO "tiki_preferences" ("name","value") VALUES ('feature_wiki_open_as_structure','n'); + INSERT INTO "tiki_preferences" ("name","value") VALUES ('feature_wiki_attachments','n'); INSERT INTO "tiki_preferences" ("name","value") VALUES ('feature_wiki_comments','n'); @@ -5184,7 +5211,7 @@ INSERT INTO "tiki_preferences" ("name","value") VALUES ('https_prefix','/'); -INSERT INTO "tiki_preferences" ("name","value") VALUES ('image_galleries_comments_default_orderin','points_desc'); +INSERT INTO "tiki_preferences" ("name","value") VALUES ('image_galleries_comments_default_order','points_desc'); INSERT INTO "tiki_preferences" ("name","value") VALUES ('image_galleries_comments_per_page','10'); @@ -5432,6 +5459,12 @@ INSERT INTO "tiki_preferences" ("name","value") VALUES ('feature_homework','n'); +INSERT INTO "tiki_preferences" ("name","value") VALUES ('feature_detect_language','n'); + +INSERT INTO "tiki_preferences" ("name","value") VALUES ('available_languages','a:0:{}'); + +INSERT INTO "tiki_preferences" ("name","value") VALUES ('available_styles','a:0:{}'); + -- Dynamic variables INSERT INTO "users_permissions" ("permName","permDesc","level","type") VALUES ('tiki_p_edit_dynvar', 'Can edit dynamic variables', 'editors', 'wiki'); Index: tiki-1.9-sqlite.sql =================================================================== RCS file: /cvsroot/tikiwiki/tiki/db/tiki-1.9-sqlite.sql,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- tiki-1.9-sqlite.sql 5 May 2004 13:55:08 -0000 1.18 +++ tiki-1.9-sqlite.sql 1 Jun 2004 12:11:10 -0000 1.19 @@ -3218,6 +3218,8 @@ -- -------------------------------------------------------- -- Tables for TikiSheet +DROP TABLE "tiki_sheet_layout"; + CREATE TABLE "tiki_sheet_layout" ( "sheetId" integer NOT NULL default '0', "begin" bigint NOT NULL default '0', @@ -3230,6 +3232,8 @@ CREATE UNIQUE INDEX "tiki_sheet_layout_sheetId" ON "tiki_sheet_layout"("sheetId","begin"); +DROP TABLE "tiki_sheet_values"; + CREATE TABLE "tiki_sheet_values" ( "sheetId" integer NOT NULL default '0', "begin" bigint NOT NULL default '0', @@ -3247,6 +3251,8 @@ CREATE INDEX "tiki_sheet_values_sheetId_2" ON "tiki_sheet_values"("sheetId","rowIndex","columnIndex"); CREATE UNIQUE INDEX "tiki_sheet_values_sheetId" ON "tiki_sheet_values"("sheetId","begin","rowIndex","columnIndex"); +DROP TABLE "tiki_sheets"; + CREATE TABLE "tiki_sheets" ( "sheetId" serial, "title" varchar(200) NOT NULL default '', @@ -3291,6 +3297,23 @@ -- -------------------------------------------------------- -- +-- Table structure for table `tiki_structure_versions` +-- +-- Creation: Jul 03, 2003 at 07:42 PM +-- Last update: Jul 03, 2003 at 07:42 PM +-- + +DROP TABLE "tiki_structure_versions"; + +CREATE TABLE "tiki_structure_versions" ( + "structure_id" bigserial, + "version" bigint default NULL, + PRIMARY KEY ("structure_id") +) ; + +-- -------------------------------------------------------- + +-- -- Table structure for table `tiki_structures` -- -- Creation: Jul 03, 2003 at 07:42 PM @@ -3301,8 +3324,10 @@ CREATE TABLE "tiki_structures" ( "page_ref_id" bigserial, + "structure_id" bigint NOT NULL, "parent_id" bigint default NULL, "page_id" bigint NOT NULL, + "page_version" integer default NULL, "page_alias" varchar(240) NOT NULL default '', "pos" smallint default NULL, PRIMARY KEY ("page_ref_id") @@ -5060,6 +5085,8 @@ INSERT INTO "tiki_preferences" ("name","value") VALUES ('feature_wiki_allowhtml','n'); +INSERT INTO "tiki_preferences" ("name","value") VALUES ('feature_wiki_open_as_structure','n'); + INSERT INTO "tiki_preferences" ("name","value") VALUES ('feature_wiki_attachments','n'); INSERT INTO "tiki_preferences" ("name","value") VALUES ('feature_wiki_comments','n'); @@ -5184,7 +5211,7 @@ INSERT INTO "tiki_preferences" ("name","value") VALUES ('https_prefix','/'); -INSERT INTO "tiki_preferences" ("name","value") VALUES ('image_galleries_comments_default_orderin','points_desc'); +INSERT INTO "tiki_preferences" ("name","value") VALUES ('image_galleries_comments_default_order','points_desc'); INSERT INTO "tiki_preferences" ("name","value") VALUES ('image_galleries_comments_per_page','10'); @@ -5432,6 +5459,12 @@ INSERT INTO "tiki_preferences" ("name","value") VALUES ('feature_homework','n'); +INSERT INTO "tiki_preferences" ("name","value") VALUES ('feature_detect_language','n'); + +INSERT INTO "tiki_preferences" ("name","value") VALUES ('available_languages','a:0:{}'); + +INSERT INTO "tiki_preferences" ("name","value") VALUES ('available_styles','a:0:{}'); + -- Dynamic variables INSERT INTO "users_permissions" ("permName","permDesc","level","type") VALUES ('tiki_p_edit_dynvar', 'Can edit dynamic variables', 'editors', 'wiki'); Index: tiki-1.9-sybase.sql =================================================================== RCS file: /cvsroot/tikiwiki/tiki/db/tiki-1.9-sybase.sql,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- tiki-1.9-sybase.sql 5 May 2004 13:55:08 -0000 1.18 +++ tiki-1.9-sybase.sql 1 Jun 2004 12:11:10 -0000 1.19 @@ -4121,6 +4121,10 @@ -- -------------------------------------------------------- -- Tables for TikiSheet +-- DROP TABLE "tiki_sheet_layout" +go + + CREATE TABLE "tiki_sheet_layout" ( "sheetId" numeric(8,0) default '0' NOT NULL, "begin" numeric(10,0) default '0' NOT NULL, @@ -4136,6 +4140,10 @@ CREATE UNIQUE INDEX "tiki_sheet_layout_sheetId" ON "tiki_sheet_layout"("sheetId","begin") go +-- DROP TABLE "tiki_sheet_values" +go + + CREATE TABLE "tiki_sheet_values" ( "sheetId" numeric(8,0) default '0' NOT NULL, "begin" numeric(10,0) default '0' NOT NULL, @@ -4157,6 +4165,10 @@ CREATE UNIQUE INDEX "tiki_sheet_values_sheetId" ON "tiki_sheet_values"("sheetId","begin","rowIndex","columnIndex") go +-- DROP TABLE "tiki_sheets" +go + + CREATE TABLE "tiki_sheets" ( sheetId numeric(8 ,0) identity, "title" varchar(200) default '' NOT NULL, @@ -4211,6 +4223,27 @@ -- -------------------------------------------------------- -- +-- Table structure for table `tiki_structure_versions` +-- +-- Creation: Jul 03, 2003 at 07:42 PM +-- Last update: Jul 03, 2003 at 07:42 PM +-- + +-- DROP TABLE "tiki_structure_versions" +go + + +CREATE TABLE "tiki_structure_versions" ( +structure_id numeric(14 ,0) identity, + "version" numeric(14,0) default NULL NULL, + PRIMARY KEY ("structure_id") +) +go + + +-- -------------------------------------------------------- + +-- -- Table structure for table `tiki_structures` -- -- Creation: Jul 03, 2003 at 07:42 PM @@ -4223,8 +4256,10 @@ CREATE TABLE "tiki_structures" ( page_ref_id numeric(14 ,0) identity, + "structure_id" numeric(14,0) NOT NULL, "parent_id" numeric(14,0) default NULL NULL, "page_id" numeric(14,0) NOT NULL, + "page_version" numeric(8,0) default NULL NULL, "page_alias" varchar(240) default '' NOT NULL, "pos" numeric(4,0) default NULL NULL, PRIMARY KEY ("page_ref_id") @@ -6863,6 +6898,10 @@ go +INSERT INTO "tiki_preferences" ("name","value") VALUES ('feature_wiki_open_as_structure','n') +go + + INSERT INTO "tiki_preferences" ("name","value") VALUES ('feature_wiki_attachments','n') go @@ -7111,7 +7150,7 @@ go -INSERT INTO "tiki_preferences" ("name","value") VALUES ('image_galleries_comments_default_orderin','points_desc') +INSERT INTO "tiki_preferences" ("name","value") VALUES ('image_galleries_comments_default_order','points_desc') go @@ -7607,6 +7646,18 @@ go +INSERT INTO "tiki_preferences" ("name","value") VALUES ('feature_detect_language','n') +go + + +INSERT INTO "tiki_preferences" ("name","value") VALUES ('available_languages','a:0:{}') +go + + +INSERT INTO "tiki_preferences" ("name","value") VALUES ('available_styles','a:0:{}') +go + + -- Dynamic variables INSERT INTO "users_permissions" ("permName","permDesc","level","type") VALUES ('tiki_p_edit_dynvar', 'Can edit dynamic variables', 'editors', 'wiki') |