Author: sshyrkov
Date: Tue Jun 19 15:55:20 2007
New Revision: 17642
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17642&repname=
=3Djahia
Log:
Rollback changes deone in JAHIA-1985 to the Jahia indexing tables
Modified:
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/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=3D17642&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 Tue Jun 19 15:55:20 2007
@@ -37,7 +37,7 @@
}
=
/**
- * @hibernate.property column=3D"server_id"
+ * @hibernate.property column=3D"serverid"
* length=3D"200"
*/
public String getServerId() {
@@ -50,7 +50,7 @@
}
=
/**
- * @hibernate.property column=3D"indexingjob_id"
+ * @hibernate.property column=3D"indexingjobid"
* 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=3D17642&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 Tue Jun 19 15:55:20 2007
@@ -32,7 +32,7 @@
* Time: 12:53:53
* To change this template use File | Settings | File Templates.
*
- * @hibernate.class table=3D"jahia_indexingjob"
+ * @hibernate.class table=3D"jahia_indexingjobs"
* @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=3D17642&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 Tue Jun 19 15:55:20 2007
@@ -102,7 +102,7 @@
=
DROP INDEX jahia_indexingjobsserver_index ON jahia_indexingjobsserver ;
=
-DROP INDEX jahia_indexingjob_index ON jahia_indexingjob ;
+DROP INDEX jahia_indexingjobs_index ON jahia_indexingjobs ;
=
=
=
@@ -222,6 +222,6 @@
=
CREATE INDEX jahia_users_index3 ON jahia_users (key_jahia_users);
=
-CREATE INDEX jahia_indexingjobsserver_index ON jahia_indexingjobsserver (i=
ndexingjob_id, server_id);
+CREATE INDEX jahia_indexingjobsserver_index ON jahia_indexingjobsserver (i=
ndexingjobid, serverid);
=
-CREATE INDEX jahia_indexingjob_index ON jahia_indexingjob (id_indexingjob);
\ No newline at end of file
+CREATE INDEX jahia_indexingjobs_index ON jahia_indexingjobs (id_indexingjo=
b);
\ 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=3D17642&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 Tue Jun 19 15:55:20 2007
@@ -1206,19 +1206,19 @@
=
CREATE TABLE jahia_indexingjobsserver
(
- indexingjob_id VARCHAR(50) NOT NULL,
- server_id VARCHAR(50) NOT NULL,
+ indexingjobid VARCHAR(50) NOT NULL,
+ serverid VARCHAR(50) NOT NULL,
indexing_date BIGINT NOT NULL,
- PRIMARY KEY(indexingjob_id,server_id)
+ PRIMARY KEY(indexingjobid,serverid)
);
=
-CREATE INDEX jahia_indexingjobsserver_index ON jahia_indexingjobsserver (=
indexingjob_id, server_id);
+CREATE INDEX jahia_indexingjobsserver_index ON jahia_indexingjobsserver (=
indexingjobid, serverid);
--------------------------------------------------------------------------=
---
--- jahia_indexingjob
+-- jahia_indexingjobs
--------------------------------------------------------------------------=
---
-drop table jahia_indexingjob if exists;
+drop table jahia_indexingjobs if exists;
=
-CREATE TABLE jahia_indexingjob
+CREATE TABLE jahia_indexingjobs
(
id_indexingjob VARCHAR(50) NOT NULL,
classname_indexingjob VARCHAR(150) NOT NULL,
@@ -1233,4 +1233,4 @@
PRIMARY KEY(id_indexingjob)
);
=
-CREATE INDEX jahia_indexingjob_index ON jahia_indexingjob (id_indexingjob=
);
+CREATE INDEX jahia_indexingjobs_index ON jahia_indexingjobs (id_indexingj=
ob);
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=3D17642&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 Tue Jun 19 15:55:20 2007
@@ -102,7 +102,7 @@
=
DROP INDEX jahia_indexingjobsserver_index ON jahia_indexingjobsserver ;
=
-DROP INDEX jahia_indexingjob_index ON jahia_indexingjob ;
+DROP INDEX jahia_indexingjobs_index ON jahia_indexingjobs ;
=
=
=
@@ -208,6 +208,6 @@
=
CREATE INDEX jahia_users_index3 ON jahia_users (key_jahia_users);
=
-CREATE INDEX jahia_indexingjobsserver_index ON jahia_indexingjobsserver (i=
ndexingjob_id, server_id);
+CREATE INDEX jahia_indexingjobsserver_index ON jahia_indexingjobsserver (i=
ndexingjobid, serverid);
=
-CREATE INDEX jahia_indexingjob_index ON jahia_indexingjob (id_indexingjob);
\ No newline at end of file
+CREATE INDEX jahia_indexingjobs_index ON jahia_indexingjobs (id_indexingjo=
b);
\ 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=3D17642&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 Tue Jun 19 15:55:20 2007
@@ -103,7 +103,7 @@
drop table jahia_grps;
drop table jahia_homepages;
drop table jahia_homepages_prop;
-drop table jahia_indexingjob;
+drop table jahia_indexingjobs;
drop table jahia_indexingjobsserver;
drop table jahia_link;
drop table jahia_link_metadata;
@@ -470,7 +470,7 @@
value_homepages_prop NVARCHAR(255) null,
primary key (id_jahia_homepages, sitekey_homepages_prop, name_homepage=
s_prop)
);
-create table jahia_indexingjob (
+create table jahia_indexingjobs (
id_indexingjob NVARCHAR(50) not null,
classname_indexingjob NVARCHAR(255) not null,
date_indexingjob numeric(19,0) null,
@@ -484,8 +484,8 @@
primary key (id_indexingjob)
);
create table jahia_indexingjobsserver (
- indexingjob_id NVARCHAR(50) not null,
- server_id NVARCHAR(255) null,
+ indexingjobid NVARCHAR(50) not null,
+ serverid NVARCHAR(255) null,
indexing_date numeric(19,0) null
);
create table jahia_link (
@@ -1018,8 +1018,8 @@
references jahia_homepages;
alter table jahia_indexingjobsserver
add constraint FK83742F90F50744
- foreign key (indexingjob_id)
- references jahia_indexingjob;
+ foreign key (indexingjobid)
+ references jahia_indexingjobs;
alter table jahia_markup_set
add constraint FK9140E0E11CF7BDC1
foreign key (markupdef_id)
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=3D17642&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 Tue Jun 19 15:55:20 2007
@@ -100,7 +100,7 @@
=
DROP INDEX jahia_indexingjobsserver_index ON jahia_indexingjobsserver ;
=
-DROP INDEX jahia_indexingjob_index ON jahia_indexingjob ;
+DROP INDEX jahia_indexingjobs_index ON jahia_indexingjobs ;
=
=
=
@@ -218,6 +218,6 @@
=
CREATE INDEX jahia_users_index3 ON jahia_users (key_jahia_users);
=
-CREATE INDEX jahia_indexingjobsserver_index ON jahia_indexingjobsserver (i=
ndexingjob_id, server_id);
+CREATE INDEX jahia_indexingjobsserver_index ON jahia_indexingjobsserver (i=
ndexingjobid, serverid);
=
-CREATE INDEX jahia_indexingjob_index ON jahia_indexingjob (id_indexingjob);
\ No newline at end of file
+CREATE INDEX jahia_indexingjobs_index ON jahia_indexingjobs (id_indexingjo=
b);
\ 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=3D17642&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 Tue Jun 19 15:55:20 2007
@@ -1294,20 +1294,20 @@
=
CREATE TABLE jahia_indexingjobsserver
(
- indexingjob_id VARCHAR(50) NOT NULL,
- server_id VARCHAR(50) NOT NULL,
+ indexingjobid VARCHAR(50) NOT NULL,
+ serverid VARCHAR(50) NOT NULL,
indexing_date BIGINT NOT NULL,
- PRIMARY KEY(indexingjob_id,server_id),
- INDEX jahia_indexingjobsserver_index (indexingjob_id, server_id));
+ PRIMARY KEY(indexingjobid,serverid),
+ INDEX jahia_indexingjobsserver_index (indexingjobid, serverid));
=
ALTER TABLE jahia_indexingjobsserver TYPE=3DInnoDB; =
=
# -----------------------------------------------------------------------
-# jahia_indexingjob
+# jahia_indexingjobs
# -----------------------------------------------------------------------
-drop table if exists jahia_indexingjob;
+drop table if exists jahia_indexingjobs;
=
-CREATE TABLE jahia_indexingjob
+CREATE TABLE jahia_indexingjobs
(
id_indexingjob VARCHAR(50) NOT NULL,
classname_indexingjob VARCHAR(150) NOT NULL,
@@ -1320,9 +1320,9 @@
pageid_indexingjob INTEGER,
fieldid_indexingjob INTEGER,
PRIMARY KEY(id_indexingjob),
- INDEX jahia_indexingjob_index (id_indexingjob));
+ INDEX jahia_indexingjobs_index (id_indexingjob));
=
-ALTER TABLE jahia_indexingjob TYPE=3DInnoDB; =
+ALTER TABLE jahia_indexingjobs TYPE=3DInnoDB; =
=
=
=
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=3D17642&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 Tue Jun 19 15:55:20 2007
@@ -102,7 +102,7 @@
=
DROP INDEX jahia_indexingjobsserver_index ON jahia_indexingjobsserver ;
=
-DROP INDEX jahia_indexingjob_index ON jahia_indexingjob ;
+DROP INDEX jahia_indexingjobs_index ON jahia_indexingjobs ;
=
=
=
@@ -222,6 +222,6 @@
=
CREATE INDEX jahia_users_index3 ON jahia_users (key_jahia_users);
=
-CREATE INDEX jahia_indexingjobsserver_index ON jahia_indexingjobsserver (i=
ndexingjob_id, server_id);
+CREATE INDEX jahia_indexingjobsserver_index ON jahia_indexingjobsserver (i=
ndexingjobid, serverid);
=
-CREATE INDEX jahia_indexingjob_index ON jahia_indexingjob (id_indexingjob);
\ No newline at end of file
+CREATE INDEX jahia_indexingjobs_index ON jahia_indexingjobs (id_indexingjo=
b);
\ 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=3D17642&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 Tue Jun 19 15:55:20 2007
@@ -1185,18 +1185,18 @@
=
CREATE TABLE jahia_indexingjobsserver
(
- indexingjob_id VARCHAR(50) NOT NULL,
- server_id VARCHAR(50) NOT NULL,
+ indexingjobid VARCHAR(50) NOT NULL,
+ serverid VARCHAR(50) NOT NULL,
indexing_date BIGINT NOT NULL,
- PRIMARY KEY(indexingjob_id,server_id),
- INDEX jahia_indexingjobsserver_index (indexingjob_id, server_id));
+ PRIMARY KEY(indexingjobid,serverid),
+ INDEX jahia_indexingjobsserver_index (indexingjobid, serverid));
=
# -----------------------------------------------------------------------
-# jahia_indexingjob
+# jahia_indexingjobs
# -----------------------------------------------------------------------
-drop table if exists jahia_indexingjob;
+drop table if exists jahia_indexingjobs;
=
-CREATE TABLE jahia_indexingjob
+CREATE TABLE jahia_indexingjobs
(
id_indexingjob VARCHAR(50) NOT NULL,
classname_indexingjob VARCHAR(150) NOT NULL,
@@ -1209,4 +1209,4 @@
pageid_indexingjob INTEGER,
fieldid_indexingjob INTEGER,
PRIMARY KEY(id_indexingjob),
- INDEX jahia_indexingjob_index (id_indexingjob));
+ INDEX jahia_indexingjobs_index (id_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=3D17642&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 Tue Jun 19 15:55:20 2007
@@ -189,4 +189,4 @@
=
CREATE INDEX jahia_users_index2 ON jahia_users (siteid_jahia_users);
=
-CREATE INDEX jahia_indexingjobsserver_index ON jahia_indexingjobsserver (i=
ndexingjob_id, server_id);
+CREATE INDEX jahia_indexingjobsserver_index ON jahia_indexingjobsserver (i=
ndexingjobid, serverid);
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=3D17642&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 Tue Jun 19 15:55:20 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_indexingjob cascade constraints;
+drop table jahia_indexingjobs 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_indexingjob (
+create table jahia_indexingjobs (
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 (
- server_id varchar2(200) not null,
- indexingjob_id varchar2(50) not null,
+ serverid varchar2(200) not null,
+ indexingjobid varchar2(50) not null,
indexing_date number(19,0),
- primary key (server_id, indexingjob_id)
+ primary key (serverid, indexingjobid)
);
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=3D17642&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 Tue Jun 19 15:55:20 2007
@@ -102,7 +102,7 @@
=
DROP INDEX jahia_indexingjobsserver_index;
=
-DROP INDEX jahia_indexingjob_index;
+DROP INDEX jahia_indexingjobs_index;
=
=
=
@@ -222,6 +222,6 @@
=
CREATE INDEX jahia_users_index3 ON jahia_users (key_jahia_users);
=
-CREATE INDEX jahia_indexingjobsserver_index ON jahia_indexingjobsserver (i=
ndexingjob_id, server_id);
+CREATE INDEX jahia_indexingjobsserver_index ON jahia_indexingjobsserver (i=
ndexingjobid, serverid);
=
-CREATE INDEX jahia_indexingjob_index ON jahia_indexingjob (id_indexingjob);
\ No newline at end of file
+CREATE INDEX jahia_indexingjobs_index ON jahia_indexingjobs (id_indexingjo=
b);
\ 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=3D17642&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 Tue Jun 19 15:55:20 2007
@@ -1310,10 +1310,10 @@
=
CREATE TABLE jahia_indexingjobsserver
(
- indexingjob_id VARCHAR(50) NOT NULL,
- server_id VARCHAR(50) NOT NULL,
+ indexingjobid VARCHAR(50) NOT NULL,
+ serverid VARCHAR(50) NOT NULL,
indexing_date INT8 NOT NULL,
- PRIMARY KEY (indexingjob_id,server_id)
+ PRIMARY KEY (indexingjobid,serverid)
);
=
=
@@ -1321,13 +1321,13 @@
=
=
--------------------------------------------------------------------------=
---
--- jahia_indexingjob
+-- jahia_indexingjobs
--------------------------------------------------------------------------=
---
-DROP TABLE jahia_indexingjob CASCADE;
+DROP TABLE jahia_indexingjobs CASCADE;
=
=
=
-CREATE TABLE jahia_indexingjob
+CREATE TABLE jahia_indexingjobs
(
id_indexingjob VARCHAR(50) NOT NULL,
classname_indexingjob VARCHAR(150) NOT NULL,
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
