knguyen 2005/12/27 10:50:00 CET
Modified files:
core/src/webapp/WEB-INF/var/db/sql/schema/hypersonic
jahia-schema.sql
core/src/webapp/WEB-INF/var/db/sql/schema/mssql
jahia-schema.sql
core/src/webapp/WEB-INF/var/db/sql/schema/mysql
jahia-schema.sql
core/src/webapp/WEB-INF/var/db/sql/schema/mysql-tx
jahia-schema.sql
core/src/webapp/WEB-INF/var/db/sql/schema/postgresql
jahia-schema.sql
Log:
- container definition table has wrong primary key with hibernate mapping
Revision Changes Path
1.17 +2 -2
jahia/core/src/webapp/WEB-INF/var/db/sql/schema/hypersonic/jahia-schema.sql
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/var/db/sql/schema/hypersonic/jahia-schema.sql.diff?r1=1.16&r2=1.17&f=h
1.15 +2 -2
jahia/core/src/webapp/WEB-INF/var/db/sql/schema/mssql/jahia-schema.sql
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/var/db/sql/schema/mssql/jahia-schema.sql.diff?r1=1.14&r2=1.15&f=h
1.4 +2 -2
jahia/core/src/webapp/WEB-INF/var/db/sql/schema/mysql-tx/jahia-schema.sql
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/var/db/sql/schema/mysql-tx/jahia-schema.sql.diff?r1=1.3&r2=1.4&f=h
1.18 +2 -2
jahia/core/src/webapp/WEB-INF/var/db/sql/schema/mysql/jahia-schema.sql
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/var/db/sql/schema/mysql/jahia-schema.sql.diff?r1=1.17&r2=1.18&f=h
1.18 +2 -2
jahia/core/src/webapp/WEB-INF/var/db/sql/schema/postgresql/jahia-schema.sql
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/var/db/sql/schema/postgresql/jahia-schema.sql.diff?r1=1.17&r2=1.18&f=h
Index: jahia-schema.sql
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/var/db/sql/schema/hypersonic/jahia-schema.sql,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- jahia-schema.sql 19 Dec 2005 12:09:48 -0000 1.16
+++ jahia-schema.sql 27 Dec 2005 09:49:58 -0000 1.17
@@ -184,8 +184,8 @@
id_jahia_ctn_def integer,
jahiaid_jahia_ctn_def integer,
name_jahia_ctn_def VARCHAR (250),
- PRIMARY KEY(jahiaid_jahia_ctn_def,name_jahia_ctn_def),
- UNIQUE (id_jahia_ctn_def)
+ PRIMARY KEY(id_jahia_ctn_def),
+ UNIQUE (jahiaid_jahia_ctn_def, name_jahia_ctn_def)
);
CREATE INDEX jahia_ctn_def_index ON jahia_ctn_def (id_jahia_ctn_def);
Index: jahia-schema.sql
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/var/db/sql/schema/mssql/jahia-schema.sql,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jahia-schema.sql 19 Dec 2005 12:09:48 -0000 1.14
+++ jahia-schema.sql 27 Dec 2005 09:49:58 -0000 1.15
@@ -519,8 +519,8 @@
jahiaid_jahia_ctn_def INT NOT NULL,
name_jahia_ctn_def VARCHAR (250) NOT NULL,
- CONSTRAINT jahia_ctn_def_PK PRIMARY
KEY(jahiaid_jahia_ctn_def,name_jahia_ctn_def),
- UNIQUE (id_jahia_ctn_def));
+ CONSTRAINT jahia_ctn_def_PK PRIMARY KEY(id_jahia_ctn_def),
+ UNIQUE (jahiaid_jahia_ctn_def, name_jahia_ctn_def));
CREATE INDEX jahia_ctn_def_index ON jahia_ctn_def (id_jahia_ctn_def);
Index: jahia-schema.sql
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/var/db/sql/schema/mysql/jahia-schema.sql,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- jahia-schema.sql 19 Dec 2005 12:09:49 -0000 1.17
+++ jahia-schema.sql 27 Dec 2005 09:49:58 -0000 1.18
@@ -174,8 +174,8 @@
id_jahia_ctn_def INTEGER NOT NULL,
jahiaid_jahia_ctn_def INTEGER NOT NULL,
name_jahia_ctn_def VARCHAR (250) NOT NULL,
- PRIMARY KEY(jahiaid_jahia_ctn_def,name_jahia_ctn_def),
- UNIQUE (id_jahia_ctn_def),
+ PRIMARY KEY(id_jahia_ctn_def),
+ UNIQUE (jahiaid_jahia_ctn_def, name_jahia_ctn_def),
INDEX jahia_ctn_def_index (id_jahia_ctn_def)
);
Index: jahia-schema.sql
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/var/db/sql/schema/mysql-tx/jahia-schema.sql,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jahia-schema.sql 19 Dec 2005 12:09:49 -0000 1.3
+++ jahia-schema.sql 27 Dec 2005 09:49:59 -0000 1.4
@@ -192,8 +192,8 @@
id_jahia_ctn_def INTEGER NOT NULL,
jahiaid_jahia_ctn_def INTEGER NOT NULL,
name_jahia_ctn_def VARCHAR (250) NOT NULL,
- PRIMARY KEY(jahiaid_jahia_ctn_def,name_jahia_ctn_def),
- UNIQUE (id_jahia_ctn_def),
+ PRIMARY KEY(id_jahia_ctn_def),
+ UNIQUE (jahiaid_jahia_ctn_def, name_jahia_ctn_def),
INDEX jahia_ctn_def_index (id_jahia_ctn_def)
);
Index: jahia-schema.sql
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/var/db/sql/schema/postgresql/jahia-schema.sql,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- jahia-schema.sql 19 Dec 2005 12:09:50 -0000 1.17
+++ jahia-schema.sql 27 Dec 2005 09:49:59 -0000 1.18
@@ -197,8 +197,8 @@
id_jahia_ctn_def integer NOT NULL,
jahiaid_jahia_ctn_def integer NOT NULL,
name_jahia_ctn_def varchar (250) NOT
NULL,
- PRIMARY KEY (jahiaid_jahia_ctn_def,name_jahia_ctn_def),
- CONSTRAINT jahia_ctn_def_U_2 UNIQUE (id_jahia_ctn_def)
+ PRIMARY KEY (id_jahia_ctn_def),
+ CONSTRAINT jahia_ctn_def_U_2 UNIQUE (jahiaid_jahia_ctn_def,
name_jahia_ctn_def)
);
CREATE INDEX jahia_ctn_def_index ON jahia_ctn_def (id_jahia_ctn_def);
