Author: tdraier
Date: Thu Aug 2 16:30:30 2007
New Revision: 18111
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18111&repname=
=3Djahia
Log:
update schema & indexes for jahia_references (port 18054)
Modified:
trunk/core/src/webapp/WEB-INF/var/db/sql/schema/hypersonic/jahia-schema=
-index.sql
trunk/core/src/webapp/WEB-INF/var/db/sql/schema/hypersonic/jahia-schema=
.sql
trunk/core/src/webapp/WEB-INF/var/db/sql/schema/mssql/jahia-schema-inde=
x.sql
trunk/core/src/webapp/WEB-INF/var/db/sql/schema/mssql/jahia-schema.sql
trunk/core/src/webapp/WEB-INF/var/db/sql/schema/mysql/jahia-schema-inde=
x.sql
trunk/core/src/webapp/WEB-INF/var/db/sql/schema/mysql/jahia-schema.sql
trunk/core/src/webapp/WEB-INF/var/db/sql/schema/oracle/jahia-schema-ind=
ex.sql
trunk/core/src/webapp/WEB-INF/var/db/sql/schema/oracle/jahia-schema.sql
trunk/core/src/webapp/WEB-INF/var/db/sql/schema/postgresql/jahia-schema=
-index.sql
trunk/core/src/webapp/WEB-INF/var/db/sql/schema/postgresql/jahia-schema=
.sql
Modified: trunk/core/src/webapp/WEB-INF/var/db/sql/schema/hypersonic/jahia-=
schema-index.sql
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/WEB-INF/var/db/sql/schema/hypersonic/jahia-schema-index.sql&rev=3D18111&re=
pname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/WEB-INF/var/db/sql/schema/hypersonic/jahia-schema=
-index.sql (original)
+++ trunk/core/src/webapp/WEB-INF/var/db/sql/schema/hypersonic/jahia-schema=
-index.sql Thu Aug 2 16:30:30 2007
@@ -24,6 +24,8 @@
=
DROP INDEX jahia_ctn_lists_index4 ON jahia_ctn_lists ;
=
+DROP INDEX jahia_ctn_lists_index5 ON jahia_ctn_lists ;
+
DROP INDEX jahia_ctn_struct_index ON jahia_ctn_struct ;
=
DROP INDEX jahia_ctnlists_prop_index ON jahia_ctnlists_prop ;
@@ -102,11 +104,15 @@
=
DROP INDEX jahia_users_index3 ON jahia_users ;
=
-DROP INDEX jahia_indexjobservers_index ON jahia_indexjobservers ;
+DROP INDEX jahia_indexingjobsserver_index ON jahia_indexingjobsserver ;
+
+DROP INDEX jahia_indexingjobs_index ON jahia_indexingjobs ;
+
+DROP INDEX jahia_languages_states_index ON jahia_languages_states ;
=
-DROP INDEX jahia_indexingjob_index ON jahia_indexingjob ;
+DROP INDEX jahia_reference_index;
=
- =
+DROP INDEX jahia_reference_index2;
=
CREATE INDEX jahia_acl_index ON jahia_acl (id_jahia_acl);
=
@@ -134,6 +140,8 @@
=
CREATE INDEX jahia_ctn_lists_index4 ON jahia_ctn_lists (parententryid_jahi=
a_ctn_lists);
=
+CREATE INDEX jahia_ctn_lists_index5 ON jahia_ctn_lists (pageid_jahia_ctn_l=
ists);
+
CREATE INDEX jahia_ctn_struct_index ON jahia_ctn_struct (rank_jahia_ctn_st=
ruct, ctnsubdefid_jahia_ctn_struct);
=
CREATE INDEX jahia_ctnlists_prop_index ON jahia_ctnlists_prop (ctnlistid_c=
tnlists_prop);
@@ -148,7 +156,7 @@
=
CREATE INDEX jahia_fields_data_index5 ON jahia_fields_data (rights_jahia_f=
ields_data);
=
-CREATE INDEX jahia_fields_data_index6 ON jahia_fields_data (ctnid_jahia_fi=
elds_data, rank_jahia_fields_data, id_jahia_fields_data);
+CREATE INDEX jahia_fields_data_index6 ON jahia_fields_data (ctnid_jahia_fi=
elds_data, id_jahia_fields_data);
=
CREATE INDEX jahia_fields_data_index7 ON jahia_fields_data (value_jahia_fi=
elds_data, type_jahia_fields_data, workflow_state, version_id);
=
@@ -174,7 +182,7 @@
=
---------------------------------------------------------------------
=
- =
+
=
-- alter table jahia_link modify left_oid varchar (100);
=
@@ -182,7 +190,7 @@
=
-- alter table jahia_link modify type varchar (100);
=
- =
+
=
---------------------------------------------------------------------
=
@@ -224,6 +232,12 @@
=
CREATE INDEX jahia_users_index3 ON jahia_users (key_jahia_users);
=
-CREATE INDEX jahia_indexjobservers_index ON jahia_indexjobservers (indexjo=
b_id, server_id);
+CREATE INDEX jahia_indexingjobsserver_index ON jahia_indexingjobsserver (i=
ndexingjobid, serverid);
+
+CREATE INDEX jahia_indexingjobs_index ON jahia_indexingjobs (id_indexingjo=
b);
+
+CREATE INDEX jahia_languages_states_index ON jahia_languages_states (workf=
low_state, siteid);
+
+CREATE INDEX jahia_reference_index ON jahia_reference (ref_type, ref_id);
=
-CREATE INDEX jahia_indexingjob_index ON jahia_indexingjob (id_indexingjob);
\ No newline at end of file
+CREATE INDEX jahia_reference_index2 ON jahia_reference (page_id);
Modified: trunk/core/src/webapp/WEB-INF/var/db/sql/schema/hypersonic/jahia-=
schema.sql
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/WEB-INF/var/db/sql/schema/hypersonic/jahia-schema.sql&rev=3D18111&repname=
=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/WEB-INF/var/db/sql/schema/hypersonic/jahia-schema=
.sql (original)
+++ trunk/core/src/webapp/WEB-INF/var/db/sql/schema/hypersonic/jahia-schema=
.sql Thu Aug 2 16:30:30 2007
@@ -8,7 +8,6 @@
alter table jahia_category drop constraint FKAFAF3D94348193C9;
alter table jahia_ctn_def drop constraint FK574BF38D81F76A12;
alter table jahia_ctn_def_properties drop constraint FKA2522525B1CEB792;
-alter table jahia_ctn_entries drop constraint FK6719F0182797C1D;
alter table jahia_ctn_entries drop constraint FK6719F01827313F9D;
alter table jahia_ctn_lists drop constraint FKB490111D2A3FB9A2;
alter table jahia_ctn_struct drop constraint FKE9FE8F4D62299E65;
@@ -30,8 +29,6 @@
alter table jahia_nstep_workflowinstance drop constraint FKDA6D7CCFED90E37=
0;
alter table jahia_nstep_workflowstep drop constraint FK6A6E1C067F20B53;
alter table jahia_obj drop constraint FKF6E0A6A143AACCE0;
-alter table jahia_obj drop constraint FKF6E0A6A1547147A6;
-alter table jahia_pages_data drop constraint FKB5B3A65BD5301936;
alter table jahia_pages_data drop constraint FKB5B3A65BFC25DDC3;
alter table jahia_pages_def drop constraint FK1EA2B334B5FF0C79;
alter table jahia_pages_def_prop drop constraint FK8840898E47E25CC;
@@ -102,6 +99,7 @@
drop table jahia_pages_def if exists;
drop table jahia_pages_def_prop if exists;
drop table jahia_pages_prop if exists;
+drop table jahia_reference if exists;
drop table jahia_resources if exists;
drop table jahia_retrule if exists;
drop table jahia_retrule_range if exists;
@@ -536,6 +534,12 @@
prop_value varchar(255),
primary key (page_id, prop_name, language_code)
);
+create table jahia_reference (
+ page_id integer not null,
+ ref_id integer not null,
+ ref_type integer not null,
+ primary key (page_id, ref_id, ref_type)
+);
create table jahia_resources (
name_resource varchar(200) not null,
languagecode_resource varchar(10) not null,
@@ -550,6 +554,7 @@
title_retrule varchar(255),
comment_retrule varchar(255),
shared_retrule bit,
+ settings_retrule longvarchar,
primary key (id_jahia_retrule)
);
create table jahia_retrule_range (
@@ -823,10 +828,6 @@
foreign key (ctndefid_jahia_ctn_def_prop) =
references jahia_ctn_def;
alter table jahia_ctn_entries =
- add constraint FK6719F0182797C1D =
- foreign key (jahiaid_jahia_ctn_entries) =
- references jahia_sites;
-alter table jahia_ctn_entries =
add constraint FK6719F01827313F9D =
foreign key (ctndefid_jahia_ctn_entries) =
references jahia_ctn_def;
@@ -910,14 +911,6 @@
add constraint FKF6E0A6A143AACCE0 =
foreign key (retrule_jahia_obj) =
references jahia_retrule;
-alter table jahia_obj =
- add constraint FKF6E0A6A1547147A6 =
- foreign key (jahiaid_jahia_obj) =
- references jahia_sites;
-alter table jahia_pages_data =
- add constraint FKB5B3A65BD5301936 =
- foreign key (jahiaid_jahia_pages_data) =
- references jahia_sites;
alter table jahia_pages_data =
add constraint FKB5B3A65BFC25DDC3 =
foreign key (pagedefid_jahia_pages_data) =
Modified: trunk/core/src/webapp/WEB-INF/var/db/sql/schema/mssql/jahia-schem=
a-index.sql
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/WEB-INF/var/db/sql/schema/mssql/jahia-schema-index.sql&rev=3D18111&repname=
=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/WEB-INF/var/db/sql/schema/mssql/jahia-schema-inde=
x.sql (original)
+++ trunk/core/src/webapp/WEB-INF/var/db/sql/schema/mssql/jahia-schema-inde=
x.sql Thu Aug 2 16:30:30 2007
@@ -24,6 +24,8 @@
=
DROP INDEX jahia_ctn_lists_index4 ON jahia_ctn_lists ;
=
+DROP INDEX jahia_ctn_lists_index5 ON jahia_ctn_lists ;
+
DROP INDEX jahia_ctn_struct_index ON jahia_ctn_struct ;
=
DROP INDEX jahia_ctnlists_prop_index ON jahia_ctnlists_prop ;
@@ -102,11 +104,15 @@
=
DROP INDEX jahia_users_index3 ON jahia_users ;
=
-DROP INDEX jahia_indexjobservers_index ON jahia_indexjobservers ;
+DROP INDEX jahia_indexingjobsserver_index ON jahia_indexingjobsserver ;
+
+DROP INDEX jahia_indexingjobs_index ON jahia_indexingjobs ;
=
-DROP INDEX jahia_indexingjob_index ON jahia_indexingjob ;
+DROP INDEX jahia_languages_states_index ON jahia_languages_states ;
=
- =
+DROP INDEX jahia_reference_index;
+
+DROP INDEX jahia_reference_index2;
=
CREATE INDEX jahia_acl_index ON jahia_acl (id_jahia_acl);
=
@@ -134,6 +140,8 @@
=
CREATE INDEX jahia_ctn_lists_index4 ON jahia_ctn_lists (parententryid_jahi=
a_ctn_lists);
=
+CREATE INDEX jahia_ctn_lists_index5 ON jahia_ctn_lists (pageid_jahia_ctn_l=
ists);
+
CREATE INDEX jahia_ctn_struct_index ON jahia_ctn_struct (rank_jahia_ctn_st=
ruct, ctnsubdefid_jahia_ctn_struct);
=
CREATE INDEX jahia_ctnlists_prop_index ON jahia_ctnlists_prop (ctnlistid_c=
tnlists_prop);
@@ -148,7 +156,7 @@
=
CREATE INDEX jahia_fields_data_index5 ON jahia_fields_data (rights_jahia_f=
ields_data);
=
-CREATE INDEX jahia_fields_data_index6 ON jahia_fields_data (ctnid_jahia_fi=
elds_data, rank_jahia_fields_data, id_jahia_fields_data);
+CREATE INDEX jahia_fields_data_index6 ON jahia_fields_data (ctnid_jahia_fi=
elds_data, id_jahia_fields_data);
=
CREATE INDEX jahia_fields_data_index7 ON jahia_fields_data (value_jahia_fi=
elds_data, type_jahia_fields_data, workflow_state, version_id);
=
@@ -212,6 +220,12 @@
=
CREATE INDEX jahia_users_index3 ON jahia_users (key_jahia_users);
=
-CREATE INDEX jahia_indexjobservers_index ON jahia_indexjobservers (indexjo=
b_id, server_id);
+CREATE INDEX jahia_indexingjobsserver_index ON jahia_indexingjobsserver (i=
ndexingjobid, serverid);
+
+CREATE INDEX jahia_indexingjobs_index ON jahia_indexingjobs (id_indexingjo=
b);
+
+CREATE INDEX jahia_languages_states_index ON jahia_languages_states (workf=
low_state, siteid);
+
+CREATE INDEX jahia_reference_index ON jahia_reference (ref_type, ref_id);
=
-CREATE INDEX jahia_indexingjob_index ON jahia_indexingjob (id_indexingjob);
\ No newline at end of file
+CREATE INDEX jahia_reference_index2 ON jahia_reference (page_id);
Modified: trunk/core/src/webapp/WEB-INF/var/db/sql/schema/mssql/jahia-schem=
a.sql
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/WEB-INF/var/db/sql/schema/mssql/jahia-schema.sql&rev=3D18111&repname=3Djah=
ia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/WEB-INF/var/db/sql/schema/mssql/jahia-schema.sql =
(original)
+++ trunk/core/src/webapp/WEB-INF/var/db/sql/schema/mssql/jahia-schema.sql =
Thu Aug 2 16:30:30 2007
@@ -8,7 +8,6 @@
alter table jahia_category drop constraint FKAFAF3D94348193C9;
alter table jahia_ctn_def drop constraint FK574BF38D81F76A12;
alter table jahia_ctn_def_properties drop constraint FKA2522525B1CEB792;
-alter table jahia_ctn_entries drop constraint FK6719F0182797C1D;
alter table jahia_ctn_entries drop constraint FK6719F01827313F9D;
alter table jahia_ctn_lists drop constraint FKB490111D2A3FB9A2;
alter table jahia_ctn_struct drop constraint FKE9FE8F4D62299E65;
@@ -30,8 +29,6 @@
alter table jahia_nstep_workflowinstance drop constraint FKDA6D7CCFED90E37=
0;
alter table jahia_nstep_workflowstep drop constraint FK6A6E1C067F20B53;
alter table jahia_obj drop constraint FKF6E0A6A143AACCE0;
-alter table jahia_obj drop constraint FKF6E0A6A1547147A6;
-alter table jahia_pages_data drop constraint FKB5B3A65BD5301936;
alter table jahia_pages_data drop constraint FKB5B3A65BFC25DDC3;
alter table jahia_pages_def drop constraint FK1EA2B334B5FF0C79;
alter table jahia_pages_def_prop drop constraint FK8840898E47E25CC;
@@ -102,6 +99,7 @@
drop table jahia_pages_def;
drop table jahia_pages_def_prop;
drop table jahia_pages_prop;
+drop table jahia_reference;
drop table jahia_resources;
drop table jahia_retrule;
drop table jahia_retrule_range;
@@ -533,6 +531,12 @@
prop_value nvarchar(255) null,
primary key (page_id, prop_name, language_code)
);
+create table jahia_reference (
+ page_id int not null,
+ ref_id int not null,
+ ref_type int not null,
+ primary key (page_id, ref_id, ref_type)
+);
create table jahia_resources (
name_resource nvarchar(200) not null,
languagecode_resource nvarchar(10) not null,
@@ -547,6 +551,7 @@
title_retrule nvarchar(255) null,
comment_retrule nvarchar(255) null,
shared_retrule tinyint null,
+ settings_retrule ntext null,
primary key (id_jahia_retrule)
);
create table jahia_retrule_range (
@@ -817,10 +822,6 @@
foreign key (ctndefid_jahia_ctn_def_prop) =
references jahia_ctn_def;
alter table jahia_ctn_entries =
- add constraint FK6719F0182797C1D =
- foreign key (jahiaid_jahia_ctn_entries) =
- references jahia_sites;
-alter table jahia_ctn_entries =
add constraint FK6719F01827313F9D =
foreign key (ctndefid_jahia_ctn_entries) =
references jahia_ctn_def;
@@ -904,14 +905,6 @@
add constraint FKF6E0A6A143AACCE0 =
foreign key (retrule_jahia_obj) =
references jahia_retrule;
-alter table jahia_obj =
- add constraint FKF6E0A6A1547147A6 =
- foreign key (jahiaid_jahia_obj) =
- references jahia_sites;
-alter table jahia_pages_data =
- add constraint FKB5B3A65BD5301936 =
- foreign key (jahiaid_jahia_pages_data) =
- references jahia_sites;
alter table jahia_pages_data =
add constraint FKB5B3A65BFC25DDC3 =
foreign key (pagedefid_jahia_pages_data) =
Modified: trunk/core/src/webapp/WEB-INF/var/db/sql/schema/mysql/jahia-schem=
a-index.sql
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/WEB-INF/var/db/sql/schema/mysql/jahia-schema-index.sql&rev=3D18111&repname=
=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/WEB-INF/var/db/sql/schema/mysql/jahia-schema-inde=
x.sql (original)
+++ trunk/core/src/webapp/WEB-INF/var/db/sql/schema/mysql/jahia-schema-inde=
x.sql Thu Aug 2 16:30:30 2007
@@ -24,6 +24,8 @@
=
DROP INDEX jahia_ctn_lists_index4 ON jahia_ctn_lists ;
=
+DROP INDEX jahia_ctn_lists_index5 ON jahia_ctn_lists ;
+
DROP INDEX jahia_ctn_struct_index ON jahia_ctn_struct ;
=
DROP INDEX jahia_ctnlists_prop_index ON jahia_ctnlists_prop ;
@@ -102,11 +104,15 @@
=
DROP INDEX jahia_users_index3 ON jahia_users ;
=
-DROP INDEX jahia_indexjobservers_index ON jahia_indexjobservers ;
+DROP INDEX jahia_indexingjobsserver_index ON jahia_indexingjobsserver ;
+
+DROP INDEX jahia_indexingjobs_index ON jahia_indexingjobs ;
+
+DROP INDEX jahia_languagestates_index ON jahia_languages_states ;
=
-DROP INDEX jahia_indexingjob_index ON jahia_indexingjob ;
+DROP INDEX jahia_reference_index;
=
- =
+DROP INDEX jahia_reference_index2;
=
CREATE INDEX jahia_acl_index ON jahia_acl (id_jahia_acl);
=
@@ -134,6 +140,8 @@
=
CREATE INDEX jahia_ctn_lists_index4 ON jahia_ctn_lists (parententryid_jahi=
a_ctn_lists);
=
+CREATE INDEX jahia_ctn_lists_index5 ON jahia_ctn_lists (pageid_jahia_ctn_l=
ists);
+
CREATE INDEX jahia_ctn_struct_index ON jahia_ctn_struct (rank_jahia_ctn_st=
ruct, ctnsubdefid_jahia_ctn_struct);
=
CREATE INDEX jahia_ctnlists_prop_index ON jahia_ctnlists_prop (ctnlistid_c=
tnlists_prop);
@@ -148,13 +156,13 @@
=
CREATE INDEX jahia_fields_data_index5 ON jahia_fields_data (rights_jahia_f=
ields_data);
=
-CREATE INDEX jahia_fields_data_index6 ON jahia_fields_data (ctnid_jahia_fi=
elds_data, rank_jahia_fields_data, id_jahia_fields_data);
+CREATE INDEX jahia_fields_data_index6 ON jahia_fields_data (ctnid_jahia_fi=
elds_data, id_jahia_fields_data);
=
CREATE INDEX jahia_fields_data_index7 ON jahia_fields_data (value_jahia_fi=
elds_data, type_jahia_fields_data, workflow_state, version_id);
=
CREATE INDEX jahia_fields_data_index8 ON jahia_fields_data (id_jahia_field=
s_data, workflow_state);
=
-CREATE INDEX jahia_fields_data_index9 ON jahia_fields_data ( fielddefid_ja=
hia_fields_data, id_jahia_obj, type_jahia_obj);
+CREATE INDEX jahia_fields_data_index9 ON jahia_fields_data (fielddefid_jah=
ia_fields_data, id_jahia_obj, type_jahia_obj);
=
CREATE INDEX jahia_fields_data_index10 ON jahia_fields_data (id_jahia_obj,=
type_jahia_obj);
=
@@ -176,7 +184,7 @@
=
---------------------------------------------------------------------
=
- =
+
=
-- alter table jahia_link modify left_oid varchar (100);
=
@@ -184,7 +192,7 @@
=
-- alter table jahia_link modify type varchar (100);
=
- =
+
=
---------------------------------------------------------------------
=
@@ -226,6 +234,12 @@
=
CREATE INDEX jahia_users_index3 ON jahia_users (key_jahia_users);
=
-CREATE INDEX jahia_indexjobservers_index ON jahia_indexjobservers (indexjo=
b_id, server_id);
+CREATE INDEX jahia_indexingjobsserver_index ON jahia_indexingjobsserver (i=
ndexingjobid, serverid);
+
+CREATE INDEX jahia_indexingjobs_index ON jahia_indexingjobs (id_indexingjo=
b);
+
+CREATE INDEX jahia_languagestates_index ON jahia_languages_states (workflo=
w_state, siteid);
+
+CREATE INDEX jahia_reference_index ON jahia_reference (ref_type, ref_id);
=
-CREATE INDEX jahia_indexingjob_index ON jahia_indexingjob (id_indexingjob);
\ No newline at end of file
+CREATE INDEX jahia_reference_index2 ON jahia_reference (page_id);
Modified: trunk/core/src/webapp/WEB-INF/var/db/sql/schema/mysql/jahia-schem=
a.sql
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/WEB-INF/var/db/sql/schema/mysql/jahia-schema.sql&rev=3D18111&repname=3Djah=
ia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/WEB-INF/var/db/sql/schema/mysql/jahia-schema.sql =
(original)
+++ trunk/core/src/webapp/WEB-INF/var/db/sql/schema/mysql/jahia-schema.sql =
Thu Aug 2 16:30:30 2007
@@ -8,7 +8,6 @@
alter table jahia_category drop foreign key FKAFAF3D94348193C9;
alter table jahia_ctn_def drop foreign key FK574BF38D81F76A12;
alter table jahia_ctn_def_properties drop foreign key FKA2522525B1CEB792;
-alter table jahia_ctn_entries drop foreign key FK6719F0182797C1D;
alter table jahia_ctn_entries drop foreign key FK6719F01827313F9D;
alter table jahia_ctn_lists drop foreign key FKB490111D2A3FB9A2;
alter table jahia_ctn_struct drop foreign key FKE9FE8F4D62299E65;
@@ -30,8 +29,6 @@
alter table jahia_nstep_workflowinstance drop foreign key FKDA6D7CCFED90E3=
70;
alter table jahia_nstep_workflowstep drop foreign key FK6A6E1C067F20B53;
alter table jahia_obj drop foreign key FKF6E0A6A143AACCE0;
-alter table jahia_obj drop foreign key FKF6E0A6A1547147A6;
-alter table jahia_pages_data drop foreign key FKB5B3A65BD5301936;
alter table jahia_pages_data drop foreign key FKB5B3A65BFC25DDC3;
alter table jahia_pages_def drop foreign key FK1EA2B334B5FF0C79;
alter table jahia_pages_def_prop drop foreign key FK8840898E47E25CC;
@@ -102,6 +99,7 @@
drop table if exists jahia_pages_def;
drop table if exists jahia_pages_def_prop;
drop table if exists jahia_pages_prop;
+drop table if exists jahia_reference;
drop table if exists jahia_resources;
drop table if exists jahia_retrule;
drop table if exists jahia_retrule_range;
@@ -533,6 +531,12 @@
prop_value varchar(255),
primary key (page_id, prop_name, language_code)
);
+create table jahia_reference (
+ page_id integer not null,
+ ref_id integer not null,
+ ref_type integer not null,
+ primary key (page_id, ref_id, ref_type)
+);
create table jahia_resources (
name_resource varchar(200) not null,
languagecode_resource varchar(10) not null,
@@ -547,6 +551,7 @@
title_retrule varchar(255),
comment_retrule varchar(255),
shared_retrule bit,
+ settings_retrule longtext,
primary key (id_jahia_retrule)
);
create table jahia_retrule_range (
@@ -827,11 +832,6 @@
foreign key (ctndefid_jahia_ctn_def_prop) =
references jahia_ctn_def (id_jahia_ctn_def);
alter table jahia_ctn_entries =
- add index FK6719F0182797C1D (jahiaid_jahia_ctn_entries), =
- add constraint FK6719F0182797C1D =
- foreign key (jahiaid_jahia_ctn_entries) =
- references jahia_sites (id_jahia_sites);
-alter table jahia_ctn_entries =
add index FK6719F01827313F9D (ctndefid_jahia_ctn_entries), =
add constraint FK6719F01827313F9D =
foreign key (ctndefid_jahia_ctn_entries) =
@@ -936,16 +936,6 @@
add constraint FKF6E0A6A143AACCE0 =
foreign key (retrule_jahia_obj) =
references jahia_retrule (id_jahia_retrule);
-alter table jahia_obj =
- add index FKF6E0A6A1547147A6 (jahiaid_jahia_obj), =
- add constraint FKF6E0A6A1547147A6 =
- foreign key (jahiaid_jahia_obj) =
- references jahia_sites (id_jahia_sites);
-alter table jahia_pages_data =
- add index FKB5B3A65BD5301936 (jahiaid_jahia_pages_data), =
- add constraint FKB5B3A65BD5301936 =
- foreign key (jahiaid_jahia_pages_data) =
- references jahia_sites (id_jahia_sites);
alter table jahia_pages_data =
add index FKB5B3A65BFC25DDC3 (pagedefid_jahia_pages_data), =
add constraint FKB5B3A65BFC25DDC3 =
Modified: trunk/core/src/webapp/WEB-INF/var/db/sql/schema/oracle/jahia-sche=
ma-index.sql
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/WEB-INF/var/db/sql/schema/oracle/jahia-schema-index.sql&rev=3D18111&repnam=
e=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/WEB-INF/var/db/sql/schema/oracle/jahia-schema-ind=
ex.sql (original)
+++ trunk/core/src/webapp/WEB-INF/var/db/sql/schema/oracle/jahia-schema-ind=
ex.sql Thu Aug 2 16:30:30 2007
@@ -1,9 +1,5 @@
-DROP INDEX jahia_acl_index;
-
DROP INDEX jahia_acl_index2;
=
-DROP INDEX jahia_ctn_def_index;
-
DROP INDEX jahia_ctn_def_properties_index;
=
DROP INDEX jahia_ctn_entries_index;
@@ -24,6 +20,8 @@
=
DROP INDEX jahia_ctn_lists_index4;
=
+DROP INDEX jahia_ctn_lists_index5;
+
DROP INDEX jahia_ctn_struct_index;
=
DROP INDEX jahia_ctnlists_prop_index;
@@ -84,8 +82,6 @@
=
DROP INDEX jahia_pages_data_index3;
=
-DROP INDEX jahia_pages_def_index;
-
DROP INDEX jahia_pages_def_prop_index;
=
DROP INDEX jahia_pages_def_prop_index2;
@@ -100,20 +96,16 @@
=
DROP INDEX jahia_users_index2;
=
-DROP INDEX jahia_users_index3;
-
-DROP INDEX jahia_indexjobservers_index;
+DROP INDEX jahia_indexingjobsserver_index;
=
-DROP INDEX jahia_indexingjob_index;
+DROP INDEX jahia_languagestates_index;
=
+DROP INDEX jahia_reference_index;
=
-
-CREATE INDEX jahia_acl_index ON jahia_acl (id_jahia_acl);
+DROP INDEX jahia_reference_index2;
=
CREATE INDEX jahia_acl_index2 ON jahia_acl (parent_id_jahia_acl, id_jahia_=
acl);
=
-CREATE INDEX jahia_ctn_def_index ON jahia_ctn_def (id_jahia_ctn_def);
-
CREATE INDEX jahia_ctn_def_properties_index ON jahia_ctn_def_properties (c=
tndefid_jahia_ctn_def_prop);
=
CREATE INDEX jahia_ctn_entries_index ON jahia_ctn_entries (rights_jahia_ct=
n_entries);
@@ -134,6 +126,8 @@
=
CREATE INDEX jahia_ctn_lists_index4 ON jahia_ctn_lists (parententryid_jahi=
a_ctn_lists);
=
+CREATE INDEX jahia_ctn_lists_index5 ON jahia_ctn_lists (pageid_jahia_ctn_l=
ists);
+
CREATE INDEX jahia_ctn_struct_index ON jahia_ctn_struct (rank_jahia_ctn_st=
ruct, ctnsubdefid_jahia_ctn_struct);
=
CREATE INDEX jahia_ctnlists_prop_index ON jahia_ctnlists_prop (ctnlistid_c=
tnlists_prop);
@@ -148,7 +142,7 @@
=
CREATE INDEX jahia_fields_data_index5 ON jahia_fields_data (rights_jahia_f=
ields_data);
=
-CREATE INDEX jahia_fields_data_index6 ON jahia_fields_data (ctnid_jahia_fi=
elds_data, rank_jahia_fields_data, id_jahia_fields_data);
+CREATE INDEX jahia_fields_data_index6 ON jahia_fields_data (ctnid_jahia_fi=
elds_data, id_jahia_fields_data);
=
CREATE INDEX jahia_fields_data_index7 ON jahia_fields_data (value_jahia_fi=
elds_data, type_jahia_fields_data, workflow_state, version_id);
=
@@ -194,8 +188,6 @@
=
CREATE INDEX jahia_pages_data_index3 ON jahia_pages_data (rights_jahia_pag=
es_data);
=
-CREATE INDEX jahia_pages_def_index ON jahia_pages_def (id_jahia_pages_def);
-
CREATE INDEX jahia_pages_def_prop_index ON jahia_pages_def_prop (id_jahia_=
pages_def_prop);
=
CREATE INDEX jahia_pages_def_prop_index2 ON jahia_pages_def_prop (name_pag=
es_def_prop, value_pages_def_prop);
@@ -210,8 +202,10 @@
=
CREATE INDEX jahia_users_index2 ON jahia_users (siteid_jahia_users);
=
-CREATE INDEX jahia_users_index3 ON jahia_users (key_jahia_users);
+CREATE INDEX jahia_indexingjobsserver_index ON jahia_indexingjobsserver (i=
ndexingjobid, serverid);
+
+CREATE INDEX jahia_languagestates_index ON jahia_languages_states (workflo=
w_state, siteid);
=
-CREATE INDEX jahia_indexjobservers_index ON jahia_indexjobservers (indexjo=
b_id, server_id);
+CREATE INDEX jahia_reference_index ON jahia_reference (ref_type, ref_id);
=
-CREATE INDEX jahia_indexingjob_index ON jahia_indexingjob (id_indexingjob);
\ No newline at end of file
+CREATE INDEX jahia_reference_index2 ON jahia_reference (page_id);
Modified: trunk/core/src/webapp/WEB-INF/var/db/sql/schema/oracle/jahia-sche=
ma.sql
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/WEB-INF/var/db/sql/schema/oracle/jahia-schema.sql&rev=3D18111&repname=3Dja=
hia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/WEB-INF/var/db/sql/schema/oracle/jahia-schema.sql=
(original)
+++ trunk/core/src/webapp/WEB-INF/var/db/sql/schema/oracle/jahia-schema.sql=
Thu Aug 2 16:30:30 2007
@@ -49,6 +49,7 @@
drop table jahia_pages_def cascade constraints;
drop table jahia_pages_def_prop cascade constraints;
drop table jahia_pages_prop cascade constraints;
+drop table jahia_reference cascade constraints;
drop table jahia_resources cascade constraints;
drop table jahia_retrule cascade constraints;
drop table jahia_retrule_range cascade constraints;
@@ -480,6 +481,12 @@
prop_value varchar2(255),
primary key (page_id, prop_name, language_code)
);
+create table jahia_reference (
+ page_id number(10,0) not null,
+ ref_id number(10,0) not null,
+ ref_type number(10,0) not null,
+ primary key (page_id, ref_id, ref_type)
+);
create table jahia_resources (
name_resource varchar2(200) not null,
languagecode_resource varchar2(10) not null,
@@ -494,6 +501,7 @@
title_retrule varchar2(255),
comment_retrule varchar2(255),
shared_retrule number(1,0),
+ settings_retrule clob,
primary key (id_jahia_retrule)
);
create table jahia_retrule_range (
@@ -764,10 +772,6 @@
foreign key (ctndefid_jahia_ctn_def_prop) =
references jahia_ctn_def;
alter table jahia_ctn_entries =
- add constraint FK6719F0182797C1D =
- foreign key (jahiaid_jahia_ctn_entries) =
- references jahia_sites;
-alter table jahia_ctn_entries =
add constraint FK6719F01827313F9D =
foreign key (ctndefid_jahia_ctn_entries) =
references jahia_ctn_def;
@@ -851,14 +855,6 @@
add constraint FKF6E0A6A143AACCE0 =
foreign key (retrule_jahia_obj) =
references jahia_retrule;
-alter table jahia_obj =
- add constraint FKF6E0A6A1547147A6 =
- foreign key (jahiaid_jahia_obj) =
- references jahia_sites;
-alter table jahia_pages_data =
- add constraint FKB5B3A65BD5301936 =
- foreign key (jahiaid_jahia_pages_data) =
- references jahia_sites;
alter table jahia_pages_data =
add constraint FKB5B3A65BFC25DDC3 =
foreign key (pagedefid_jahia_pages_data) =
Modified: trunk/core/src/webapp/WEB-INF/var/db/sql/schema/postgresql/jahia-=
schema-index.sql
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/WEB-INF/var/db/sql/schema/postgresql/jahia-schema-index.sql&rev=3D18111&re=
pname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/WEB-INF/var/db/sql/schema/postgresql/jahia-schema=
-index.sql (original)
+++ trunk/core/src/webapp/WEB-INF/var/db/sql/schema/postgresql/jahia-schema=
-index.sql Thu Aug 2 16:30:30 2007
@@ -24,6 +24,8 @@
=
DROP INDEX jahia_ctn_lists_index4;
=
+DROP INDEX jahia_ctn_lists_index5;
+
DROP INDEX jahia_ctn_struct_index;
=
DROP INDEX jahia_ctnlists_prop_index;
@@ -102,11 +104,15 @@
=
DROP INDEX jahia_users_index3;
=
-DROP INDEX jahia_indexjobservers_index;
+DROP INDEX jahia_indexingjobsserver_index;
+
+DROP INDEX jahia_indexingjobs_index;
=
-DROP INDEX jahia_indexingjob_index;
+DROP INDEX jahia_languagestates_index;
=
+DROP INDEX jahia_reference_index;
=
+DROP INDEX jahia_reference_index2;
=
CREATE INDEX jahia_acl_index ON jahia_acl (id_jahia_acl);
=
@@ -134,6 +140,8 @@
=
CREATE INDEX jahia_ctn_lists_index4 ON jahia_ctn_lists (parententryid_jahi=
a_ctn_lists);
=
+CREATE INDEX jahia_ctn_lists_index5 ON jahia_ctn_lists (pageid_jahia_ctn_l=
ists);
+
CREATE INDEX jahia_ctn_struct_index ON jahia_ctn_struct (rank_jahia_ctn_st=
ruct, ctnsubdefid_jahia_ctn_struct);
=
CREATE INDEX jahia_ctnlists_prop_index ON jahia_ctnlists_prop (ctnlistid_c=
tnlists_prop);
@@ -148,7 +156,7 @@
=
CREATE INDEX jahia_fields_data_index5 ON jahia_fields_data (rights_jahia_f=
ields_data);
=
-CREATE INDEX jahia_fields_data_index6 ON jahia_fields_data (ctnid_jahia_fi=
elds_data, rank_jahia_fields_data, id_jahia_fields_data);
+CREATE INDEX jahia_fields_data_index6 ON jahia_fields_data (ctnid_jahia_fi=
elds_data, id_jahia_fields_data);
=
CREATE INDEX jahia_fields_data_index7 ON jahia_fields_data (value_jahia_fi=
elds_data, type_jahia_fields_data, workflow_state, version_id);
=
@@ -226,6 +234,12 @@
=
CREATE INDEX jahia_users_index3 ON jahia_users (key_jahia_users);
=
-CREATE INDEX jahia_indexjobservers_index ON jahia_indexjobservers (indexjo=
b_id, server_id);
+CREATE INDEX jahia_indexingjobsserver_index ON jahia_indexingjobsserver (i=
ndexingjobid, serverid);
+
+CREATE INDEX jahia_indexingjobs_index ON jahia_indexingjobs (id_indexingjo=
b);
+
+CREATE INDEX jahia_languagestates_index ON jahia_languages_states (workflo=
w_state, siteid);
+
+CREATE INDEX jahia_reference_index ON jahia_reference (ref_type, ref_id);
=
-CREATE INDEX jahia_indexingjob_index ON jahia_indexingjob (id_indexingjob);
\ No newline at end of file
+CREATE INDEX jahia_reference_index2 ON jahia_reference (page_id);
Modified: trunk/core/src/webapp/WEB-INF/var/db/sql/schema/postgresql/jahia-=
schema.sql
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/WEB-INF/var/db/sql/schema/postgresql/jahia-schema.sql&rev=3D18111&repname=
=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/WEB-INF/var/db/sql/schema/postgresql/jahia-schema=
.sql (original)
+++ trunk/core/src/webapp/WEB-INF/var/db/sql/schema/postgresql/jahia-schema=
.sql Thu Aug 2 16:30:30 2007
@@ -8,7 +8,6 @@
alter table jahia_category drop constraint FKAFAF3D94348193C9;
alter table jahia_ctn_def drop constraint FK574BF38D81F76A12;
alter table jahia_ctn_def_properties drop constraint FKA2522525B1CEB792;
-alter table jahia_ctn_entries drop constraint FK6719F0182797C1D;
alter table jahia_ctn_entries drop constraint FK6719F01827313F9D;
alter table jahia_ctn_lists drop constraint FKB490111D2A3FB9A2;
alter table jahia_ctn_struct drop constraint FKE9FE8F4D62299E65;
@@ -30,8 +29,6 @@
alter table jahia_nstep_workflowinstance drop constraint FKDA6D7CCFED90E37=
0;
alter table jahia_nstep_workflowstep drop constraint FK6A6E1C067F20B53;
alter table jahia_obj drop constraint FKF6E0A6A143AACCE0;
-alter table jahia_obj drop constraint FKF6E0A6A1547147A6;
-alter table jahia_pages_data drop constraint FKB5B3A65BD5301936;
alter table jahia_pages_data drop constraint FKB5B3A65BFC25DDC3;
alter table jahia_pages_def drop constraint FK1EA2B334B5FF0C79;
alter table jahia_pages_def_prop drop constraint FK8840898E47E25CC;
@@ -102,6 +99,7 @@
drop table jahia_pages_def;
drop table jahia_pages_def_prop;
drop table jahia_pages_prop;
+drop table jahia_reference;
drop table jahia_resources;
drop table jahia_retrule;
drop table jahia_retrule_range;
@@ -533,6 +531,12 @@
prop_value varchar(255),
primary key (page_id, prop_name, language_code)
);
+create table jahia_reference (
+ page_id int4 not null,
+ ref_id int4 not null,
+ ref_type int4 not null,
+ primary key (page_id, ref_id, ref_type)
+);
create table jahia_resources (
name_resource varchar(200) not null,
languagecode_resource varchar(10) not null,
@@ -547,6 +551,7 @@
title_retrule varchar(255),
comment_retrule varchar(255),
shared_retrule bool,
+ settings_retrule text,
primary key (id_jahia_retrule)
);
create table jahia_retrule_range (
@@ -817,10 +822,6 @@
foreign key (ctndefid_jahia_ctn_def_prop) =
references jahia_ctn_def;
alter table jahia_ctn_entries =
- add constraint FK6719F0182797C1D =
- foreign key (jahiaid_jahia_ctn_entries) =
- references jahia_sites;
-alter table jahia_ctn_entries =
add constraint FK6719F01827313F9D =
foreign key (ctndefid_jahia_ctn_entries) =
references jahia_ctn_def;
@@ -904,14 +905,6 @@
add constraint FKF6E0A6A143AACCE0 =
foreign key (retrule_jahia_obj) =
references jahia_retrule;
-alter table jahia_obj =
- add constraint FKF6E0A6A1547147A6 =
- foreign key (jahiaid_jahia_obj) =
- references jahia_sites;
-alter table jahia_pages_data =
- add constraint FKB5B3A65BD5301936 =
- foreign key (jahiaid_jahia_pages_data) =
- references jahia_sites;
alter table jahia_pages_data =
add constraint FKB5B3A65BFC25DDC3 =
foreign key (pagedefid_jahia_pages_data) =
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
