[exo-jcr-commits] exo-jcr SVN: r1572 - jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage.

do-not-reply at jboss.org do-not-reply at jboss.org
Mon Jan 25 09:46:57 EST 2010


Author: pnedonosko
Date: 2010-01-25 09:46:56 -0500 (Mon, 25 Jan 2010)
New Revision: 1572

Modified:
   jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.derby.sql
   jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mssql.sql
   jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.pgsql.sql
   jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sybase.sql
   jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2.sql
   jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2v8.sql
   jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.derby.sql
   jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mssql.sql
   jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-utf8.sql
   jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql.sql
   jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sql
Log:
EXOJCR-432 fix of SQL scripts

Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.derby.sql
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.derby.sql	2010-01-25 11:44:10 UTC (rev 1571)
+++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.derby.sql	2010-01-25 14:46:56 UTC (rev 1572)
@@ -1,40 +1,31 @@
 CREATE TABLE JCR_MCONTAINER(
-  	VERSION VARCHAR(96) NOT NULL,
-	CONSTRAINT JCR_PK_CONTAINER PRIMARY KEY(VERSION)
+  VERSION VARCHAR(96) NOT NULL,
+  CONSTRAINT JCR_PK_MCONTAINER PRIMARY KEY(VERSION)
 );
 CREATE TABLE JCR_MITEM(
 	ID VARCHAR(96) NOT NULL,
-	VERSION INTEGER NOT NULL,
-	PATH VARCHAR(4096) NOT NULL,
-	CONSTRAINT JCR_PK_MITEM PRIMARY KEY(ID)
-);
-CREATE UNIQUE INDEX JCR_IDX_MITEM_PATH ON JCR_MITEM(PATH, ID, VERSION DESC);
-CREATE TABLE JCR_MNODE(
-	ID VARCHAR(96) NOT NULL,
-	ORDER_NUM INTEGER,
-	PARENT_ID VARCHAR(96),
-	CONSTRAINT JCR_PK_MNODE PRIMARY KEY(ID),
-	CONSTRAINT JCR_FK_MNODE_PARENT FOREIGN KEY(PARENT_ID) REFERENCES JCR_MNODE(ID), 
-	CONSTRAINT JCR_FK_MNODE_ITEM FOREIGN KEY(ID) REFERENCES JCR_MITEM(ID)
-);
-CREATE UNIQUE INDEX JCR_IDX_MNODE_PARENTID ON JCR_MNODE(PARENT_ID, ID, ORDER_NUM);
-CREATE TABLE JCR_MPROPERTY(
-	ID VARCHAR(96) NOT NULL,
-	TYPE INTEGER NOT NULL,
 	PARENT_ID VARCHAR(96) NOT NULL,
-	MULTIVALUED INTEGER NOT NULL,
-	CONSTRAINT JCR_PK_MPROPERTY PRIMARY KEY(ID),
-	CONSTRAINT JCR_FK_MPROPERTY_NODE FOREIGN KEY(PARENT_ID) REFERENCES JCR_MNODE(ID), 
-	CONSTRAINT JCR_FK_MPROPERTY_ITEM FOREIGN KEY(ID) REFERENCES JCR_MITEM(ID) 
-	);
-CREATE UNIQUE INDEX JCR_IDX_MPROPERTY_PARENTID ON JCR_MPROPERTY(PARENT_ID, ID);
+	NAME VARCHAR(512) NOT NULL,
+	VERSION INTEGER NOT NULL, 
+	I_CLASS INTEGER NOT NULL,
+	I_INDEX INTEGER NOT NULL,
+	N_ORDER_NUM INTEGER,
+	P_TYPE INTEGER, 
+	P_MULTIVALUED INTEGER,	
+	CONSTRAINT JCR_PK_MITEM PRIMARY KEY(ID),
+	CONSTRAINT JCR_FK_MITEM_PARENT FOREIGN KEY(PARENT_ID) REFERENCES JCR_MITEM(ID)
+);
+CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT ON JCR_MITEM(PARENT_ID, NAME, I_INDEX, I_CLASS, VERSION DESC);
+CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_NAME ON JCR_MITEM(I_CLASS, PARENT_ID, NAME, I_INDEX, VERSION DESC);
+CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_ID ON JCR_MITEM(I_CLASS, PARENT_ID, ID, VERSION DESC);
 CREATE TABLE JCR_MVALUE(
 	ID BIGINT generated by default as identity (START WITH 2, INCREMENT BY 1) NOT NULL, 
-    DATA BLOB(56M) NOT NULL, 
-	ORDER_NUM INTEGER,
+	DATA BLOB(56M),
+	ORDER_NUM INTEGER NOT NULL, 
 	PROPERTY_ID VARCHAR(96) NOT NULL,
+	STORAGE_DESC VARCHAR(512),
 	CONSTRAINT JCR_PK_MVALUE PRIMARY KEY(ID),
-	CONSTRAINT JCR_FK_MVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_MPROPERTY(ID)
+	CONSTRAINT JCR_FK_MVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_MITEM(ID)
 );
 CREATE UNIQUE INDEX JCR_IDX_MVALUE_PROPERTY ON JCR_MVALUE(PROPERTY_ID, ORDER_NUM);
 CREATE TABLE JCR_MREF(

Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mssql.sql
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mssql.sql	2010-01-25 11:44:10 UTC (rev 1571)
+++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mssql.sql	2010-01-25 14:46:56 UTC (rev 1572)
@@ -1,6 +1,6 @@
 CREATE TABLE JCR_MCONTAINER(
-  	VERSION VARCHAR(96) NOT NULL,
-	CONSTRAINT JCR_PK_MCONTAINER PRIMARY KEY(VERSION)
+  VERSION VARCHAR(96) NOT NULL,
+  CONSTRAINT JCR_PK_MCONTAINER PRIMARY KEY(VERSION)
 );
 CREATE TABLE JCR_MITEM(
 	ID VARCHAR(96) NOT NULL,
@@ -25,7 +25,7 @@
     PROPERTY_ID VARCHAR(96) NOT NULL,
 	STORAGE_DESC VARCHAR(512),
 	CONSTRAINT JCR_PK_MVALUE PRIMARY KEY(ID),
-    CONSTRAINT JCR_FK_MVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_MPROPERTY(ID)
+    CONSTRAINT JCR_FK_MVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_MITEM(ID)
 );
 CREATE UNIQUE INDEX JCR_IDX_MVALUE_PROPERTY ON JCR_MVALUE(PROPERTY_ID, ORDER_NUM);
 CREATE TABLE JCR_MREF(

Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.pgsql.sql
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.pgsql.sql	2010-01-25 11:44:10 UTC (rev 1571)
+++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.pgsql.sql	2010-01-25 14:46:56 UTC (rev 1572)
@@ -1,6 +1,6 @@
 CREATE TABLE JCR_MCONTAINER(
-  	VERSION VARCHAR(96) NOT NULL,
-  	CONSTRAINT JCR_PK_MCONTAINER PRIMARY KEY(VERSION)
+  VERSION VARCHAR(96) NOT NULL,
+  CONSTRAINT JCR_PK_MCONTAINER PRIMARY KEY(VERSION)
 );
 CREATE TABLE JCR_MITEM(
 	ID VARCHAR(96) NOT NULL,
@@ -14,7 +14,7 @@
 	P_MULTIVALUED BOOLEAN,	
 	CONSTRAINT JCR_PK_MITEM PRIMARY KEY(ID),	
 	CONSTRAINT JCR_FK_MITEM_PARENT FOREIGN KEY(PARENT_ID) REFERENCES JCR_MITEM(ID)
-	);
+);
 CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT ON JCR_MITEM(PARENT_ID, NAME, I_INDEX, I_CLASS, VERSION);
 CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_NAME ON JCR_MITEM(I_CLASS, PARENT_ID, NAME, I_INDEX, VERSION);
 CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_ID ON JCR_MITEM(I_CLASS, PARENT_ID, ID, VERSION);
@@ -26,12 +26,12 @@
 	STORAGE_DESC VARCHAR(512),
 	CONSTRAINT JCR_PK_MVALUE PRIMARY KEY(ID),
 	CONSTRAINT JCR_FK_MVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_MITEM(ID)
-	);
+);
 CREATE UNIQUE INDEX JCR_IDX_MVALUE_PROPERTY ON JCR_MVALUE(PROPERTY_ID, ORDER_NUM);
 CREATE TABLE JCR_MREF(
-    NODE_ID VARCHAR(96) NOT NULL, 
-    PROPERTY_ID VARCHAR(96) NOT NULL,
-    ORDER_NUM INTEGER NOT NULL,
-    CONSTRAINT JCR_PK_MREF PRIMARY KEY(NODE_ID, PROPERTY_ID, ORDER_NUM)
-	);
+  NODE_ID VARCHAR(96) NOT NULL, 
+  PROPERTY_ID VARCHAR(96) NOT NULL,
+  ORDER_NUM INTEGER NOT NULL,
+  CONSTRAINT JCR_PK_MREF PRIMARY KEY(NODE_ID, PROPERTY_ID, ORDER_NUM)
+);
 CREATE UNIQUE INDEX JCR_IDX_MREF_PROPERTY ON JCR_MREF(PROPERTY_ID, ORDER_NUM);
\ No newline at end of file

Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sybase.sql
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sybase.sql	2010-01-25 11:44:10 UTC (rev 1571)
+++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sybase.sql	2010-01-25 14:46:56 UTC (rev 1572)
@@ -39,45 +39,39 @@
 */
 
 CREATE TABLE JCR_MCONTAINER(
-  VERSION VARCHAR(255) NOT NULL PRIMARY KEY
-  );
+  VERSION VARCHAR(96) NOT NULL,
+	CONSTRAINT JCR_PK_MCONTAINER PRIMARY KEY(VERSION)
+);
 CREATE TABLE JCR_MITEM(
-	ID VARCHAR(255) NOT NULL PRIMARY KEY, 
+	ID VARCHAR(96) NOT NULL,
+	PARENT_ID VARCHAR(96) NOT NULL,
+	NAME VARCHAR(512) NOT NULL,
 	VERSION INT NOT NULL, 
-	PATH VARCHAR(1024) NOT NULL
-	);
-CREATE INDEX JCR_IDX_MITEM_IDPATH ON JCR_MITEM(ID, SUBSTRING(PATH, 1, 345));
-CREATE TABLE JCR_MNODE(
-	ID VARCHAR(255) NOT NULL PRIMARY KEY, 
-	ORDER_NUM INTEGER NULL, 
-	PARENT_ID VARCHAR(255) NULL, 
-	CONSTRAINT JCR_FK_MNODE_PARENT FOREIGN KEY(PARENT_ID) REFERENCES JCR_MNODE(ID), 
-	CONSTRAINT JCR_FK_MNODE_ITEM FOREIGN KEY(ID) REFERENCES JCR_MITEM(ID)
-	);
-CREATE INDEX JCR_IDX_MNODE_PARENT ON JCR_MNODE(ID, PARENT_ID, ORDER_NUM);
-CREATE TABLE JCR_MPROPERTY(
-	ID VARCHAR(255) NOT NULL PRIMARY KEY,
-	TYPE INT NOT NULL, 
-	PARENT_ID VARCHAR(255) NOT NULL, 
-	MULTIVALUED INT NOT NULL, 
-	CONSTRAINT JCR_FK_MPROPERTY_NODE FOREIGN KEY(PARENT_ID) REFERENCES JCR_MNODE(ID), 
-	CONSTRAINT JCR_FK_MPROPERTY_ITEM FOREIGN KEY(ID) REFERENCES JCR_MITEM(ID) 
-	);
-CREATE INDEX JCR_IDX_MPROPERTY_PARENT ON JCR_MPROPERTY(ID, PARENT_ID);
-CREATE INDEX JCR_IDX_MPROPERTY_TYPE ON JCR_MPROPERTY(ID, TYPE);
+	I_CLASS INT NOT NULL,
+	I_INDEX INT NOT NULL,
+	N_ORDER_NUM INT,
+	P_TYPE INT, 
+	P_MULTIVALUED INT,	
+	CONSTRAINT JCR_PK_MITEM PRIMARY KEY(ID),
+	CONSTRAINT JCR_FK_MITEM_PARENT FOREIGN KEY(PARENT_ID) REFERENCES JCR_MITEM(ID)
+);
+CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT ON JCR_MITEM(PARENT_ID, NAME, I_INDEX, I_CLASS, VERSION DESC);
+CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_NAME ON JCR_MITEM(I_CLASS, PARENT_ID, NAME, I_INDEX, VERSION DESC);
+CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_ID ON JCR_MITEM(I_CLASS, PARENT_ID, ID, VERSION DESC);
 CREATE TABLE JCR_MVALUE(
-	ID BIGINT IDENTITY NOT NULL PRIMARY KEY, 
-	DATA VARBINARY(255) NOT NULL, 
-	ORDER_NUM INT NULL, 
-	PROPERTY_ID VARCHAR(255) NOT NULL, 
-	CONSTRAINT JCR_FK_MVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_MPROPERTY(ID)
-	);
-CREATE INDEX JCR_IDX_MVALUE_PROPERTY ON JCR_MVALUE(PROPERTY_ID, ORDER_NUM);	
-CREATE INDEX JCR_IDX_MVALUE_DATA ON JCR_MVALUE(PROPERTY_ID, DATA);
-CREATE TABLE JCR_SREF(
-  NODE_ID VARCHAR(255) NOT NULL, 
-  PROPERTY_ID VARCHAR(255) NOT NULL,
-  ORDER_NUM INTEGER NOT NULL,
-  CONSTRAINT JCR_PK_SREF PRIMARY KEY(NODE_ID, PROPERTY_ID, ORDER_NUM)
+    ID BIGINT IDENTITY NOT NULL, 
+	DATA VARBINARY(255),
+    ORDER_NUM INT NOT NULL,
+    PROPERTY_ID VARCHAR(96) NOT NULL,
+	STORAGE_DESC VARCHAR(512),
+	CONSTRAINT JCR_PK_MVALUE PRIMARY KEY(ID),
+    CONSTRAINT JCR_FK_MVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_MITEM(ID)
 );
-CREATE UNIQUE INDEX JCR_IDX_SREF_PROPERTY ON JCR_SREF(PROPERTY_ID, ORDER_NUM);
\ No newline at end of file
+CREATE UNIQUE INDEX JCR_IDX_MVALUE_PROPERTY ON JCR_MVALUE(PROPERTY_ID, ORDER_NUM);
+CREATE TABLE JCR_MREF(
+  NODE_ID VARCHAR(96) NOT NULL,
+  PROPERTY_ID VARCHAR(96) NOT NULL,
+  ORDER_NUM INT NOT NULL,
+  CONSTRAINT JCR_PK_MREF PRIMARY KEY(NODE_ID, PROPERTY_ID, ORDER_NUM)
+);
+CREATE UNIQUE INDEX JCR_IDX_MREF_PROPERTY ON JCR_MREF(PROPERTY_ID, ORDER_NUM);
\ No newline at end of file

Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2.sql
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2.sql	2010-01-25 11:44:10 UTC (rev 1571)
+++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2.sql	2010-01-25 14:46:56 UTC (rev 1572)
@@ -16,9 +16,9 @@
 	CONSTRAINT JCR_PK_SITEM PRIMARY KEY(ID),
 	CONSTRAINT JCR_FK_SITEM_PAREN FOREIGN KEY(PARENT_ID) REFERENCES JCR_SITEM(ID)
 );
-CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT ON JCR_SITEM(CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, I_CLASS, VERSION);
-CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_NAME ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, VERSION);
-CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION);
+CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT ON JCR_SITEM(CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, I_CLASS, VERSION DESC);
+CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_NAME ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, VERSION DESC);
+CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION DESC);
 CREATE INDEX JCR_IDX_SITEM_PARENT_FK ON JCR_SITEM(PARENT_ID);
 CREATE TABLE JCR_SVALUE(
 	ID BIGINT generated by default as identity (START WITH 2, INCREMENT BY 1) NOT NULL, 
@@ -31,9 +31,9 @@
 );
 CREATE UNIQUE INDEX JCR_IDX_SVALUE_PROPERTY ON JCR_SVALUE(PROPERTY_ID, ORDER_NUM);
 CREATE TABLE JCR_SREF(
-    NODE_ID VARCHAR(96) NOT NULL,
-    PROPERTY_ID VARCHAR(96) NOT NULL,
-    ORDER_NUM INTEGER NOT NULL,
-    CONSTRAINT JCR_PK_SREF PRIMARY KEY(NODE_ID, PROPERTY_ID, ORDER_NUM)
+  NODE_ID VARCHAR(96) NOT NULL,
+  PROPERTY_ID VARCHAR(96) NOT NULL,
+  ORDER_NUM INTEGER NOT NULL,
+  CONSTRAINT JCR_PK_SREF PRIMARY KEY(NODE_ID, PROPERTY_ID, ORDER_NUM)
 );
 CREATE UNIQUE INDEX JCR_IDX_SREF_PROPERTY ON JCR_SREF(PROPERTY_ID, ORDER_NUM);
\ No newline at end of file

Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2v8.sql
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2v8.sql	2010-01-25 11:44:10 UTC (rev 1571)
+++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2v8.sql	2010-01-25 14:46:56 UTC (rev 1572)
@@ -16,9 +16,9 @@
 	CONSTRAINT JCR_PK_SITEM PRIMARY KEY(ID),
 	CONSTRAINT JCR_FK_SITEM_PAREN FOREIGN KEY(PARENT_ID) REFERENCES JCR_SITEM(ID)
 );
-CREATE UNIQUE INDEX JCR_IDX_SITEM_P ON JCR_SITEM(CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, I_CLASS, VERSION);
-CREATE UNIQUE INDEX JCR_IDX_SITEM_PN ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, VERSION);
-CREATE UNIQUE INDEX JCR_IDX_SITEM_PID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION);
+CREATE UNIQUE INDEX JCR_IDX_SITEM_P ON JCR_SITEM(CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, I_CLASS, VERSION DESC);
+CREATE UNIQUE INDEX JCR_IDX_SITEM_PN ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, VERSION DESC);
+CREATE UNIQUE INDEX JCR_IDX_SITEM_PID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION DESC);
 CREATE INDEX JCR_IDX_SITEM_PFK ON JCR_SITEM(PARENT_ID);
 CREATE TABLE JCR_SVALUE(
 	ID BIGINT generated by default as identity (START WITH 2, INCREMENT BY 1) NOT NULL, 
@@ -31,9 +31,9 @@
 );
 CREATE UNIQUE INDEX JCR_IDX_SVALUE_P ON JCR_SVALUE(PROPERTY_ID, ORDER_NUM);
 CREATE TABLE JCR_SREF(
-    NODE_ID VARCHAR(96) NOT NULL,
-    PROPERTY_ID VARCHAR(96) NOT NULL,
-    ORDER_NUM INTEGER NOT NULL,
-    CONSTRAINT JCR_PK_SREF PRIMARY KEY(NODE_ID, PROPERTY_ID, ORDER_NUM)
+  NODE_ID VARCHAR(96) NOT NULL,
+  PROPERTY_ID VARCHAR(96) NOT NULL,
+  ORDER_NUM INTEGER NOT NULL,
+  CONSTRAINT JCR_PK_SREF PRIMARY KEY(NODE_ID, PROPERTY_ID, ORDER_NUM)
 );
 CREATE UNIQUE INDEX JCR_IDX_SREF_P ON JCR_SREF(PROPERTY_ID, ORDER_NUM);
\ No newline at end of file

Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.derby.sql
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.derby.sql	2010-01-25 11:44:10 UTC (rev 1571)
+++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.derby.sql	2010-01-25 14:46:56 UTC (rev 1572)
@@ -16,9 +16,9 @@
 	CONSTRAINT JCR_PK_SITEM PRIMARY KEY(ID),
 	CONSTRAINT JCR_FK_SITEM_PARENT FOREIGN KEY(PARENT_ID) REFERENCES JCR_SITEM(ID)
 );
-CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT ON JCR_SITEM(CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, I_CLASS, VERSION);
-CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_NAME ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, VERSION);
-CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION);
+CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT ON JCR_SITEM(CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, I_CLASS, VERSION DESC);
+CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_NAME ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, VERSION DESC);
+CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION DESC);
 CREATE TABLE JCR_SVALUE(
 	ID BIGINT generated by default as identity (START WITH 2, INCREMENT BY 1) NOT NULL, 
 	DATA BLOB(56M),

Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mssql.sql
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mssql.sql	2010-01-25 11:44:10 UTC (rev 1571)
+++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mssql.sql	2010-01-25 14:46:56 UTC (rev 1572)
@@ -16,9 +16,9 @@
 	CONSTRAINT JCR_PK_SITEM PRIMARY KEY(ID),
 	CONSTRAINT JCR_FK_SITEM_PARENT FOREIGN KEY(PARENT_ID) REFERENCES JCR_SITEM(ID)
 );
-CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT ON JCR_SITEM(CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, I_CLASS, VERSION);
-CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_NAME ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, VERSION);
-CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION);
+CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT ON JCR_SITEM(CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, I_CLASS, VERSION DESC);
+CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_NAME ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, VERSION DESC);
+CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION DESC);
 CREATE TABLE JCR_SVALUE(
     ID BIGINT IDENTITY(1,1) NOT NULL,
     DATA VARBINARY(MAX),
@@ -30,9 +30,9 @@
 );
 CREATE UNIQUE INDEX JCR_IDX_SVALUE_PROPERTY ON JCR_SVALUE(PROPERTY_ID, ORDER_NUM);
 CREATE TABLE JCR_SREF(
-  	NODE_ID VARCHAR(96) NOT NULL,
-  	PROPERTY_ID VARCHAR(96) NOT NULL,
-  	ORDER_NUM INTEGER NOT NULL,
-  	CONSTRAINT JCR_PK_SREF PRIMARY KEY(NODE_ID, PROPERTY_ID, ORDER_NUM)
+  NODE_ID VARCHAR(96) NOT NULL,
+  PROPERTY_ID VARCHAR(96) NOT NULL,
+  ORDER_NUM INTEGER NOT NULL,
+  CONSTRAINT JCR_PK_SREF PRIMARY KEY(NODE_ID, PROPERTY_ID, ORDER_NUM)
 );
 CREATE UNIQUE INDEX JCR_IDX_SREF_PROPERTY ON JCR_SREF(PROPERTY_ID, ORDER_NUM);
\ No newline at end of file

Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-utf8.sql
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-utf8.sql	2010-01-25 11:44:10 UTC (rev 1571)
+++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-utf8.sql	2010-01-25 14:46:56 UTC (rev 1572)
@@ -16,9 +16,9 @@
 	CONSTRAINT JCR_PK_SITEM PRIMARY KEY(ID),
 	CONSTRAINT JCR_FK_SITEM_PARENT FOREIGN KEY(PARENT_ID) REFERENCES JCR_SITEM(ID)
 );
-CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT ON JCR_SITEM(CONTAINER_NAME, PARENT_ID, NAME(300), I_INDEX, I_CLASS, VERSION);
-CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_NAME ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, NAME(300), I_INDEX, VERSION);
-CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION);
+CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT ON JCR_SITEM(CONTAINER_NAME, PARENT_ID, NAME(300), I_INDEX, I_CLASS, VERSION DESC);
+CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_NAME ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, NAME(300), I_INDEX, VERSION DESC);
+CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION DESC);
 CREATE TABLE JCR_SVALUE(
 	ID SERIAL NOT NULL, 
 	DATA LONGBLOB,

Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql.sql
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql.sql	2010-01-25 11:44:10 UTC (rev 1571)
+++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql.sql	2010-01-25 14:46:56 UTC (rev 1572)
@@ -16,9 +16,9 @@
 	CONSTRAINT JCR_PK_SITEM PRIMARY KEY(ID),
 	CONSTRAINT JCR_FK_SITEM_PARENT FOREIGN KEY(PARENT_ID) REFERENCES JCR_SITEM(ID)
 );
-CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT ON JCR_SITEM(CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, I_CLASS, VERSION);
-CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_NAME ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, VERSION);
-CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION);
+CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT ON JCR_SITEM(CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, I_CLASS, VERSION DESC);
+CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_NAME ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, VERSION DESC);
+CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION DESC);
 CREATE TABLE JCR_SVALUE(
 	ID SERIAL NOT NULL, 
 	DATA LONGBLOB,

Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sql
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sql	2010-01-25 11:44:10 UTC (rev 1571)
+++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sql	2010-01-25 14:46:56 UTC (rev 1572)
@@ -1,5 +1,5 @@
 CREATE TABLE JCR_SCONTAINER(
-  	VERSION VARCHAR(96) NOT NULL,
+  VERSION VARCHAR(96) NOT NULL,
 	CONSTRAINT JCR_PK_SCONTAINER PRIMARY KEY(VERSION)	
 );
 CREATE TABLE JCR_SITEM(
@@ -16,9 +16,9 @@
 	CONSTRAINT JCR_PK_SITEM PRIMARY KEY(ID),
 	CONSTRAINT JCR_FK_SITEM_PARENT FOREIGN KEY(PARENT_ID) REFERENCES JCR_SITEM(ID)
 );
-CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT ON JCR_SITEM(CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, I_CLASS, VERSION);
-CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_NAME ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, VERSION);
-CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION);
+CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT ON JCR_SITEM(CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, I_CLASS, VERSION DESC);
+CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_NAME ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, VERSION DESC);
+CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION DESC);
 CREATE TABLE JCR_SVALUE(
 	ID BIGINT generated by default as identity (START WITH 2, INCREMENT BY 1) NOT NULL, 
 	DATA VARBINARY(65535),



More information about the exo-jcr-commits mailing list