Menu
▾
▴
[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[22093] branches/proposed
|
From: <pk...@us...> - 2009-10-07 19:47:01
|
Revision: 22093
http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=22093&view=rev
Author: pkdille
Date: 2009-10-07 19:46:50 +0000 (Wed, 07 Oct 2009)
Log Message:
-----------
[FIX] database structure homogenization for a fresh 3.x installation and for a 2.x to 3.x upgraded tiki.
Modified Paths:
--------------
branches/proposed/db/tiki-3.2-mysql.sql
branches/proposed/db/tiki-3.2-mysqli.sql
branches/proposed/db/tiki-3.2-oci8.sql
branches/proposed/db/tiki-3.2-pgsql.sql
branches/proposed/db/tiki-3.2-sqlite.sql
branches/proposed/db/tiki-3.2-sybase.sql
branches/proposed/db/tiki.sql
Added Paths:
-----------
branches/proposed/installer/schema/20091007_update_database_structure_tiki.sql
Modified: branches/proposed/db/tiki-3.2-mysql.sql
===================================================================
--- branches/proposed/db/tiki-3.2-mysql.sql 2009-10-07 19:11:54 UTC (rev 22092)
+++ branches/proposed/db/tiki-3.2-mysql.sql 2009-10-07 19:46:50 UTC (rev 22093)
@@ -3223,6 +3223,7 @@
tagicon varchar(255) default NULL,
tagcategory varchar(255) default NULL,
PRIMARY KEY (tagId),
+ UNIQUE KEY `no_repeats` (`taglabel`(50),`taginsert`(50),`tagicon`(100),`tagcategory`(50)),
KEY tagcategory (tagcategory),
KEY taglabel (taglabel)
) ENGINE=MyISAM AUTO_INCREMENT=1 ;
@@ -3633,7 +3634,7 @@
`version` int(8) NOT NULL,
`source_translation_bit` int(10) NULL,
`original_translation_bit` int(10) NULL,
- `flags` SET('critical') NULL DEFAULT '',
+ `flags` SET('critical') DEFAULT NULL,
PRIMARY KEY (`translation_bit_id`),
KEY(`page_id`),
KEY(`original_translation_bit`),
@@ -3737,7 +3738,7 @@
objectType varchar( 20 ) NOT NULL default '',
objectId varchar(10) NOT NULL default '',
displayEachuser char( 1 ) default NULL ,
- PRIMARY KEY ( objectType,objectId )
+ PRIMARY KEY ( `groupName`, `objectType`, `objectId` )
) ENGINE=MyISAM ;
DROP TABLE IF EXISTS `tiki_sent_newsletters_files`;
Modified: branches/proposed/db/tiki-3.2-mysqli.sql
===================================================================
--- branches/proposed/db/tiki-3.2-mysqli.sql 2009-10-07 19:11:54 UTC (rev 22092)
+++ branches/proposed/db/tiki-3.2-mysqli.sql 2009-10-07 19:46:50 UTC (rev 22093)
@@ -3223,6 +3223,7 @@
tagicon varchar(255) default NULL,
tagcategory varchar(255) default NULL,
PRIMARY KEY (tagId),
+ UNIQUE KEY `no_repeats` (`taglabel`(50),`taginsert`(50),`tagicon`(100),`tagcategory`(50)),
KEY tagcategory (tagcategory),
KEY taglabel (taglabel)
) ENGINE=MyISAM AUTO_INCREMENT=1 ;
@@ -3633,7 +3634,7 @@
`version` int(8) NOT NULL,
`source_translation_bit` int(10) NULL,
`original_translation_bit` int(10) NULL,
- `flags` SET('critical') NULL DEFAULT '',
+ `flags` SET('critical') DEFAULT NULL,
PRIMARY KEY (`translation_bit_id`),
KEY(`page_id`),
KEY(`original_translation_bit`),
@@ -3737,7 +3738,7 @@
objectType varchar( 20 ) NOT NULL default '',
objectId varchar(10) NOT NULL default '',
displayEachuser char( 1 ) default NULL ,
- PRIMARY KEY ( objectType,objectId )
+ PRIMARY KEY ( `groupName`, `objectType`, `objectId` )
) ENGINE=MyISAM ;
DROP TABLE IF EXISTS `tiki_sent_newsletters_files`;
Modified: branches/proposed/db/tiki-3.2-oci8.sql
===================================================================
--- branches/proposed/db/tiki-3.2-oci8.sql 2009-10-07 19:11:54 UTC (rev 22092)
+++ branches/proposed/db/tiki-3.2-oci8.sql 2009-10-07 19:46:50 UTC (rev 22093)
@@ -4727,7 +4727,8 @@
"taginsert" clob,
"tagicon" varchar(255) default NULL,
"tagcategory" varchar(255) default NULL,
- PRIMARY KEY (tagId)
+ PRIMARY KEY (tagId),
+ UNIQUE KEY `no_repeats` (`taglabel`(50),`taginsert`(50),`tagicon`(100),`tagcategory`(50))
) ENGINE=MyISAM ;
CREATE TRIGGER "tiki_quicktags_trig" BEFORE INSERT ON "tiki_quicktags" REFERENCING NEW AS NEW OLD AS OLD FOR EACH ROW
@@ -5438,7 +5439,7 @@
`version` number(8) NOT NULL,
`source_translation_bit` number(10) NULL,
`original_translation_bit` number(10) NULL,
- `flags` SET('critical') NULL DEFAULT '',
+ `flags` SET('critical') DEFAULT NULL,
PRIMARY KEY (`translation_bit_id`),
KEY(`page_id`),
KEY(`original_translation_bit`),
@@ -5560,7 +5561,7 @@
"objectType" varchar( 20 ) default '' NOT NULL,
"objectId" varchar(10) default '' NOT NULL,
"displayEachuser" char( 1 ) default NULL ,
- PRIMARY KEY ( objectType,objectId )
+ PRIMARY KEY ( `groupName`, `objectType`, `objectId` )
) ENGINE=MyISAM ;
Modified: branches/proposed/db/tiki-3.2-pgsql.sql
===================================================================
--- branches/proposed/db/tiki-3.2-pgsql.sql 2009-10-07 19:11:54 UTC (rev 22092)
+++ branches/proposed/db/tiki-3.2-pgsql.sql 2009-10-07 19:46:50 UTC (rev 22093)
@@ -4077,6 +4077,7 @@
CREATE INDEX "tiki_quicktags_tagcategory" ON "tiki_quicktags"("tagcategory");
CREATE INDEX "tiki_quicktags_taglabel" ON "tiki_quicktags"("taglabel");
+CREATE UNIQUE INDEX "tiki_quicktags_no_repeats" ON "tiki_quicktags"(substr("taglabel", 0, 50)substr("taginsert", 0, 50)substr("tagicon", 0, 100)substr("tagcategory", 0, 50));
-- wiki
INSERT INTO "tiki_quicktags" ("taglabel","taginsert","tagicon","tagcategory") VALUES (' text, bold','__text__','pics/icons/text_bold.png','wiki');
@@ -4748,7 +4749,7 @@
"version" integer NOT NULL,
"source_translation_bit" bigint NULL,
"original_translation_bit" bigint NULL,
- "flags" SET('critical') NULL DEFAULT '',
+ "flags" SET('critical') DEFAULT NULL,
PRIMARY KEY ("translation_bit_id"),
KEY(page_id),
KEY(original_translation_bit),
@@ -4871,7 +4872,7 @@
"objectType" varchar( 20 ) NOT NULL default '',
"objectId" varchar(10) NOT NULL default '',
"displayEachuser" char( 1 ) default NULL ,
- PRIMARY KEY ("objectType","objectId")
+ PRIMARY KEY ("groupName","objectType","objectId")
) ENGINE=MyISAM ;
Modified: branches/proposed/db/tiki-3.2-sqlite.sql
===================================================================
--- branches/proposed/db/tiki-3.2-sqlite.sql 2009-10-07 19:11:54 UTC (rev 22092)
+++ branches/proposed/db/tiki-3.2-sqlite.sql 2009-10-07 19:46:50 UTC (rev 22093)
@@ -4084,7 +4084,8 @@
"taginsert" text,
"tagicon" varchar(255) default NULL,
"tagcategory" varchar(255) default NULL,
- PRIMARY KEY (tagId)
+ PRIMARY KEY (tagId),
+ UNIQUE KEY no_repeats (taglabel(50),taginsert(50),tagicon(100),tagcategory(50))
) ENGINE=MyISAM ;
CREATE INDEX "tiki_quicktags_tagcategory" ON "tiki_quicktags"("tagcategory");
@@ -4760,7 +4761,7 @@
version integer NOT NULL,
source_translation_bit bigint NULL,
original_translation_bit bigint NULL,
- flags SET('critical') NULL DEFAULT '',
+ flags SET('critical') DEFAULT NULL,
PRIMARY KEY (translation_bit_id),
KEY(page_id),
KEY(original_translation_bit),
@@ -4883,7 +4884,7 @@
"objectType" varchar( 20 ) NOT NULL default '',
"objectId" varchar(10) NOT NULL default '',
"displayEachuser" char( 1 ) default NULL ,
- PRIMARY KEY ( objectType,objectId )
+ PRIMARY KEY ( groupName, objectType, objectId )
) ENGINE=MyISAM ;
Modified: branches/proposed/db/tiki-3.2-sybase.sql
===================================================================
--- branches/proposed/db/tiki-3.2-sybase.sql 2009-10-07 19:11:54 UTC (rev 22092)
+++ branches/proposed/db/tiki-3.2-sybase.sql 2009-10-07 19:46:50 UTC (rev 22093)
@@ -5920,7 +5920,8 @@
"taginsert" text default '',
"tagicon" varchar(255) default NULL NULL,
"tagcategory" varchar(255) default NULL NULL,
- PRIMARY KEY (tagId)
+ PRIMARY KEY (tagId),
+ UNIQUE KEY `no_repeats` (`taglabel`(50),`taginsert`(50),`tagicon`(100),`tagcategory`(50))
) ENGINE=MyISAM
go
@@ -7130,7 +7131,7 @@
`version` numeric(8,0) NOT NULL,
`source_translation_bit` numeric(10,0) NULL,
`original_translation_bit` numeric(10,0) NULL,
- `flags` SET('critical') NULL DEFAULT '',
+ `flags` SET('critical') DEFAULT NULL NULL,
PRIMARY KEY (`translation_bit_id`),
KEY(`page_id`),
KEY(`original_translation_bit`),
@@ -7291,7 +7292,7 @@
"objectType" varchar( 20 ) default '' NOT NULL,
"objectId" varchar(10) default '' NOT NULL,
"displayEachuser" char( 1 ) default NULL NULL ,
- PRIMARY KEY ( objectType,objectId )
+ PRIMARY KEY ( `groupName`, `objectType`, `objectId` )
) ENGINE=MyISAM
go
Modified: branches/proposed/db/tiki.sql
===================================================================
--- branches/proposed/db/tiki.sql 2009-10-07 19:11:54 UTC (rev 22092)
+++ branches/proposed/db/tiki.sql 2009-10-07 19:46:50 UTC (rev 22093)
@@ -3223,6 +3223,7 @@
tagicon varchar(255) default NULL,
tagcategory varchar(255) default NULL,
PRIMARY KEY (tagId),
+ UNIQUE KEY `no_repeats` (`taglabel`(50),`taginsert`(50),`tagicon`(100),`tagcategory`(50)),
KEY tagcategory (tagcategory),
KEY taglabel (taglabel)
) ENGINE=MyISAM AUTO_INCREMENT=1 ;
@@ -3633,7 +3634,7 @@
`version` int(8) NOT NULL,
`source_translation_bit` int(10) NULL,
`original_translation_bit` int(10) NULL,
- `flags` SET('critical') NULL DEFAULT '',
+ `flags` SET('critical') DEFAULT NULL,
PRIMARY KEY (`translation_bit_id`),
KEY(`page_id`),
KEY(`original_translation_bit`),
@@ -3737,7 +3738,7 @@
objectType varchar( 20 ) NOT NULL default '',
objectId varchar(10) NOT NULL default '',
displayEachuser char( 1 ) default NULL ,
- PRIMARY KEY ( objectType,objectId )
+ PRIMARY KEY ( `groupName`, `objectType`, `objectId` )
) ENGINE=MyISAM ;
DROP TABLE IF EXISTS `tiki_sent_newsletters_files`;
Added: branches/proposed/installer/schema/20091007_update_database_structure_tiki.sql
===================================================================
--- branches/proposed/installer/schema/20091007_update_database_structure_tiki.sql (rev 0)
+++ branches/proposed/installer/schema/20091007_update_database_structure_tiki.sql 2009-10-07 19:46:50 UTC (rev 22093)
@@ -0,0 +1,5 @@
+#pkdille 2009-10-05
+
+ALTER TABLE `tiki_feature` CHANGE `keyword` `keyword` VARCHAR( 30 ) DEFAULT NULL;
+ALTER TABLE `tiki_user_votings` CHANGE `time` `time` INT( 14 ) NOT NULL DEFAULT '0';
+ALTER TABLE `tiki_sefurl_regex_out` DROP KEY `left`;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|