[exo-jcr-commits] exo-jcr SVN: r2495 - jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage.

do-not-reply at jboss.org do-not-reply at jboss.org
Tue Jun 8 02:39:07 EDT 2010


Author: pnedonosko
Date: 2010-06-08 02:39:06 -0400 (Tue, 08 Jun 2010)
New Revision: 2495

Modified:
   jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.db2.sql
   jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.db2v8.sql
   jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.derby.sql
   jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.h2.sql
   jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ingres.sql
   jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mssql.sql
   jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql-utf8.sql
   jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql.sql
   jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ora-analyze.sql
   jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ora.sql
   jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.pgsql.sql
   jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sql
   jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sybase.sql
   jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2.sql
   jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2v8.sql
   jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.derby.sql
   jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.h2.sql
   jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ingres.sql
   jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mssql.sql
   jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-utf8.sql
   jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql.sql
   jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ora-analyze.sql
   jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ora.sql
   jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.pgsql.sql
   jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sql
   jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sybase.sql
Log:
EXOJCR-606: revert ID column removal from SQL scripts of JDBC data container

Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.db2.sql
===================================================================
--- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.db2.sql	2010-06-04 14:51:34 UTC (rev 2494)
+++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.db2.sql	2010-06-08 06:39:06 UTC (rev 2495)
@@ -19,11 +19,12 @@
 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(2G) NOT LOGGED COMPACT, 
 	ORDER_NUM INTEGER NOT NULL, 
 	PROPERTY_ID VARCHAR(96) NOT NULL,
 	STORAGE_DESC VARCHAR(512),
-	CONSTRAINT JCR_PK_MVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM),
+	CONSTRAINT JCR_PK_MVALUE PRIMARY KEY(ID),
 	CONSTRAINT JCR_FK_MVALUE_PROP FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_MITEM(ID)
 );
 CREATE UNIQUE INDEX JCR_IDX_MVALUE_PROPERTY ON JCR_MVALUE(PROPERTY_ID, ORDER_NUM);

Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.db2v8.sql
===================================================================
--- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.db2v8.sql	2010-06-04 14:51:34 UTC (rev 2494)
+++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.db2v8.sql	2010-06-08 06:39:06 UTC (rev 2495)
@@ -19,11 +19,12 @@
 CREATE UNIQUE INDEX JCR_IDX_MITEM_P ON JCR_MITEM(I_CLASS, PARENT_ID, NAME, I_INDEX, VERSION DESC);
 CREATE UNIQUE INDEX JCR_IDX_MITEM_PID 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(2G) NOT LOGGED COMPACT, 
 	ORDER_NUM INTEGER NOT NULL, 
 	PROPERTY_ID VARCHAR(96) NOT NULL,
 	STORAGE_DESC VARCHAR(512),
-	CONSTRAINT JCR_PK_MVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM),
+	CONSTRAINT JCR_PK_MVALUE PRIMARY KEY(ID),
 	CONSTRAINT JCR_FK_MVALUE_PROP FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_MITEM(ID)
 );
 CREATE UNIQUE INDEX JCR_IDX_MVALUE_P ON JCR_MVALUE(PROPERTY_ID, ORDER_NUM);

Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.derby.sql
===================================================================
--- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.derby.sql	2010-06-04 14:51:34 UTC (rev 2494)
+++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.derby.sql	2010-06-08 06:39:06 UTC (rev 2495)
@@ -19,11 +19,12 @@
 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),
 	ORDER_NUM INTEGER NOT NULL, 
 	PROPERTY_ID VARCHAR(96) NOT NULL,
 	STORAGE_DESC VARCHAR(512),
-	CONSTRAINT JCR_PK_MVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM),
+	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);

Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.h2.sql
===================================================================
--- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.h2.sql	2010-06-04 14:51:34 UTC (rev 2494)
+++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.h2.sql	2010-06-08 06:39:06 UTC (rev 2495)
@@ -1,30 +1,29 @@
 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,
-   PARENT_ID VARCHAR(96) NOT NULL,
-   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 BOOLEAN,  
-   CONSTRAINT JCR_PK_MITEM PRIMARY KEY(ID),
-   CONSTRAINT JCR_FK_MITEM_PARENT FOREIGN KEY(PARENT_ID) REFERENCES JCR_MITEM(ID)
+	ID VARCHAR(96) NOT NULL,
+	PARENT_ID VARCHAR(96) NOT NULL,
+	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 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 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(
-   DATA VARBINARY(65535), 
-   ORDER_NUM INTEGER NOT NULL, 
-   PROPERTY_ID VARCHAR(96) NOT NULL,
-   STORAGE_DESC VARCHAR(512),
-   CONSTRAINT JCR_PK_MVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM),
-   CONSTRAINT JCR_FK_MVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_MITEM(ID)
+	DATA VARBINARY(65535), 
+	ORDER_NUM INTEGER NOT NULL, 
+	PROPERTY_ID VARCHAR(96) NOT NULL,
+	STORAGE_DESC VARCHAR(512),
+	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/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ingres.sql
===================================================================
--- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ingres.sql	2010-06-04 14:51:34 UTC (rev 2494)
+++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ingres.sql	2010-06-08 06:39:06 UTC (rev 2495)
@@ -18,12 +18,14 @@
 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 SEQUENCE JCR_MVALUE_SEQ;
 CREATE TABLE JCR_MVALUE(
+	ID BIGINT NOT NULL WITH DEFAULT NEXT VALUE FOR JCR_MVALUE_SEQ, 
 	DATA LONG BYTE, 
 	ORDER_NUM INTEGER NOT NULL, 
 	PROPERTY_ID VARCHAR(96) NOT NULL,
 	STORAGE_DESC VARCHAR(512),
-	CONSTRAINT JCR_PK_MVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM),
+	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);

Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mssql.sql
===================================================================
--- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mssql.sql	2010-06-04 14:51:34 UTC (rev 2494)
+++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mssql.sql	2010-06-08 06:39:06 UTC (rev 2495)
@@ -19,11 +19,12 @@
 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(1,1) NOT NULL,
     DATA VARBINARY(MAX),
     ORDER_NUM INTEGER NOT NULL,
     PROPERTY_ID VARCHAR(96) NOT NULL,
 	STORAGE_DESC VARCHAR(512),
-	CONSTRAINT JCR_PK_MVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM),
+	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);

Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql-utf8.sql
===================================================================
--- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql-utf8.sql	2010-06-04 14:51:34 UTC (rev 2494)
+++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql-utf8.sql	2010-06-08 06:39:06 UTC (rev 2495)
@@ -20,11 +20,12 @@
 CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_ID ON JCR_MITEM(I_CLASS, PARENT_ID, ID, VERSION DESC);
 CREATE INDEX JCR_IDX_MITEM_PARENT_N_ORDER_NUM ON JCR_MITEM(I_CLASS, PARENT_ID, N_ORDER_NUM, ID);
 CREATE TABLE JCR_MVALUE(
+	ID SERIAL NOT NULL, 
 	DATA LONGBLOB, 
 	ORDER_NUM INTEGER NOT NULL, 
 	PROPERTY_ID VARCHAR(56) NOT NULL,
 	STORAGE_DESC VARCHAR(512),
-	CONSTRAINT JCR_PK_MVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM),
+	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);

Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql.sql
===================================================================
--- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql.sql	2010-06-04 14:51:34 UTC (rev 2494)
+++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql.sql	2010-06-08 06:39:06 UTC (rev 2495)
@@ -20,11 +20,12 @@
 CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_ID ON JCR_MITEM(I_CLASS, PARENT_ID, ID, VERSION DESC);
 CREATE INDEX JCR_IDX_MITEM_PARENT_N_ORDER_NUM ON JCR_MITEM(I_CLASS, PARENT_ID, N_ORDER_NUM, ID);
 CREATE TABLE JCR_MVALUE(
+	ID SERIAL NOT NULL, 
 	DATA LONGBLOB, 
 	ORDER_NUM INTEGER NOT NULL, 
 	PROPERTY_ID VARCHAR(96) NOT NULL,
 	STORAGE_DESC VARCHAR(512),
-	CONSTRAINT JCR_PK_MVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM),
+	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);

Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ora-analyze.sql
===================================================================
--- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ora-analyze.sql	2010-06-04 14:51:34 UTC (rev 2494)
+++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ora-analyze.sql	2010-06-08 06:39:06 UTC (rev 2495)
@@ -27,14 +27,26 @@
 CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_ID ON JCR_MITEM(I_CLASS, PARENT_ID, ID, VERSION DESC)
 /
 CREATE TABLE JCR_MVALUE(
+	ID INTEGER NOT NULL, 
 	DATA BLOB, 
 	ORDER_NUM INTEGER NOT NULL, 
 	PROPERTY_ID VARCHAR(96) NOT NULL,
 	STORAGE_DESC VARCHAR(512),
-	CONSTRAINT JCR_PK_MVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM),
+	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 sequence JCR_MVALUE_SEQ
+/
+CREATE OR REPLACE trigger BI_JCR_MVALUE
+  before insert on JCR_MVALUE
+  for each row
+begin
+  SELECT JCR_MVALUE_SEQ.nextval INTO :NEW.ID FROM dual;
+end;
+/
 CREATE TABLE JCR_MREF(
   NODE_ID VARCHAR(96) NOT NULL,
   PROPERTY_ID VARCHAR(96) NOT NULL,

Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ora.sql
===================================================================
--- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ora.sql	2010-06-04 14:51:34 UTC (rev 2494)
+++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ora.sql	2010-06-08 06:39:06 UTC (rev 2495)
@@ -27,14 +27,26 @@
 CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_ID ON JCR_MITEM(I_CLASS, PARENT_ID, ID, VERSION DESC)
 /
 CREATE TABLE JCR_MVALUE(
+	ID INTEGER NOT NULL, 
 	DATA BLOB, 
 	ORDER_NUM INTEGER NOT NULL, 
 	PROPERTY_ID VARCHAR(96) NOT NULL,
 	STORAGE_DESC VARCHAR(512),
-	CONSTRAINT JCR_PK_MVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM),
+	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 sequence JCR_MVALUE_SEQ
+/
+CREATE OR REPLACE trigger BI_JCR_MVALUE
+  before insert on JCR_MVALUE
+  for each row
+begin
+  SELECT JCR_MVALUE_SEQ.nextval INTO :NEW.ID FROM dual;
+end;
+/
 CREATE TABLE JCR_MREF(
   NODE_ID VARCHAR(96) NOT NULL,
   PROPERTY_ID VARCHAR(96) NOT NULL,

Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.pgsql.sql
===================================================================
--- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.pgsql.sql	2010-06-04 14:51:34 UTC (rev 2494)
+++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.pgsql.sql	2010-06-08 06:39:06 UTC (rev 2495)
@@ -19,11 +19,12 @@
 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);
 CREATE TABLE JCR_MVALUE(
+	ID BIGSERIAL NOT NULL, 
 	DATA BYTEA,
 	ORDER_NUM INTEGER NOT NULL,
 	PROPERTY_ID VARCHAR(96) NOT NULL,
 	STORAGE_DESC VARCHAR(512),
-	CONSTRAINT JCR_PK_MVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM),
+	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);

Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sql
===================================================================
--- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sql	2010-06-04 14:51:34 UTC (rev 2494)
+++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sql	2010-06-08 06:39:06 UTC (rev 2495)
@@ -19,11 +19,12 @@
 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 VARBINARY(65535), 
 	ORDER_NUM INTEGER NOT NULL, 
 	PROPERTY_ID VARCHAR(96) NOT NULL,
 	STORAGE_DESC VARCHAR(512),
-	CONSTRAINT JCR_PK_MVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM),
+	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);

Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sybase.sql
===================================================================
--- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sybase.sql	2010-06-04 14:51:34 UTC (rev 2494)
+++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sybase.sql	2010-06-08 06:39:06 UTC (rev 2495)
@@ -19,11 +19,12 @@
 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, 
 	DATA IMAGE NULL,
     ORDER_NUM INT NOT NULL,
     PROPERTY_ID VARCHAR(96) NOT NULL,
 	STORAGE_DESC VARCHAR(512) NULL,
-	CONSTRAINT JCR_PK_MVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM),
+	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);

Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2.sql
===================================================================
--- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2.sql	2010-06-04 14:51:34 UTC (rev 2494)
+++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2.sql	2010-06-08 06:39:06 UTC (rev 2495)
@@ -21,11 +21,12 @@
 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, 
 	DATA BLOB(2G) NOT LOGGED COMPACT,
 	ORDER_NUM INTEGER NOT NULL,
 	PROPERTY_ID VARCHAR(96) NOT NULL,
 	STORAGE_DESC VARCHAR(512),
-	CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM),
+	CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(ID),
 	CONSTRAINT JCR_FK_SVALUE_PROP FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_SITEM(ID)
 );
 CREATE UNIQUE INDEX JCR_IDX_SVALUE_PROPERTY ON JCR_SVALUE(PROPERTY_ID, ORDER_NUM);

Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2v8.sql
===================================================================
--- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2v8.sql	2010-06-04 14:51:34 UTC (rev 2494)
+++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2v8.sql	2010-06-08 06:39:06 UTC (rev 2495)
@@ -21,11 +21,12 @@
 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, 
 	DATA BLOB(2G) NOT LOGGED COMPACT,
 	ORDER_NUM INTEGER NOT NULL,
 	PROPERTY_ID VARCHAR(96) NOT NULL,
 	STORAGE_DESC VARCHAR(512),
-	CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM),
+	CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(ID),
 	CONSTRAINT JCR_FK_SVALUE_PROP FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_SITEM(ID)
 );
 CREATE UNIQUE INDEX JCR_IDX_SVALUE_P ON JCR_SVALUE(PROPERTY_ID, ORDER_NUM);

Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.derby.sql
===================================================================
--- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.derby.sql	2010-06-04 14:51:34 UTC (rev 2494)
+++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.derby.sql	2010-06-08 06:39:06 UTC (rev 2495)
@@ -20,11 +20,12 @@
 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),
 	ORDER_NUM INTEGER NOT NULL,
 	PROPERTY_ID VARCHAR(96) NOT NULL,
 	STORAGE_DESC VARCHAR(512),
-	CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM),
+	CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(ID),
 	CONSTRAINT JCR_FK_SVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_SITEM(ID)
 );
 CREATE UNIQUE INDEX JCR_IDX_SVALUE_PROPERTY ON JCR_SVALUE(PROPERTY_ID, ORDER_NUM);

Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.h2.sql
===================================================================
--- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.h2.sql	2010-06-04 14:51:34 UTC (rev 2494)
+++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.h2.sql	2010-06-08 06:39:06 UTC (rev 2495)
@@ -1,31 +1,30 @@
 CREATE TABLE JCR_SCONTAINER(
   VERSION VARCHAR(96) NOT NULL,
-   CONSTRAINT JCR_PK_SCONTAINER PRIMARY KEY(VERSION)  
+	CONSTRAINT JCR_PK_SCONTAINER PRIMARY KEY(VERSION)	
 );
 CREATE TABLE JCR_SITEM(
-   ID VARCHAR(96) NOT NULL,
-   PARENT_ID VARCHAR(96) NOT NULL,
-   NAME VARCHAR(512) NOT NULL,
-   VERSION INTEGER NOT NULL,
-   CONTAINER_NAME VARCHAR(96) 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_SITEM PRIMARY KEY(ID),
-   CONSTRAINT JCR_FK_SITEM_PARENT FOREIGN KEY(PARENT_ID) REFERENCES JCR_SITEM(ID)
+	ID VARCHAR(96) NOT NULL,
+	PARENT_ID VARCHAR(96) NOT NULL,
+	NAME VARCHAR(512) NOT NULL,
+	VERSION INTEGER NOT NULL,
+	CONTAINER_NAME VARCHAR(96) 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_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 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(
-   DATA VARBINARY(65535),
-   ORDER_NUM INTEGER NOT NULL,
-   PROPERTY_ID VARCHAR(96) NOT NULL,
-   STORAGE_DESC VARCHAR(512),
-   CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM),
-   CONSTRAINT JCR_FK_SVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_SITEM(ID)
+	DATA VARBINARY(65535),
+	ORDER_NUM INTEGER NOT NULL,
+	PROPERTY_ID VARCHAR(96) NOT NULL,
+	STORAGE_DESC VARCHAR(512),
+	CONSTRAINT JCR_FK_SVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_SITEM(ID)
 );
 CREATE UNIQUE INDEX JCR_IDX_SVALUE_PROPERTY ON JCR_SVALUE(PROPERTY_ID, ORDER_NUM);
 CREATE TABLE JCR_SREF(

Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ingres.sql
===================================================================
--- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ingres.sql	2010-06-04 14:51:34 UTC (rev 2494)
+++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ingres.sql	2010-06-08 06:39:06 UTC (rev 2495)
@@ -20,12 +20,14 @@
 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 INDEX JCR_IDX_SITEM_PARENT_FK ON JCR_SITEM(PARENT_ID);
+CREATE SEQUENCE JCR_SVALUE_SEQ;
 CREATE TABLE JCR_SVALUE(
+	ID BIGINT NOT NULL WITH DEFAULT NEXT VALUE FOR JCR_SVALUE_SEQ, 
 	DATA LONG BYTE,
 	ORDER_NUM INTEGER NOT NULL,
 	PROPERTY_ID VARCHAR(96) NOT NULL,
 	STORAGE_DESC VARCHAR(512),
-	CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM),
+	CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(ID),
 	CONSTRAINT JCR_FK_SVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_SITEM(ID)
 );
 CREATE UNIQUE INDEX JCR_IDX_SVALUE_PROPERTY ON JCR_SVALUE(PROPERTY_ID, ORDER_NUM);

Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mssql.sql
===================================================================
--- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mssql.sql	2010-06-04 14:51:34 UTC (rev 2494)
+++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mssql.sql	2010-06-08 06:39:06 UTC (rev 2495)
@@ -20,11 +20,12 @@
 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),
     ORDER_NUM INTEGER NOT NULL,
     PROPERTY_ID VARCHAR(96) NOT NULL,
 	STORAGE_DESC VARCHAR(512),
-	CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM),
+	CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(ID),
 	CONSTRAINT JCR_FK_SVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_SITEM(ID)
 );
 CREATE UNIQUE INDEX JCR_IDX_SVALUE_PROPERTY ON JCR_SVALUE(PROPERTY_ID, ORDER_NUM);

Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-utf8.sql
===================================================================
--- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-utf8.sql	2010-06-04 14:51:34 UTC (rev 2494)
+++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-utf8.sql	2010-06-08 06:39:06 UTC (rev 2495)
@@ -21,11 +21,12 @@
 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_N_ORDER_NUM ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, N_ORDER_NUM, ID);
 CREATE TABLE JCR_SVALUE(
+	ID SERIAL NOT NULL, 
 	DATA LONGBLOB,
 	ORDER_NUM INTEGER NOT NULL,
 	PROPERTY_ID VARCHAR(56) NOT NULL,
 	STORAGE_DESC VARCHAR(512),
-	CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM),
+	CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(ID),
 	CONSTRAINT JCR_FK_SVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_SITEM(ID)
 );
 CREATE UNIQUE INDEX JCR_IDX_SVALUE_PROPERTY ON JCR_SVALUE(PROPERTY_ID, ORDER_NUM);

Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql.sql
===================================================================
--- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql.sql	2010-06-04 14:51:34 UTC (rev 2494)
+++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql.sql	2010-06-08 06:39:06 UTC (rev 2495)
@@ -21,11 +21,12 @@
 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_N_ORDER_NUM ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, N_ORDER_NUM, ID);
 CREATE TABLE JCR_SVALUE(
+	ID SERIAL NOT NULL, 
 	DATA LONGBLOB,
 	ORDER_NUM INTEGER NOT NULL,
 	PROPERTY_ID VARCHAR(96) NOT NULL,
 	STORAGE_DESC VARCHAR(512),
-	CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM),
+	CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(ID),
 	CONSTRAINT JCR_FK_SVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_SITEM(ID)
 );
 CREATE UNIQUE INDEX JCR_IDX_SVALUE_PROPERTY ON JCR_SVALUE(PROPERTY_ID, ORDER_NUM);

Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ora-analyze.sql
===================================================================
--- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ora-analyze.sql	2010-06-04 14:51:34 UTC (rev 2494)
+++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ora-analyze.sql	2010-06-08 06:39:06 UTC (rev 2495)
@@ -28,14 +28,26 @@
 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 INTEGER NOT NULL, 
 	DATA BLOB, 
 	ORDER_NUM INTEGER NOT NULL, 
 	PROPERTY_ID VARCHAR(96) NOT NULL,
 	STORAGE_DESC VARCHAR(512),
-	CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM),
+	CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(ID),
 	CONSTRAINT JCR_FK_SVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_SITEM(ID)
 	)
 /
+CREATE UNIQUE INDEX JCR_IDX_SVALUE_PROPERTY ON JCR_SVALUE(PROPERTY_ID, ORDER_NUM)
+/
+CREATE sequence JCR_SVALUE_SEQ
+/
+CREATE OR REPLACE trigger BI_JCR_SVALUE
+  before insert on JCR_SVALUE
+  for each row
+begin
+  SELECT JCR_SVALUE_SEQ.nextval INTO :NEW.ID FROM dual;
+end;
+/
 CREATE TABLE JCR_SREF(
   NODE_ID VARCHAR(96) NOT NULL,
   PROPERTY_ID VARCHAR(96) NOT NULL,

Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ora.sql
===================================================================
--- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ora.sql	2010-06-04 14:51:34 UTC (rev 2494)
+++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ora.sql	2010-06-08 06:39:06 UTC (rev 2495)
@@ -28,14 +28,26 @@
 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 INTEGER NOT NULL, 
 	DATA BLOB, 
 	ORDER_NUM INTEGER NOT NULL, 
 	PROPERTY_ID VARCHAR(96) NOT NULL,
 	STORAGE_DESC VARCHAR(512),
-	CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM),
+	CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(ID),
 	CONSTRAINT JCR_FK_SVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_SITEM(ID)
 	)
 /
+CREATE UNIQUE INDEX JCR_IDX_SVALUE_PROPERTY ON JCR_SVALUE(PROPERTY_ID, ORDER_NUM)
+/
+CREATE sequence JCR_SVALUE_SEQ
+/
+CREATE OR REPLACE trigger BI_JCR_SVALUE
+  before insert on JCR_SVALUE
+  for each row
+begin
+  SELECT JCR_SVALUE_SEQ.nextval INTO :NEW.ID FROM dual;
+end;
+/
 CREATE TABLE JCR_SREF(
   NODE_ID VARCHAR(96) NOT NULL,
   PROPERTY_ID VARCHAR(96) NOT NULL,

Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.pgsql.sql
===================================================================
--- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.pgsql.sql	2010-06-04 14:51:34 UTC (rev 2494)
+++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.pgsql.sql	2010-06-08 06:39:06 UTC (rev 2495)
@@ -21,11 +21,12 @@
 CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION);
 CREATE INDEX JCR_IDX_SITEM_PARENT_FK ON JCR_SITEM(PARENT_ID);
 CREATE TABLE JCR_SVALUE(
+	ID BIGSERIAL NOT NULL, 
 	DATA BYTEA,
 	ORDER_NUM INTEGER NOT NULL,
 	PROPERTY_ID VARCHAR(96) NOT NULL,
 	STORAGE_DESC VARCHAR(512),
-	CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM),
+	CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(ID),
 	CONSTRAINT JCR_FK_SVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_SITEM(ID)
 );
 CREATE UNIQUE INDEX JCR_IDX_SVALUE_PROPERTY ON JCR_SVALUE(PROPERTY_ID, ORDER_NUM);

Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sql
===================================================================
--- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sql	2010-06-04 14:51:34 UTC (rev 2494)
+++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sql	2010-06-08 06:39:06 UTC (rev 2495)
@@ -20,11 +20,12 @@
 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),
 	ORDER_NUM INTEGER NOT NULL,
 	PROPERTY_ID VARCHAR(96) NOT NULL,
 	STORAGE_DESC VARCHAR(512),
-	CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM),
+	CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(ID),
 	CONSTRAINT JCR_FK_SVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_SITEM(ID)
 );
 CREATE UNIQUE INDEX JCR_IDX_SVALUE_PROPERTY ON JCR_SVALUE(PROPERTY_ID, ORDER_NUM);

Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sybase.sql
===================================================================
--- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sybase.sql	2010-06-04 14:51:34 UTC (rev 2494)
+++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sybase.sql	2010-06-08 06:39:06 UTC (rev 2495)
@@ -20,11 +20,12 @@
 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 NOT NULL, 
 	DATA IMAGE NULL,
     ORDER_NUM INT NOT NULL,
     PROPERTY_ID VARCHAR(96) NOT NULL,
 	STORAGE_DESC VARCHAR(512) NULL,
-	CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM),
+	CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(ID),
     CONSTRAINT JCR_FK_SVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_SITEM(ID)
 );
 CREATE UNIQUE INDEX JCR_IDX_SVALUE_PROPERTY ON JCR_SVALUE(PROPERTY_ID, ORDER_NUM);



More information about the exo-jcr-commits mailing list