Author: sshyrkov Date: Mon Jun 11 12:33:43 2007 New Revision: 17538 URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17538&repname= =3Djahia Log: JAHIA-1985: SQL errors while installing Jahia with an Oracle database =
http://www.jahia.net/jira/browse/JAHIA-1985 Resolved: 1) Changes synchronized with changes in Jahia indexing jobs 2) Several Oracle indexes removed (Oracle does not allow to create indexes = on already indexed columns, like primary keys and unique columns) Modified: trunk/core/src/java/org/jahia/hibernate/model/indexingjob/JahiaIndexJob= ServerPK.java trunk/core/src/java/org/jahia/hibernate/model/indexingjob/JahiaIndexing= Job.java 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.sql trunk/core/src/webapp/WEB-INF/var/db/sql/schema/mysql-tx/jahia-schema.s= ql 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.sql trunk/core/src/webapp/WEB-INF/var/db/sql/schema/postgresql/jahia-schema= .sql Modified: trunk/core/src/java/org/jahia/hibernate/model/indexingjob/JahiaIn= dexJobServerPK.java URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o= rg/jahia/hibernate/model/indexingjob/JahiaIndexJobServerPK.java&rev=3D17538= &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/java/org/jahia/hibernate/model/indexingjob/JahiaIndexJob= ServerPK.java (original) +++ trunk/core/src/java/org/jahia/hibernate/model/indexingjob/JahiaIndexJob= ServerPK.java Mon Jun 11 12:33:43 2007 @@ -37,7 +37,7 @@ } = /** - * @hibernate.property column=3D"serverid" + * @hibernate.property column=3D"server_id" * length=3D"200" */ public String getServerId() { @@ -50,7 +50,7 @@ } = /** - * @hibernate.property column=3D"indexingjobid" + * @hibernate.property column=3D"indexingjob_id" * length=3D"50" */ public String getIndexingJobId() { Modified: trunk/core/src/java/org/jahia/hibernate/model/indexingjob/JahiaIn= dexingJob.java URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o= rg/jahia/hibernate/model/indexingjob/JahiaIndexingJob.java&rev=3D17538&repn= ame=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/java/org/jahia/hibernate/model/indexingjob/JahiaIndexing= Job.java (original) +++ trunk/core/src/java/org/jahia/hibernate/model/indexingjob/JahiaIndexing= Job.java Mon Jun 11 12:33:43 2007 @@ -24,7 +24,6 @@ import java.util.Set; import java.util.HashSet; import java.util.List; -import java.util.HashMap; = /** * Created by IntelliJ IDEA. @@ -33,7 +32,7 @@ * Time: 12:53:53 * To change this template use File | Settings | File Templates. * - * @hibernate.class table=3D"jahia_indexingjobs" + * @hibernate.class table=3D"jahia_indexingjob" * @hibernate.discriminator column=3D"classname_indexingjob" * @hibernate.cache usage=3D"nonstrict-read-write" */ 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=3D17538&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 Mon Jun 11 12:33:43 2007 @@ -1204,19 +1204,19 @@ ); = --------------------------------------------------------------------------= --- --- jahia_indexjobservers +-- jahia_indexingjobsserver --------------------------------------------------------------------------= --- -drop table jahia_indexjobservers if exists; +drop table jahia_indexingjobsserver if exists; = -CREATE TABLE jahia_indexjobservers +CREATE TABLE jahia_indexingjobsserver ( - indexjob_id VARCHAR(50) NOT NULL, + indexingjob_id VARCHAR(50) NOT NULL, server_id VARCHAR(50) NOT NULL, - process_date BIGINT NOT NULL, - PRIMARY KEY(indexjob_id,server_id) + indexing_date BIGINT NOT NULL, + PRIMARY KEY(indexingjob_id,server_id) ); = -CREATE INDEX jahia_indexjobservers_index ON jahia_indexjobservers (indexj= ob_id, server_id); +CREATE INDEX jahia_indexingjobsserver_index ON jahia_indexingjobsserver (= indexingjob_id, server_id); --------------------------------------------------------------------------= --- -- jahia_indexingjob --------------------------------------------------------------------------= --- 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=3D17538&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 = Mon Jun 11 12:33:43 2007 @@ -32,7 +32,7 @@ alter table jahia_grps drop constraint FKE530C7C492027B41; alter table jahia_homepages drop constraint FK680BC06FDA2A80F8; alter table jahia_homepages_prop drop constraint FK4C258933C40D4732; -alter table jahia_indexjobservers drop constraint FK83742F90F50744; +alter table jahia_indexingjobsserver drop constraint FK83742F90F50744; alter table jahia_markup_set drop constraint FK9140E0E11CF7BDC1; alter table jahia_markup_set_prop drop constraint FKF9ACE0015B1A73AB; alter table jahia_markup_set_site drop constraint FKF9AE1BE57EED26D3; @@ -104,7 +104,7 @@ drop table jahia_homepages; drop table jahia_homepages_prop; drop table jahia_indexingjob; -drop table jahia_indexjobservers; +drop table jahia_indexingjobsserver; drop table jahia_link; drop table jahia_link_metadata; drop table jahia_locks_non_excl; @@ -483,10 +483,10 @@ fieldid_indexingjob int null, primary key (id_indexingjob) ); -create table jahia_indexjobservers ( - indexjob_id NVARCHAR(50) not null, +create table jahia_indexingjobsserver ( + indexingjob_id NVARCHAR(50) not null, server_id NVARCHAR(255) null, - process_date numeric(19,0) null + indexing_date numeric(19,0) null ); create table jahia_link ( id int not null, @@ -1020,9 +1020,9 @@ add constraint FK4C258933C40D4732 foreign key (id_jahia_homepages) references jahia_homepages; -alter table jahia_indexjobservers +alter table jahia_indexingjobsserver add constraint FK83742F90F50744 - foreign key (indexjob_id) + foreign key (indexingjob_id) references jahia_indexingjob; alter table jahia_markup_set add constraint FK9140E0E11CF7BDC1 Modified: trunk/core/src/webapp/WEB-INF/var/db/sql/schema/mysql-tx/jahia-sc= hema.sql URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp= /WEB-INF/var/db/sql/schema/mysql-tx/jahia-schema.sql&rev=3D17538&repname=3D= jahia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=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-tx/jahia-schema.s= ql (original) +++ trunk/core/src/webapp/WEB-INF/var/db/sql/schema/mysql-tx/jahia-schema.s= ql Mon Jun 11 12:33:43 2007 @@ -1293,19 +1293,19 @@ ALTER TABLE jahia_workflow TYPE=3DInnoDB; = = # ----------------------------------------------------------------------- -# jahia_indexjobservers +# jahia_indexingjobsserver # ----------------------------------------------------------------------- -drop table if exists jahia_indexjobservers; +drop table if exists jahia_indexingjobsserver; = -CREATE TABLE jahia_indexjobservers +CREATE TABLE jahia_indexingjobsserver ( - indexjob_id VARCHAR(50) NOT NULL, + indexingjob_id VARCHAR(50) NOT NULL, server_id VARCHAR(50) NOT NULL, - process_date BIGINT NOT NULL, - PRIMARY KEY(indexjob_id,server_id), - INDEX jahia_indexjobservers_index (indexjob_id, server_id)); + indexing_date BIGINT NOT NULL, + PRIMARY KEY(indexingjob_id,server_id), + INDEX jahia_indexingjobsserver_index (indexingjob_id, server_id)); = -ALTER TABLE jahia_indexjobservers TYPE=3DInnoDB; = +ALTER TABLE jahia_indexingjobsserver TYPE=3DInnoDB; = = # ----------------------------------------------------------------------- # jahia_indexingjob 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=3D17538&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 = Mon Jun 11 12:33:43 2007 @@ -1185,17 +1185,17 @@ PRIMARY KEY(OBJECTKEY)); = # ----------------------------------------------------------------------- -# jahia_indexjobservers +# jahia_indexingjobsserver # ----------------------------------------------------------------------- -drop table if exists jahia_indexjobservers; +drop table if exists jahia_indexingjobsserver; = -CREATE TABLE jahia_indexjobservers +CREATE TABLE jahia_indexingjobsserver ( - indexjob_id VARCHAR(50) NOT NULL, + indexingjob_id VARCHAR(50) NOT NULL, server_id VARCHAR(50) NOT NULL, - process_date BIGINT NOT NULL, - PRIMARY KEY(indexjob_id,server_id), - INDEX jahia_indexjobservers_index (indexjob_id, server_id)); + indexing_date BIGINT NOT NULL, + PRIMARY KEY(indexingjob_id,server_id), + INDEX jahia_indexingjobsserver_index (indexingjob_id, server_id)); = # ----------------------------------------------------------------------- # jahia_indexingjob 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=3D17538&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= Mon Jun 11 12:33:43 2007 @@ -37,7 +37,7 @@ drop table jahia_homepages cascade constraints; drop table jahia_homepages_prop cascade constraints; drop table jahia_indexingjob cascade constraints; -drop table jahia_indexjobservers cascade constraints; +drop table jahia_indexingjobsserver cascade constraints; drop table jahia_link cascade constraints; drop table jahia_link_metadata cascade constraints; drop table jahia_locks cascade constraints; @@ -407,10 +407,10 @@ fieldid_indexingjob number(10,0), primary key (id_indexingjob) ); -create table jahia_indexjobservers ( - indexjob_id varchar2(50) not null, +create table jahia_indexingjobsserver ( + indexingjob_id varchar2(50) not null, server_id varchar2(255), - process_date number(19,0) + indexing_date number(19,0) ); create table jahia_link ( id number(10,0) not null, @@ -907,9 +907,9 @@ add constraint FK4C258933C40D4732 foreign key (id_jahia_homepages) references jahia_homepages; -alter table jahia_indexjobservers +alter table jahia_indexingjobsserver add constraint FK83742F90F50744 - foreign key (indexjob_id) + foreign key (indexingjob_id) references jahia_indexingjob; alter table jahia_markup_set add constraint FK9140E0E11CF7BDC1 @@ -1088,10 +1088,8 @@ foreign key (siteid_jahia_users) references jahia_sites; = -CREATE INDEX jahia_acl_index ON jahia_acl (id_jahia_acl); 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); @@ -1128,14 +1126,10 @@ = CREATE INDEX jahia_link_index ON jahia_link (right_oid); = -CREATE INDEX jahia_locks_index ON jahia_locks (name_locks, targetid_locks,= action_locks); - CREATE INDEX jahia_pages_data_index ON jahia_pages_data (id_jahia_pages_da= ta, workflow_state, version_id); CREATE INDEX jahia_pages_data_index2 ON jahia_pages_data (workflow_state, = parentid_jahia_pages_data, version_id, id_jahia_pages_data); 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); = @@ -1145,8 +1139,5 @@ = CREATE INDEX jahia_users_index ON jahia_users (name_jahia_users, siteid_ja= hia_users); 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_indexjobservers_index ON jahia_indexjobservers (indexjo= b_id, server_id); = -CREATE INDEX jahia_indexingjob_index ON jahia_indexingjob (id_indexingjob); \ No newline at end of file +CREATE INDEX jahia_indexingjobsserver_index ON jahia_indexingjobsserver (i= ndexingjob_id, server_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=3D17538&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 Mon Jun 11 12:33:43 2007 @@ -1306,20 +1306,20 @@ = = --------------------------------------------------------------------------= --- --- jahia_indexjobservers +-- jahia_indexingjobsserver --------------------------------------------------------------------------= --- -DROP TABLE jahia_indexjobservers CASCADE; +DROP TABLE jahia_indexingjobsserver CASCADE; = = = -CREATE TABLE jahia_indexjobservers +CREATE TABLE jahia_indexingjobsserver ( - indexjob_id VARCHAR(50) NOT NULL, + indexingjob_id VARCHAR(50) NOT NULL, server_id VARCHAR(50) NOT NULL, - process_date INT8 NOT NULL, - PRIMARY KEY (indexjob_id,server_id) + indexing_date INT8 NOT NULL, + PRIMARY KEY (indexingjob_id,server_id) ); -CREATE INDEX jahia_indexjobservers_index ON jahia_indexjobservers (indexjo= b_id, server_id); +CREATE INDEX jahia_indexingjobsserver_index ON jahia_indexingjobsserver (i= ndexingjob_id, server_id); = = = _______________________________________________ cvs_list mailing list [email protected] http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
