Author: ate
Date: Wed Nov 16 08:22:53 2005
New Revision: 345049
URL: http://svn.apache.org/viewcvs?rev=345049&view=rev
Log:
- added missing VERSION columns
- made FRAGMENT.PAGE_ID nullable like defined in the schema definition
- commented out the UNIQUE constraint on FRAGMENT.PAGE_ID as Derby doesn't
support it on nullable columns !!!!
I'm not yet sure derby schema is fully in sync with our current schema
definitions but at least the
testcases don't fail anymore now.
Modified:
portals/jetspeed-2/trunk/etc/sql/derby/schema/phase2-schema.sql
Modified: portals/jetspeed-2/trunk/etc/sql/derby/schema/phase2-schema.sql
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/sql/derby/schema/phase2-schema.sql?rev=345049&r1=345048&r2=345049&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/sql/derby/schema/phase2-schema.sql (original)
+++ portals/jetspeed-2/trunk/etc/sql/derby/schema/phase2-schema.sql Wed Nov 16
08:22:53 2005
@@ -91,6 +91,7 @@
PARENT_ID INTEGER NOT NULL,
PATH VARCHAR(240) NOT NULL,
NAME VARCHAR(80) NOT NULL,
+ VERSION VARCHAR (40),
TITLE VARCHAR(100),
SHORT_TITLE VARCHAR(40),
IS_HIDDEN INTEGER NOT NULL,
@@ -174,7 +175,7 @@
(
FRAGMENT_ID INTEGER NOT NULL,
PARENT_ID INTEGER,
- PAGE_ID INTEGER NOT NULL,
+ PAGE_ID INTEGER,
NAME VARCHAR(100),
TITLE VARCHAR(100),
SHORT_TITLE VARCHAR(40),
@@ -196,8 +197,10 @@
,
FOREIGN KEY (PAGE_ID) REFERENCES PAGE (PAGE_ID)
ON DELETE CASCADE
- ,
- UNIQUE (PAGE_ID));
+
+-- Derby doesn't support UNIQUE constraints on nullable columns !!!
+--, UNIQUE (PAGE_ID)
+ );
CREATE INDEX IX_FRAGMENT_1 ON FRAGMENT (PARENT_ID);
-----------------------------------------------------------------------------
@@ -245,6 +248,7 @@
PARENT_ID INTEGER NOT NULL,
PATH VARCHAR(240) NOT NULL,
NAME VARCHAR(80) NOT NULL,
+ VERSION VARCHAR(40),
SUBSITE VARCHAR(40),
USER_PRINCIPAL VARCHAR(40),
ROLE_PRINCIPAL VARCHAR(40),
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
