Author: sshyrkov Date: Mon Jun 11 12:30:23 2007 New Revision: 17537 URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17537&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: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/bin/JahiaConfigura= tionWizard.java branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/model/in= dexingjob/JahiaIndexJobServerPK.java branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/model/in= dexingjob/JahiaIndexingJob.java branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/= hypersonic/jahia-schema-index.sql branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/= hypersonic/jahia-schema.sql branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/= mssql/jahia-schema-index.sql branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/= mssql/jahia-schema.sql branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/= mysql-tx/jahia-schema-index.sql branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/= mysql-tx/jahia-schema.sql branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/= mysql/jahia-schema-index.sql branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/= mysql/jahia-schema.sql branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/= oracle/jahia-schema-index.sql branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/= oracle/jahia-schema.sql branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/= postgresql/jahia-schema-index.sql branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/= postgresql/jahia-schema.sql Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/bin/JahiaCon= figurationWizard.java URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/java/org/jahia/bin/JahiaConfigurationWizard.java&rev=3D175= 37&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 --- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/bin/JahiaConfigura= tionWizard.java (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/bin/JahiaConfigura= tionWizard.java Mon Jun 11 12:30:23 2007 @@ -1600,11 +1600,11 @@ String upperCaseLine =3D line.toUpperCase().trim(); if (!upperCaseLine.startsWith("DROP") && !upperCaseLine.st= artsWith("ALTER TABLE") && !upperCaseLine.startsWith("CREATE INDEX")) { - logger.error("Error while trying to execute query : " = + line + " from script " + script.toString()); + logger.error("Error while trying to execute query : " = + line + " from script " + script.toString(), e); // continue to propagate the exception upwards. throw e; } else if(upperCaseLine.startsWith("CREATE INDEX")){ - logger.warn("Error while trying to execute query : " += line); + logger.warn("Error while trying to execute query : " += line, e); } } } Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/mo= del/indexingjob/JahiaIndexJobServerPK.java URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/java/org/jahia/hibernate/model/indexingjob/JahiaIndexJobSe= rverPK.java&rev=3D17537&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 --- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/model/in= dexingjob/JahiaIndexJobServerPK.java (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/model/in= dexingjob/JahiaIndexJobServerPK.java Mon Jun 11 12:30:23 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: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/mo= del/indexingjob/JahiaIndexingJob.java URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/java/org/jahia/hibernate/model/indexingjob/JahiaIndexingJo= b.java&rev=3D17537&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 --- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/model/in= dexingjob/JahiaIndexingJob.java (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/model/in= dexingjob/JahiaIndexingJob.java Mon Jun 11 12:30:23 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: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/s= chema/hypersonic/jahia-schema-index.sql URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/hypersonic/jahia-schema-i= ndex.sql&rev=3D17537&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 --- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/= hypersonic/jahia-schema-index.sql (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/= hypersonic/jahia-schema-index.sql Mon Jun 11 12:30:23 2007 @@ -100,7 +100,7 @@ = 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_indexingjob_index ON jahia_indexingjob ; = @@ -222,6 +222,6 @@ = 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= ndexingjob_id, server_id); = CREATE INDEX jahia_indexingjob_index ON jahia_indexingjob (id_indexingjob); \ No newline at end of file Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/s= chema/hypersonic/jahia-schema.sql URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/hypersonic/jahia-schema.s= ql&rev=3D17537&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 --- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/= hypersonic/jahia-schema.sql (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/= hypersonic/jahia-schema.sql Mon Jun 11 12:30:23 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: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/s= chema/mssql/jahia-schema-index.sql URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/mssql/jahia-schema-index.= sql&rev=3D17537&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 --- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/= mssql/jahia-schema-index.sql (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/= mssql/jahia-schema-index.sql Mon Jun 11 12:30:23 2007 @@ -100,7 +100,7 @@ = 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_indexingjob_index ON jahia_indexingjob ; = @@ -208,6 +208,6 @@ = 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= ndexingjob_id, server_id); = CREATE INDEX jahia_indexingjob_index ON jahia_indexingjob (id_indexingjob); \ No newline at end of file Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/s= chema/mssql/jahia-schema.sql URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/mssql/jahia-schema.sql&re= v=3D17537&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 --- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/= mssql/jahia-schema.sql (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/= mssql/jahia-schema.sql Mon Jun 11 12:30:23 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: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/s= chema/mysql-tx/jahia-schema-index.sql URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/mysql-tx/jahia-schema-ind= ex.sql&rev=3D17537&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 --- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/= mysql-tx/jahia-schema-index.sql (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/= mysql-tx/jahia-schema-index.sql Mon Jun 11 12:30:23 2007 @@ -98,7 +98,7 @@ = 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_indexingjob_index ON jahia_indexingjob ; = @@ -218,6 +218,6 @@ = 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= ndexingjob_id, server_id); = CREATE INDEX jahia_indexingjob_index ON jahia_indexingjob (id_indexingjob); \ No newline at end of file Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/s= chema/mysql-tx/jahia-schema.sql URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/mysql-tx/jahia-schema.sql= &rev=3D17537&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 --- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/= mysql-tx/jahia-schema.sql (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/= mysql-tx/jahia-schema.sql Mon Jun 11 12:30:23 2007 @@ -1292,19 +1292,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: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/s= chema/mysql/jahia-schema-index.sql URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/mysql/jahia-schema-index.= sql&rev=3D17537&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 --- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/= mysql/jahia-schema-index.sql (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/= mysql/jahia-schema-index.sql Mon Jun 11 12:30:23 2007 @@ -100,7 +100,7 @@ = 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_indexingjob_index ON jahia_indexingjob ; = @@ -222,6 +222,6 @@ = 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= ndexingjob_id, server_id); = CREATE INDEX jahia_indexingjob_index ON jahia_indexingjob (id_indexingjob); \ No newline at end of file Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/s= chema/mysql/jahia-schema.sql URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/mysql/jahia-schema.sql&re= v=3D17537&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 --- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/= mysql/jahia-schema.sql (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/= mysql/jahia-schema.sql Mon Jun 11 12:30:23 2007 @@ -1183,17 +1183,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: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/s= chema/oracle/jahia-schema-index.sql URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/oracle/jahia-schema-index= .sql&rev=3D17537&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 --- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/= oracle/jahia-schema-index.sql (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/= oracle/jahia-schema-index.sql Mon Jun 11 12:30:23 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; @@ -82,8 +78,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; @@ -98,20 +92,11 @@ = DROP INDEX jahia_users_index2; = -DROP INDEX jahia_users_index3; - -DROP INDEX jahia_indexjobservers_index; - -DROP INDEX jahia_indexingjob_index; - +DROP INDEX jahia_indexingjobsserver_index; = = -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); @@ -190,8 +175,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); @@ -206,8 +189,4 @@ = 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: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/s= chema/oracle/jahia-schema.sql URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/oracle/jahia-schema.sql&r= ev=3D17537&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 --- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/= oracle/jahia-schema.sql (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/= oracle/jahia-schema.sql Mon Jun 11 12:30:23 2007 @@ -36,7 +36,7 @@ drop table jahia_grps cascade constraints; drop table jahia_homepages cascade constraints; drop table jahia_homepages_prop cascade constraints; -drop table jahia_indexingjobs cascade constraints; +drop table jahia_indexingjob cascade constraints; drop table jahia_indexingjobsserver cascade constraints; drop table jahia_link cascade constraints; drop table jahia_link_metadata cascade constraints; @@ -401,7 +401,7 @@ value_homepages_prop varchar2(255), primary key (id_jahia_homepages, sitekey_homepages_prop, name_homepage= s_prop) ); -create table jahia_indexingjobs ( +create table jahia_indexingjob ( id_indexingjob varchar2(50) not null, classname_indexingjob varchar2(255) not null, date_indexingjob number(19,0), @@ -415,10 +415,10 @@ primary key (id_indexingjob) ); create table jahia_indexingjobsserver ( - serverid varchar2(200) not null, - indexingjobid varchar2(50) not null, + server_id varchar2(200) not null, + indexingjob_id varchar2(50) not null, indexing_date number(19,0), - primary key (serverid, indexingjobid) + primary key (server_id, indexingjob_id) ); create table jahia_link ( id number(10,0) not null, Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/s= chema/postgresql/jahia-schema-index.sql URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/postgresql/jahia-schema-i= ndex.sql&rev=3D17537&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 --- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/= postgresql/jahia-schema-index.sql (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/= postgresql/jahia-schema-index.sql Mon Jun 11 12:30:23 2007 @@ -100,7 +100,7 @@ = DROP INDEX jahia_users_index3; = -DROP INDEX jahia_indexjobservers_index; +DROP INDEX jahia_indexingjobsserver_index; = DROP INDEX jahia_indexingjob_index; = @@ -222,6 +222,6 @@ = 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= ndexingjob_id, server_id); = CREATE INDEX jahia_indexingjob_index ON jahia_indexingjob (id_indexingjob); \ No newline at end of file Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/s= chema/postgresql/jahia-schema.sql URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/postgresql/jahia-schema.s= ql&rev=3D17537&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 --- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/= postgresql/jahia-schema.sql (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/= postgresql/jahia-schema.sql Mon Jun 11 12:30:23 2007 @@ -1306,18 +1306,18 @@ = = --------------------------------------------------------------------------= --- --- 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) ); = = _______________________________________________ cvs_list mailing list [email protected] http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
