mromy 2005/04/29 17:13:17 CEST
Modified files:
src/scripts/mysql mediumint_to_integer.sql
varchar_changes.sql
Log:
- added not null for mysql 4.0 compatibility
Revision Changes Path
1.4 +30 -31 jahia_update/src/scripts/mysql/mediumint_to_integer.sql
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia_update/src/scripts/mysql/mediumint_to_integer.sql.diff?r1=1.3&r2=1.4&f=h
1.2 +8 -8 jahia_update/src/scripts/mysql/varchar_changes.sql
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia_update/src/scripts/mysql/varchar_changes.sql.diff?r1=1.1&r2=1.2&f=h
Index: mediumint_to_integer.sql
===================================================================
RCS file: /cvs/jahia_update/src/scripts/mysql/mediumint_to_integer.sql,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mediumint_to_integer.sql 29 Apr 2005 13:36:07 -0000 1.3
+++ mediumint_to_integer.sql 29 Apr 2005 15:13:16 -0000 1.4
@@ -21,7 +21,7 @@
ALTER TABLE jahia_app_def MODIFY COLUMN shared_jahia_app_def INTEGER;
ALTER TABLE jahia_app_def MODIFY COLUMN rights_jahia_app_def INTEGER;
-ALTER TABLE jahia_appdef_prop MODIFY COLUMN appdefid_appdef_prop INTEGER;
+ALTER TABLE jahia_appdef_prop MODIFY COLUMN appdefid_appdef_prop INTEGER not
null;
ALTER TABLE jahia_audit_log MODIFY COLUMN id_jahia_audit_log INTEGER;
ALTER TABLE jahia_audit_log MODIFY COLUMN objecttype_jahia_audit_log INTEGER;
@@ -31,10 +31,10 @@
ALTER TABLE jahia_autoids MODIFY COLUMN jahia_autoids_currentindex INTEGER;
-ALTER TABLE jahia_category MODIFY COLUMN id_category INTEGER;
-ALTER TABLE jahia_category MODIFY COLUMN aclid_category INTEGER;
+ALTER TABLE jahia_category MODIFY COLUMN id_category INTEGER not null;
+ALTER TABLE jahia_category MODIFY COLUMN aclid_category INTEGER not null;
-ALTER TABLE jahia_category_prop MODIFY COLUMN id_category INTEGER;
+ALTER TABLE jahia_category_prop MODIFY COLUMN id_category INTEGER not null;
ALTER TABLE jahia_ctn_def MODIFY COLUMN id_jahia_ctn_def INTEGER;
ALTER TABLE jahia_ctn_def MODIFY COLUMN jahiaid_jahia_ctn_def INTEGER;
@@ -45,28 +45,28 @@
ALTER TABLE jahia_ctn_def_properties MODIFY COLUMN
pagedefid_jahia_ctn_def_prop INTEGER;
-ALTER TABLE jahia_ctn_entries MODIFY COLUMN id_jahia_ctn_entries INTEGER;
+ALTER TABLE jahia_ctn_entries MODIFY COLUMN id_jahia_ctn_entries INTEGER not
null;
ALTER TABLE jahia_ctn_entries MODIFY COLUMN jahiaid_jahia_ctn_entries
INTEGER;
ALTER TABLE jahia_ctn_entries MODIFY COLUMN pageid_jahia_ctn_entries INTEGER;
ALTER TABLE jahia_ctn_entries MODIFY COLUMN listid_jahia_ctn_entries INTEGER;
ALTER TABLE jahia_ctn_entries MODIFY COLUMN ctndefid_jahia_ctn_entries
INTEGER;
ALTER TABLE jahia_ctn_entries MODIFY COLUMN rank_jahia_ctn_entries INTEGER;
ALTER TABLE jahia_ctn_entries MODIFY COLUMN rights_jahia_ctn_entries INTEGER;
-ALTER TABLE jahia_ctn_entries MODIFY COLUMN workflow_state INTEGER;
+ALTER TABLE jahia_ctn_entries MODIFY COLUMN workflow_state INTEGER not null;
-ALTER TABLE jahia_ctn_lists MODIFY COLUMN id_jahia_ctn_lists INTEGER;
+ALTER TABLE jahia_ctn_lists MODIFY COLUMN id_jahia_ctn_lists INTEGER not
null;
ALTER TABLE jahia_ctn_lists MODIFY COLUMN parententryid_jahia_ctn_lists
INTEGER;
ALTER TABLE jahia_ctn_lists MODIFY COLUMN pageid_jahia_ctn_lists INTEGER;
ALTER TABLE jahia_ctn_lists MODIFY COLUMN ctndefid_jahia_ctn_lists INTEGER;
ALTER TABLE jahia_ctn_lists MODIFY COLUMN rights_jahia_ctn_lists INTEGER;
-ALTER TABLE jahia_ctn_lists MODIFY COLUMN workflow_state INTEGER;
+ALTER TABLE jahia_ctn_lists MODIFY COLUMN workflow_state INTEGER not null;
ALTER TABLE jahia_ctn_struct MODIFY COLUMN ctnsubdefid_jahia_ctn_struct
INTEGER;
ALTER TABLE jahia_ctn_struct MODIFY COLUMN objtype_jahia_ctn_struct INTEGER;
ALTER TABLE jahia_ctn_struct MODIFY COLUMN objdefid_jahia_ctn_struct INTEGER;
ALTER TABLE jahia_ctn_struct MODIFY COLUMN rank_jahia_ctn_struct INTEGER;
-ALTER TABLE jahia_fields_data MODIFY COLUMN id_jahia_fields_data INTEGER;
+ALTER TABLE jahia_fields_data MODIFY COLUMN id_jahia_fields_data INTEGER not
null;
ALTER TABLE jahia_fields_data MODIFY COLUMN jahiaid_jahia_fields_data
INTEGER;
ALTER TABLE jahia_fields_data MODIFY COLUMN pageid_jahia_fields_data INTEGER;
ALTER TABLE jahia_fields_data MODIFY COLUMN ctnid_jahia_fields_data INTEGER;
@@ -75,7 +75,7 @@
ALTER TABLE jahia_fields_data MODIFY COLUMN connecttype_jahia_fields_data
INTEGER;
ALTER TABLE jahia_fields_data MODIFY COLUMN rank_jahia_fields_data INTEGER;
ALTER TABLE jahia_fields_data MODIFY COLUMN rights_jahia_fields_data INTEGER;
-ALTER TABLE jahia_fields_data MODIFY COLUMN workflow_state INTEGER;
+ALTER TABLE jahia_fields_data MODIFY COLUMN workflow_state INTEGER not null;
ALTER TABLE jahia_fields_def MODIFY COLUMN id_jahia_fields_def INTEGER;
ALTER TABLE jahia_fields_def MODIFY COLUMN jahiaid_jahia_fields_def INTEGER;
@@ -85,16 +85,16 @@
ALTER TABLE jahia_fields_def_prop MODIFY COLUMN pdefid_jahia_fields_def_prop
INTEGER;
ALTER TABLE jahia_fields_def_prop MODIFY COLUMN type_jahia_fields_def_prop
INTEGER;
-ALTER TABLE jahia_fields_def_extprop MODIFY COLUMN id_jahia_fields_def
INTEGER;
+ALTER TABLE jahia_fields_def_extprop MODIFY COLUMN id_jahia_fields_def
INTEGER not null;
ALTER TABLE jahia_fields_prop MODIFY COLUMN fieldid_jahia_fields_prop
INTEGER;
-ALTER TABLE jahia_file_fields MODIFY COLUMN id_jahia_filefield INTEGER;
+ALTER TABLE jahia_file_fields MODIFY COLUMN id_jahia_filefield INTEGER not
null ;
ALTER TABLE jahia_filemgr MODIFY COLUMN id_jahia_filemgr INTEGER;
ALTER TABLE jahia_filemgr MODIFY COLUMN ownerid_jahia_filemgr INTEGER;
-ALTER TABLE jahia_filemgr_files MODIFY COLUMN id_jahia_file INTEGER;
+ALTER TABLE jahia_filemgr_files MODIFY COLUMN id_jahia_file INTEGER not null;
ALTER TABLE jahia_filemgr_files MODIFY COLUMN filemgrid_jahia_file INTEGER;
ALTER TABLE jahia_filemgr_files MODIFY COLUMN fldid_jahia_file INTEGER;
ALTER TABLE jahia_filemgr_files MODIFY COLUMN pageid_jahia_file INTEGER;
@@ -110,9 +110,9 @@
ALTER TABLE jahia_grps MODIFY COLUMN id_jahia_grps INTEGER;
ALTER TABLE jahia_grps MODIFY COLUMN siteid_jahia_grps INTEGER;
-ALTER TABLE jahia_grp_prop MODIFY COLUMN id_jahia_grp INTEGER;
+ALTER TABLE jahia_grp_prop MODIFY COLUMN id_jahia_grp INTEGER not null;
-ALTER TABLE jahia_pages_data MODIFY COLUMN id_jahia_pages_data INTEGER;
+ALTER TABLE jahia_pages_data MODIFY COLUMN id_jahia_pages_data INTEGER not
null;
ALTER TABLE jahia_pages_data MODIFY COLUMN jahiaid_jahia_pages_data INTEGER;
ALTER TABLE jahia_pages_data MODIFY COLUMN parentid_jahia_pages_data INTEGER;
ALTER TABLE jahia_pages_data MODIFY COLUMN pagetype_jahia_pages_data INTEGER;
@@ -120,7 +120,7 @@
ALTER TABLE jahia_pages_data MODIFY COLUMN pagelinkid_jahia_pages_data
INTEGER;
ALTER TABLE jahia_pages_data MODIFY COLUMN counter_jahia_pages_data INTEGER;
ALTER TABLE jahia_pages_data MODIFY COLUMN rights_jahia_pages_data INTEGER;
-ALTER TABLE jahia_pages_data MODIFY COLUMN workflow_state INTEGER;
+ALTER TABLE jahia_pages_data MODIFY COLUMN workflow_state INTEGER not null;
ALTER TABLE jahia_pages_def MODIFY COLUMN id_jahia_pages_def INTEGER;
ALTER TABLE jahia_pages_def MODIFY COLUMN jahiaid_jahia_pages_def INTEGER;
@@ -141,7 +141,7 @@
ALTER TABLE jahia_sites MODIFY COLUMN webapps_deploymode_jahia_sites INTEGER;
ALTER TABLE jahia_sites MODIFY COLUMN rights_jahia_sites INTEGER;
-ALTER TABLE jahia_user_prop MODIFY COLUMN id_jahia_users INTEGER;
+ALTER TABLE jahia_user_prop MODIFY COLUMN id_jahia_users INTEGER not null;
ALTER TABLE jahia_users MODIFY COLUMN id_jahia_users INTEGER;
ALTER TABLE jahia_users MODIFY COLUMN siteid_jahia_users INTEGER;
@@ -170,39 +170,38 @@
ALTER TABLE jahia_ctnlists_prop MODIFY COLUMN ctnlistid_ctnlists_prop
INTEGER;
ALTER TABLE jahia_ctnlists_prop MODIFY COLUMN jahiaid_ctnlists_prop INTEGER;
-ALTER TABLE jahia_ctnentries_prop MODIFY COLUMN ctnid_ctnentries_prop
INTEGER;
+ALTER TABLE jahia_ctnentries_prop MODIFY COLUMN ctnid_ctnentries_prop
INTEGER not null;
ALTER TABLE jahia_ctnentries_prop MODIFY COLUMN jahiaid_ctnentries_prop
INTEGER;
-ALTER TABLE jahia_site_lang_list MODIFY COLUMN id INTEGER;
+ALTER TABLE jahia_site_lang_list MODIFY COLUMN id INTEGER not null;
ALTER TABLE jahia_site_lang_list MODIFY COLUMN site_id INTEGER;
ALTER TABLE jahia_site_lang_list MODIFY COLUMN rank INTEGER;
ALTER TABLE jahia_site_lang_list MODIFY COLUMN activated INTEGER;
ALTER TABLE jahia_site_lang_list MODIFY COLUMN mandatory INTEGER;
-ALTER TABLE jahia_site_lang_maps MODIFY COLUMN id INTEGER;
+ALTER TABLE jahia_site_lang_maps MODIFY COLUMN id INTEGER not null;
ALTER TABLE jahia_site_lang_maps MODIFY COLUMN site_id INTEGER;
-ALTER TABLE jahia_pages_prop MODIFY COLUMN page_id INTEGER;
+ALTER TABLE jahia_pages_prop MODIFY COLUMN page_id INTEGER not null;
-ALTER TABLE jahia_link MODIFY COLUMN id INTEGER;
+ALTER TABLE jahia_link MODIFY COLUMN id INTEGER not null;
ALTER TABLE jahia_link MODIFY COLUMN status INTEGER;
-ALTER TABLE jahia_link_metadata MODIFY COLUMN link_id INTEGER;
+ALTER TABLE jahia_link_metadata MODIFY COLUMN link_id INTEGER not null;
-ALTER TABLE jahia_markupdef MODIFY COLUMN id_markup INTEGER;
+ALTER TABLE jahia_markupdef MODIFY COLUMN id_markup INTEGER not null;
ALTER TABLE jahia_markupdef MODIFY COLUMN case_sensitive INTEGER;
-ALTER TABLE jahia_markupdef_prop MODIFY COLUMN id_markup INTEGER;
+ALTER TABLE jahia_markupdef_prop MODIFY COLUMN id_markup INTEGER not null;
-ALTER TABLE jahia_markup_set MODIFY COLUMN setting_id INTEGER;
+ALTER TABLE jahia_markup_set MODIFY COLUMN setting_id INTEGER not null;
ALTER TABLE jahia_markup_set MODIFY COLUMN markupdef_id INTEGER;
ALTER TABLE jahia_markup_set MODIFY COLUMN apply_to_all_site INTEGER;
-ALTER TABLE jahia_markup_set_prop MODIFY COLUMN setting_id INTEGER;
-ALTER TABLE jahia_markup_set_prop MODIFY COLUMN setting_id INTEGER;
+ALTER TABLE jahia_markup_set_prop MODIFY COLUMN setting_id INTEGER not null;
-ALTER TABLE jahia_markup_set_site MODIFY COLUMN site_id INTEGER;
-ALTER TABLE jahia_markup_set_site MODIFY COLUMN setting_id INTEGER;
+ALTER TABLE jahia_markup_set_site MODIFY COLUMN site_id INTEGER not null;
+ALTER TABLE jahia_markup_set_site MODIFY COLUMN setting_id INTEGER not null;
-ALTER TABLE jahia_locks MODIFY COLUMN targetid_locks INTEGER;
+ALTER TABLE jahia_locks MODIFY COLUMN targetid_locks INTEGER not null;
ALTER TABLE jahia_locks MODIFY COLUMN timeout_locks INTEGER;
\ No newline at end of file
Index: varchar_changes.sql
===================================================================
RCS file: /cvs/jahia_update/src/scripts/mysql/varchar_changes.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- varchar_changes.sql 29 Apr 2005 14:10:07 -0000 1.1
+++ varchar_changes.sql 29 Apr 2005 15:13:16 -0000 1.2
@@ -1,10 +1,10 @@
-ALTER TABLE jahia_grp_prop MODIFY name_jahia_grp_prop varchar(150);
+ALTER TABLE jahia_grp_prop MODIFY name_jahia_grp_prop varchar(150) not null;
ALTER TABLE jahia_link MODIFY left_oid varchar(100);
ALTER TABLE jahia_link MODIFY right_oid varchar(100);
ALTER TABLE jahia_link MODIFY type varchar(100);
ALTER TABLE jahia_pages_def_prop MODIFY value_pages_def_prop varchar(200);
-ALTER TABLE jahia_pages_prop MODIFY prop_name varchar(150);
-ALTER TABLE jahia_pages_prop MODIFY language_code varchar(20);
+ALTER TABLE jahia_pages_prop MODIFY prop_name varchar(150) not null;
+ALTER TABLE jahia_pages_prop MODIFY language_code varchar(20) not null;
ALTER TABLE jahia_slide_branches MODIFY uri varchar(200);
ALTER TABLE jahia_slide_branches MODIFY slidens varchar(50);
ALTER TABLE jahia_slide_children MODIFY uri varchar(200);
@@ -17,16 +17,16 @@
ALTER TABLE jahia_slide_latestrev MODIFY slidens varchar(50);
ALTER TABLE jahia_slide_locks MODIFY object varchar(200);
ALTER TABLE jahia_slide_locks MODIFY slidens varchar(50);
-ALTER TABLE jahia_slide_objects MODIFY uri varchar(200);
-ALTER TABLE jahia_slide_objects MODIFY slidens varchar(50);
+ALTER TABLE jahia_slide_objects MODIFY uri varchar(200) not null;
+ALTER TABLE jahia_slide_objects MODIFY slidens varchar(50) not null;
ALTER TABLE jahia_slide_permissions MODIFY object varchar(200);
ALTER TABLE jahia_slide_permissions MODIFY slidens varchar(50);
ALTER TABLE jahia_slide_property MODIFY uri varchar(200);
ALTER TABLE jahia_slide_property MODIFY slidens varchar(50);
ALTER TABLE jahia_slide_revision MODIFY uri varchar(200);
ALTER TABLE jahia_slide_revision MODIFY slidens varchar(50);
-ALTER TABLE jahia_slide_revisions MODIFY uri varchar(200);
-ALTER TABLE jahia_slide_revisions MODIFY slidens varchar(50);
+ALTER TABLE jahia_slide_revisions MODIFY uri varchar(200) not null;
+ALTER TABLE jahia_slide_revisions MODIFY slidens varchar(50) not null;
ALTER TABLE jahia_slide_workingrev MODIFY uri varchar(200);
ALTER TABLE jahia_slide_workingrev MODIFY slidens varchar(50);
-ALTER TABLE jahia_user_prop MODIFY name_jahia_user_prop varchar(150);
\ No newline at end of file
+ALTER TABLE jahia_user_prop MODIFY name_jahia_user_prop varchar(150) not
null;
\ No newline at end of file
