Author: tdraier
Date: Wed Jul 11 18:14:15 2007
New Revision: 17940
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17940&repname=
=3Djahia
Log:
fixed schemas for mysql, regenerates all schemas
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/model/Ja=
hiaPagesDefProp.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/model/Ja=
hiaPagesPropPK.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/model/Ja=
hiaStatistics.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/model/Ja=
hiaUserPropPK.java
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.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.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/JahiaPagesDefProp.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/hibernate/model/JahiaPagesDefProp.java&rev=
=3D17940&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/Ja=
hiaPagesDefProp.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/model/Ja=
hiaPagesDefProp.java Wed Jul 11 18:14:15 2007
@@ -72,7 +72,7 @@
=
/**
* @hibernate.property column=3D"value_pages_def_prop"
- * length=3D"250"
+ * length=3D"200"
*/
public String getValue() {
return this.value;
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/mo=
del/JahiaPagesPropPK.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/hibernate/model/JahiaPagesPropPK.java&rev=
=3D17940&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/Ja=
hiaPagesPropPK.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/model/Ja=
hiaPagesPropPK.java Wed Jul 11 18:14:15 2007
@@ -72,7 +72,7 @@
=
/**
* @hibernate.property column=3D"prop_name"
- * length=3D"255"
+ * length=3D"150"
*/
public String getName() {
return this.name;
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/mo=
del/JahiaStatistics.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/hibernate/model/JahiaStatistics.java&rev=3D=
17940&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/Ja=
hiaStatistics.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/model/Ja=
hiaStatistics.java Wed Jul 11 18:14:15 2007
@@ -271,7 +271,7 @@
=
/**
* @hibernate.property type=3D"string" length=3D"255"
- * @hibernate.column name=3D"siteid_jahia_statistics" index=3D"js_idx_=
srch" =
+ * @hibernate.column name=3D"siteid_jahia_statistics"
*/
public String getSiteid() {
return siteid;
@@ -282,7 +282,7 @@
=
/**
* @hibernate.property type=3D"string" length=3D"20"
- * @hibernate.column name=3D"objecttype_jahia_statistics" index=3D"js_=
idx_srch" =
+ * @hibernate.column name=3D"objecttype_jahia_statistics"
*/
public String getObjecttype() {
return objecttype;
@@ -306,7 +306,7 @@
=
/**
* @hibernate.property type=3D"string" length=3D"20"
- * @hibernate.column name=3D"actionid_jahia_statistics" index=3D"js_id=
x_srch" =
+ * @hibernate.column name=3D"actionid_jahia_statistics"
*/
public String getActionid() {
return actionid;
@@ -330,7 +330,7 @@
=
/**
* @hibernate.property type=3D"integer"
- * @hibernate.column name=3D"year_jahia_statistics" index=3D"js_idx_sr=
ch" =
+ * @hibernate.column name=3D"year_jahia_statistics"
*/
public Integer getYear() {
return year;
@@ -341,7 +341,7 @@
=
/**
* @hibernate.property type=3D"integer"
- * @hibernate.column name=3D"month_jahia_statistics" index=3D"js_idx_s=
rch" =
+ * @hibernate.column name=3D"month_jahia_statistics"
*/
public Integer getMonth() {
return month;
@@ -376,7 +376,7 @@
=
/**
* @hibernate.property type=3D"integer"
- * @hibernate.column name=3D"day_jahia_statistics" index=3D"js_idx_src=
h" =
+ * @hibernate.column name=3D"day_jahia_statistics"
*/
public Integer getDay() {
return day;
@@ -398,7 +398,7 @@
}
=
/**
- * @hibernate.property =
+ * @hibernate.property
* column=3D"level0_jahia_statistics"
* type=3D"string"
* length=3D"255"
@@ -411,7 +411,7 @@
}
=
/**
- * @hibernate.property =
+ * @hibernate.property
* column=3D"level1_jahia_statistics"
* type=3D"string"
* length=3D"255"
@@ -424,7 +424,7 @@
}
=
/**
- * @hibernate.property =
+ * @hibernate.property
* column=3D"level2_jahia_statistics"
* type=3D"string"
* length=3D"255"
@@ -437,7 +437,7 @@
}
=
/**
- * @hibernate.property =
+ * @hibernate.property
* column=3D"level3_jahia_statistics"
* type=3D"string"
* length=3D"255"
@@ -450,7 +450,7 @@
}
=
/**
- * @hibernate.property =
+ * @hibernate.property
* column=3D"level4_jahia_statistics"
* type=3D"string"
* length=3D"255"
@@ -463,7 +463,7 @@
}
=
/**
- * @hibernate.property =
+ * @hibernate.property
* column=3D"level5_jahia_statistics"
* type=3D"string"
* length=3D"255"
@@ -474,7 +474,7 @@
public void setLevel5(String level5) {
this.level5 =3D level5;
}
- =
+
public String toString() {
return "serverid: " + this.comp_id.getServerid() + =
"id: " + this.comp_id.getId();
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/mo=
del/JahiaUserPropPK.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/hibernate/model/JahiaUserPropPK.java&rev=3D=
17940&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/Ja=
hiaUserPropPK.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/model/Ja=
hiaUserPropPK.java Wed Jul 11 18:14:15 2007
@@ -79,7 +79,7 @@
=
/**
* @hibernate.property column=3D"name_jahia_user_prop"
- * length=3D"255"
+ * length=3D"150"
*/
public String getName() {
return this.name;
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=3D17940&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 Wed Jul 11 18:14:15 2007
@@ -525,12 +525,12 @@
id_jahia_pages_def_prop integer not null,
jahiaid_pages_def_prop integer not null,
name_pages_def_prop varchar(100) not null,
- value_pages_def_prop varchar(250),
+ value_pages_def_prop varchar(200),
primary key (id_jahia_pages_def_prop, jahiaid_pages_def_prop, name_pag=
es_def_prop)
);
create table jahia_pages_prop (
page_id integer not null,
- prop_name varchar(255) not null,
+ prop_name varchar(150) not null,
language_code varchar(100) not null,
prop_value varchar(255),
primary key (page_id, prop_name, language_code)
@@ -750,7 +750,7 @@
);
create table jahia_user_prop (
id_jahia_users integer not null,
- name_jahia_user_prop varchar(255) not null,
+ name_jahia_user_prop varchar(150) not null,
provider_jahia_user_prop varchar(50) not null,
userkey_jahia_user_prop varchar(50) not null,
value_jahia_user_prop varchar(255),
@@ -985,4 +985,3 @@
add constraint FK17554649A2228D92 =
foreign key (indexjob_id) =
references jahia_slideindexingjob;
-create index js_idx_srch on jahia_statistics (siteid_jahia_statistics, obj=
ecttype_jahia_statistics, actionid_jahia_statistics, year_jahia_statistics,=
month_jahia_statistics, day_jahia_statistics);
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=3D17940&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 Wed Jul 11 18:14:15 2007
@@ -522,12 +522,12 @@
id_jahia_pages_def_prop int not null,
jahiaid_pages_def_prop int not null,
name_pages_def_prop nvarchar(100) not null,
- value_pages_def_prop nvarchar(250) null,
+ value_pages_def_prop nvarchar(200) null,
primary key (id_jahia_pages_def_prop, jahiaid_pages_def_prop, name_pag=
es_def_prop)
);
create table jahia_pages_prop (
page_id int not null,
- prop_name nvarchar(255) not null,
+ prop_name nvarchar(150) not null,
language_code nvarchar(100) not null,
prop_value nvarchar(255) null,
primary key (page_id, prop_name, language_code)
@@ -745,7 +745,7 @@
);
create table jahia_user_prop (
id_jahia_users int not null,
- name_jahia_user_prop nvarchar(255) not null,
+ name_jahia_user_prop nvarchar(150) not null,
provider_jahia_user_prop nvarchar(50) not null,
userkey_jahia_user_prop nvarchar(50) not null,
value_jahia_user_prop nvarchar(255) null,
@@ -979,4 +979,3 @@
add constraint FK17554649A2228D92 =
foreign key (indexjob_id) =
references jahia_slideindexingjob;
-create index js_idx_srch on jahia_statistics (siteid_jahia_statistics, obj=
ecttype_jahia_statistics, actionid_jahia_statistics, year_jahia_statistics,=
month_jahia_statistics, day_jahia_statistics);
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=3D17940&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 Wed Jul 11 18:14:15 2007
@@ -522,12 +522,12 @@
id_jahia_pages_def_prop integer not null,
jahiaid_pages_def_prop integer not null,
name_pages_def_prop varchar(100) not null,
- value_pages_def_prop varchar(250),
+ value_pages_def_prop varchar(200),
primary key (id_jahia_pages_def_prop, jahiaid_pages_def_prop, name_pag=
es_def_prop)
);
create table jahia_pages_prop (
page_id integer not null,
- prop_name varchar(255) not null,
+ prop_name varchar(150) not null,
language_code varchar(100) not null,
prop_value varchar(255),
primary key (page_id, prop_name, language_code)
@@ -745,7 +745,7 @@
);
create table jahia_user_prop (
id_jahia_users integer not null,
- name_jahia_user_prop varchar(255) not null,
+ name_jahia_user_prop varchar(150) not null,
provider_jahia_user_prop varchar(50) not null,
userkey_jahia_user_prop varchar(50) not null,
value_jahia_user_prop varchar(255),
@@ -1032,4 +1032,3 @@
add constraint FK17554649A2228D92 =
foreign key (indexjob_id) =
references jahia_slideindexingjob (id_slideindexingjob);
-create index js_idx_srch on jahia_statistics (siteid_jahia_statistics, obj=
ecttype_jahia_statistics, actionid_jahia_statistics, year_jahia_statistics,=
month_jahia_statistics, day_jahia_statistics);
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=3D17940&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 Wed Jul 11 18:14:15 2007
@@ -469,12 +469,12 @@
id_jahia_pages_def_prop number(10,0) not null,
jahiaid_pages_def_prop number(10,0) not null,
name_pages_def_prop varchar2(100) not null,
- value_pages_def_prop varchar2(250),
+ value_pages_def_prop varchar2(200),
primary key (id_jahia_pages_def_prop, jahiaid_pages_def_prop, name_pag=
es_def_prop)
);
create table jahia_pages_prop (
page_id number(10,0) not null,
- prop_name varchar2(255) not null,
+ prop_name varchar2(150) not null,
language_code varchar2(100) not null,
prop_value varchar2(255),
primary key (page_id, prop_name, language_code)
@@ -692,7 +692,7 @@
);
create table jahia_user_prop (
id_jahia_users number(10,0) not null,
- name_jahia_user_prop varchar2(255) not null,
+ name_jahia_user_prop varchar2(150) not null,
provider_jahia_user_prop varchar2(50) not null,
userkey_jahia_user_prop varchar2(50) not null,
value_jahia_user_prop varchar2(255),
@@ -926,4 +926,3 @@
add constraint FK17554649A2228D92 =
foreign key (indexjob_id) =
references jahia_slideindexingjob;
-create index js_idx_srch on jahia_statistics (siteid_jahia_statistics, obj=
ecttype_jahia_statistics, actionid_jahia_statistics, year_jahia_statistics,=
month_jahia_statistics, day_jahia_statistics);
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=3D17940&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 Wed Jul 11 18:14:15 2007
@@ -522,12 +522,12 @@
id_jahia_pages_def_prop int4 not null,
jahiaid_pages_def_prop int4 not null,
name_pages_def_prop varchar(100) not null,
- value_pages_def_prop varchar(250),
+ value_pages_def_prop varchar(200),
primary key (id_jahia_pages_def_prop, jahiaid_pages_def_prop, name_pag=
es_def_prop)
);
create table jahia_pages_prop (
page_id int4 not null,
- prop_name varchar(255) not null,
+ prop_name varchar(150) not null,
language_code varchar(100) not null,
prop_value varchar(255),
primary key (page_id, prop_name, language_code)
@@ -745,7 +745,7 @@
);
create table jahia_user_prop (
id_jahia_users int4 not null,
- name_jahia_user_prop varchar(255) not null,
+ name_jahia_user_prop varchar(150) not null,
provider_jahia_user_prop varchar(50) not null,
userkey_jahia_user_prop varchar(50) not null,
value_jahia_user_prop varchar(255),
@@ -979,4 +979,3 @@
add constraint FK17554649A2228D92 =
foreign key (indexjob_id) =
references jahia_slideindexingjob;
-create index js_idx_srch on jahia_statistics (siteid_jahia_statistics, obj=
ecttype_jahia_statistics, actionid_jahia_statistics, year_jahia_statistics,=
month_jahia_statistics, day_jahia_statistics);
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
