diff --git a/install/create_tables-innodb.sql b/install/create_tables-innodb.sql index a1c84d598..1b0c031f0 100644 --- a/install/create_tables-innodb.sql +++ b/install/create_tables-innodb.sql @@ -362,6 +362,19 @@ CREATE TABLE `tblDocumentContentAttributes` ( -- -------------------------------------------------------- +-- +-- Table structure for table `tblLinkType` +-- + +CREATE TABLE `tblLinkType` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `name` text NOT NULL, + `color` char(8) DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- -------------------------------------------------------- + -- -- Table structure for table `tblDocumentLinks` -- @@ -372,13 +385,15 @@ CREATE TABLE `tblDocumentLinks` ( `target` int(11) NOT NULL DEFAULT '0', `userID` int(11) NOT NULL DEFAULT '0', `public` tinyint(1) NOT NULL DEFAULT '0', + `linktype` int(11) NOT NULL DEFAULT '0', PRIMARY KEY (`id`), KEY `tblDocumentLinks_document` (`document`), KEY `tblDocumentLinks_target` (`target`), KEY `tblDocumentLinks_user` (`userID`), CONSTRAINT `tblDocumentLinks_document` FOREIGN KEY (`document`) REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE, CONSTRAINT `tblDocumentLinks_target` FOREIGN KEY (`target`) REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE, - CONSTRAINT `tblDocumentLinks_user` FOREIGN KEY (`userID`) REFERENCES `tblUsers` (`id`) + CONSTRAINT `tblDocumentLinks_user` FOREIGN KEY (`userID`) REFERENCES `tblUsers` (`id`), + CONSTRAINT `tblDocumentLinks_linktype` FOREIGN KEY (`linktype`) REFERENCES `tblLinkType` (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; -- -------------------------------------------------------- diff --git a/install/create_tables-postgres.sql b/install/create_tables-postgres.sql index 0f5c96912..cad18e75c 100644 --- a/install/create_tables-postgres.sql +++ b/install/create_tables-postgres.sql @@ -305,6 +305,18 @@ CREATE TABLE "tblDocumentContentAttributes" ( -- -------------------------------------------------------- +-- +-- Table structure for table "tblLinkType" +-- + +CREATE TABLE "tblLinkType" ( + "id" SERIAL UNIQUE, + "name" text NOT NULL, + "color" char(8) DEFAULT NULL +); + +-- -------------------------------------------------------- + -- -- Table structure for table "tblDocumentLinks" -- @@ -314,7 +326,8 @@ CREATE TABLE "tblDocumentLinks" ( "document" INTEGER NOT NULL default 0 REFERENCES "tblDocuments" ("id") ON DELETE CASCADE, "target" INTEGER NOT NULL default 0 REFERENCES "tblDocuments" ("id") ON DELETE CASCADE, "userID" INTEGER NOT NULL default 0 REFERENCES "tblUsers" ("id"), - "public" INTEGER NOT NULL default 0 + "public" INTEGER NOT NULL default 0, + "linktype" INTEGER NOT NULL default 0 REFERENCES "tblLinkType" ("id") ) ; -- -------------------------------------------------------- diff --git a/install/create_tables-sqlite3.sql b/install/create_tables-sqlite3.sql index 522fb025c..bde95fe9a 100644 --- a/install/create_tables-sqlite3.sql +++ b/install/create_tables-sqlite3.sql @@ -307,6 +307,18 @@ CREATE TABLE `tblDocumentContentAttributes` ( -- -------------------------------------------------------- +-- +-- Table structure for table `tblLinkType` +-- + +CREATE TABLE `tblLinkType` ( + `id` INTEGER PRIMARY KEY AUTOINCREMENT, + `name` text NOT NULL, + `color` char(8) DEFAULT NULL +) ; + +-- -------------------------------------------------------- + -- -- Table structure for table `tblDocumentLinks` -- @@ -316,7 +328,8 @@ CREATE TABLE `tblDocumentLinks` ( `document` INTEGER NOT NULL default 0 REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE, `target` INTEGER NOT NULL default 0 REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE, `userID` INTEGER NOT NULL default 0 REFERENCES `tblUsers` (`id`), - `public` INTEGER NOT NULL default 0 + `public` INTEGER NOT NULL default 0, + `linktype` INTEGER NOT NULL default 0 REFERENCES `tblLinkType` (`id`) ) ; -- -------------------------------------------------------- diff --git a/install/update-6.1.0/update-postgres.sql b/install/update-6.1.0/update-postgres.sql index 916f13ab3..82bb34b19 100644 --- a/install/update-6.1.0/update-postgres.sql +++ b/install/update-6.1.0/update-postgres.sql @@ -64,7 +64,7 @@ CREATE TABLE "tblLinkType" ( "color" char(8) DEFAULT NULL ); -ALTER TABLE "tblDocumentLinks" ADD COLUMN "linktype" INTEGER DEFAULT NULL REFERENCES tblLinkType("id") ON DELETE CASCADE; +ALTER TABLE "tblDocumentLinks" ADD COLUMN "linktype" INTEGER DEFAULT NULL REFERENCES tblLinkType("id"); UPDATE "tblVersion" set "major"=6, "minor"=1, "subminor"=0, "module"='core'; diff --git a/install/update-6.1.0/update-sqlite3.sql b/install/update-6.1.0/update-sqlite3.sql index 9e0cc7baa..b096c2666 100644 --- a/install/update-6.1.0/update-sqlite3.sql +++ b/install/update-6.1.0/update-sqlite3.sql @@ -110,7 +110,7 @@ CREATE TABLE `tblLinkType` ( `color` char(8) DEFAULT NULL ); -ALTER TABLE `tblDocumentLinks` ADD COLUMN `linktype` INTEGER DEFAULT NULL REFERENCES tblLinkType(`id`) ON DELETE CASCADE; +ALTER TABLE `tblDocumentLinks` ADD COLUMN `linktype` INTEGER DEFAULT NULL REFERENCES tblLinkType(`id`); UPDATE `tblVersion` set `major`=6, `minor`=1, `subminor`=0, `module`='core'; diff --git a/install/update-6.1.0/update.sql b/install/update-6.1.0/update.sql index 165d29741..c378150c3 100644 --- a/install/update-6.1.0/update.sql +++ b/install/update-6.1.0/update.sql @@ -74,7 +74,7 @@ CREATE TABLE `tblLinkType` ( PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; -ALTER TABLE `tblDocumentLinks` ADD COLUMN `linktype` int(11) DEFAULT NULL, ADD FOREIGN KEY tblDocumentLinks_linktype(`linktype`) REFERENCES tblLinkType(`id`) ON DELETE CASCADE; +ALTER TABLE `tblDocumentLinks` ADD COLUMN `linktype` int(11) DEFAULT NULL, ADD FOREIGN KEY tblDocumentLinks_linktype(`linktype`) REFERENCES tblLinkType(`id`); UPDATE `tblVersion` set `major`=6, `minor`=1, `subminor`=0, `module`='core';