From 400649d18a00a7744693d5691c53d16489197203 Mon Sep 17 00:00:00 2001 From: nbm Date: Fri, 3 Feb 2006 12:02:43 +0000 Subject: [PATCH] Use TYPE= for table types, not ENGINE= --- sql/mysql/upgrade/2.99.3/authentication_sources.sql | 4 ++-- sql/mysql/upgrade/2.99.5/dashlet_disabling.sql | 4 ++-- sql/mysql/upgrade/2.99.5/role_allocations.sql | 4 ++-- sql/mysql/upgrade/2.99.6/plugin-registration.sql | 4 ++-- sql/mysql/upgrade/2.99.6/table_cleanup.sql | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------- sql/mysql/upgrade/2.99.7/documents_normalisation.sql | 8 ++++---- 6 files changed, 65 insertions(+), 65 deletions(-) diff --git a/sql/mysql/upgrade/2.99.3/authentication_sources.sql b/sql/mysql/upgrade/2.99.3/authentication_sources.sql index 5615f1e..736e37c 100644 --- a/sql/mysql/upgrade/2.99.3/authentication_sources.sql +++ b/sql/mysql/upgrade/2.99.3/authentication_sources.sql @@ -16,11 +16,11 @@ CREATE TABLE `authentication_sources` ( `is_group_source` tinyint(1) NOT NULL default '0', PRIMARY KEY (`id`), KEY `namespace` (`namespace`) -) ENGINE=InnoDB; +) TYPE=InnoDB; CREATE TABLE `zseq_authentication_sources` ( `id` int(10) unsigned NOT NULL auto_increment, PRIMARY KEY (`id`) -) ENGINE=MyISAM; +) TYPE=MyISAM; SET FOREIGN_KEY_CHECKS=1; diff --git a/sql/mysql/upgrade/2.99.5/dashlet_disabling.sql b/sql/mysql/upgrade/2.99.5/dashlet_disabling.sql index 75ed108..209f3d6 100644 --- a/sql/mysql/upgrade/2.99.5/dashlet_disabling.sql +++ b/sql/mysql/upgrade/2.99.5/dashlet_disabling.sql @@ -8,13 +8,13 @@ CREATE TABLE `dashlet_disables` ( UNIQUE KEY `id` (`id`), INDEX (`user_id`), INDEX (`dashlet_namespace`) -) ENGINE=InnoDB ; +) TYPE=InnoDB ; CREATE TABLE `zseq_dashlet_disables` ( `id` int(10) unsigned NOT NULL auto_increment, PRIMARY KEY (`id`) -) ENGINE=MyISAM ; +) TYPE=MyISAM ; SET FOREIGN_KEY_CHECKS=1; diff --git a/sql/mysql/upgrade/2.99.5/role_allocations.sql b/sql/mysql/upgrade/2.99.5/role_allocations.sql index 36a6caf..7c31de3 100644 --- a/sql/mysql/upgrade/2.99.5/role_allocations.sql +++ b/sql/mysql/upgrade/2.99.5/role_allocations.sql @@ -7,12 +7,12 @@ CREATE TABLE `role_allocations` ( `permission_descriptor_id` int(11) NOT NULL default '0', UNIQUE KEY `id` (`id`), KEY `folder_id` (`folder_id`) -) ENGINE=InnoDB ; +) TYPE=InnoDB ; CREATE TABLE `zseq_role_allocations` ( `id` int(10) unsigned NOT NULL auto_increment, PRIMARY KEY (`id`) -) ENGINE=MyISAM ; +) TYPE=MyISAM ; SET FOREIGN_KEY_CHECKS=1; diff --git a/sql/mysql/upgrade/2.99.6/plugin-registration.sql b/sql/mysql/upgrade/2.99.6/plugin-registration.sql index d30c4c5..8a7e953 100644 --- a/sql/mysql/upgrade/2.99.6/plugin-registration.sql +++ b/sql/mysql/upgrade/2.99.6/plugin-registration.sql @@ -7,10 +7,10 @@ CREATE TABLE `plugins` ( `data` text, PRIMARY KEY (`id`), KEY `name` (`namespace`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) TYPE=InnoDB DEFAULT CHARSET=latin1; CREATE TABLE `zseq_plugins` ( `id` int(10) unsigned NOT NULL auto_increment, PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; +) TYPE=MyISAM DEFAULT CHARSET=latin1; diff --git a/sql/mysql/upgrade/2.99.6/table_cleanup.sql b/sql/mysql/upgrade/2.99.6/table_cleanup.sql index 1fa3710..f62986d 100644 --- a/sql/mysql/upgrade/2.99.6/table_cleanup.sql +++ b/sql/mysql/upgrade/2.99.6/table_cleanup.sql @@ -14,59 +14,59 @@ DROP TABLE IF EXISTS `zseq_web_documents_status_lookup`; DROP TABLE IF EXISTS `zseq_web_sites`; -- Make sure sequence tables are MyISAM to avoid transaction-safety. -ALTER TABLE `zseq_active_sessions` ENGINE=MyISAM; -ALTER TABLE `zseq_archive_restoration_request` ENGINE=MyISAM; -ALTER TABLE `zseq_archiving_settings` ENGINE=MyISAM; -ALTER TABLE `zseq_archiving_type_lookup` ENGINE=MyISAM; -ALTER TABLE `zseq_browse_criteria` ENGINE=MyISAM; -ALTER TABLE `zseq_data_types` ENGINE=MyISAM; -ALTER TABLE `zseq_dependant_document_instance` ENGINE=MyISAM; -ALTER TABLE `zseq_dependant_document_template` ENGINE=MyISAM; -ALTER TABLE `zseq_discussion_comments` ENGINE=MyISAM; -ALTER TABLE `zseq_discussion_threads` ENGINE=MyISAM; -ALTER TABLE `zseq_document_archiving_link` ENGINE=MyISAM; -ALTER TABLE `zseq_document_fields` ENGINE=MyISAM; -ALTER TABLE `zseq_document_fields_link` ENGINE=MyISAM; -ALTER TABLE `zseq_document_link` ENGINE=MyISAM; -ALTER TABLE `zseq_document_link_types` ENGINE=MyISAM; -ALTER TABLE `zseq_document_subscriptions` ENGINE=MyISAM; -ALTER TABLE `zseq_document_transaction_types_lookup` ENGINE=MyISAM; -ALTER TABLE `zseq_document_transactions` ENGINE=MyISAM; -ALTER TABLE `zseq_document_type_fields_link` ENGINE=MyISAM; -ALTER TABLE `zseq_document_types_lookup` ENGINE=MyISAM; -ALTER TABLE `zseq_documents` ENGINE=MyISAM; -ALTER TABLE `zseq_folder_doctypes_link` ENGINE=MyISAM; -ALTER TABLE `zseq_folder_subscriptions` ENGINE=MyISAM; -ALTER TABLE `zseq_folders` ENGINE=MyISAM; -ALTER TABLE `zseq_folders_users_roles_link` ENGINE=MyISAM; -ALTER TABLE `zseq_groups_folders_approval_link` ENGINE=MyISAM; -ALTER TABLE `zseq_groups_folders_link` ENGINE=MyISAM; -ALTER TABLE `zseq_groups_groups_link` ENGINE=MyISAM; -ALTER TABLE `zseq_groups_lookup` ENGINE=MyISAM; -ALTER TABLE `zseq_groups_units_link` ENGINE=MyISAM; -ALTER TABLE `zseq_help` ENGINE=MyISAM; -ALTER TABLE `zseq_help_replacement` ENGINE=MyISAM; -ALTER TABLE `zseq_links` ENGINE=MyISAM; -ALTER TABLE `zseq_metadata_lookup` ENGINE=MyISAM; -ALTER TABLE `zseq_mime_types` ENGINE=MyISAM; -ALTER TABLE `zseq_news` ENGINE=MyISAM; -ALTER TABLE `zseq_organisations_lookup` ENGINE=MyISAM; -ALTER TABLE `zseq_permission_assignments` ENGINE=MyISAM; -ALTER TABLE `zseq_permission_descriptors` ENGINE=MyISAM; -ALTER TABLE `zseq_permission_lookup_assignments` ENGINE=MyISAM; -ALTER TABLE `zseq_permission_lookups` ENGINE=MyISAM; -ALTER TABLE `zseq_permission_objects` ENGINE=MyISAM; -ALTER TABLE `zseq_permissions` ENGINE=MyISAM; -ALTER TABLE `zseq_roles` ENGINE=MyISAM; -ALTER TABLE `zseq_status_lookup` ENGINE=MyISAM; -ALTER TABLE `zseq_system_settings` ENGINE=MyISAM; -ALTER TABLE `zseq_time_period` ENGINE=MyISAM; -ALTER TABLE `zseq_time_unit_lookup` ENGINE=MyISAM; -ALTER TABLE `zseq_units_lookup` ENGINE=MyISAM; -ALTER TABLE `zseq_units_organisations_link` ENGINE=MyISAM; -ALTER TABLE `zseq_upgrades` ENGINE=MyISAM; -ALTER TABLE `zseq_users` ENGINE=MyISAM; -ALTER TABLE `zseq_users_groups_link` ENGINE=MyISAM; +ALTER TABLE `zseq_active_sessions` TYPE=MyISAM; +ALTER TABLE `zseq_archive_restoration_request` TYPE=MyISAM; +ALTER TABLE `zseq_archiving_settings` TYPE=MyISAM; +ALTER TABLE `zseq_archiving_type_lookup` TYPE=MyISAM; +ALTER TABLE `zseq_browse_criteria` TYPE=MyISAM; +ALTER TABLE `zseq_data_types` TYPE=MyISAM; +ALTER TABLE `zseq_dependant_document_instance` TYPE=MyISAM; +ALTER TABLE `zseq_dependant_document_template` TYPE=MyISAM; +ALTER TABLE `zseq_discussion_comments` TYPE=MyISAM; +ALTER TABLE `zseq_discussion_threads` TYPE=MyISAM; +ALTER TABLE `zseq_document_archiving_link` TYPE=MyISAM; +ALTER TABLE `zseq_document_fields` TYPE=MyISAM; +ALTER TABLE `zseq_document_fields_link` TYPE=MyISAM; +ALTER TABLE `zseq_document_link` TYPE=MyISAM; +ALTER TABLE `zseq_document_link_types` TYPE=MyISAM; +ALTER TABLE `zseq_document_subscriptions` TYPE=MyISAM; +ALTER TABLE `zseq_document_transaction_types_lookup` TYPE=MyISAM; +ALTER TABLE `zseq_document_transactions` TYPE=MyISAM; +ALTER TABLE `zseq_document_type_fields_link` TYPE=MyISAM; +ALTER TABLE `zseq_document_types_lookup` TYPE=MyISAM; +ALTER TABLE `zseq_documents` TYPE=MyISAM; +ALTER TABLE `zseq_folder_doctypes_link` TYPE=MyISAM; +ALTER TABLE `zseq_folder_subscriptions` TYPE=MyISAM; +ALTER TABLE `zseq_folders` TYPE=MyISAM; +ALTER TABLE `zseq_folders_users_roles_link` TYPE=MyISAM; +ALTER TABLE `zseq_groups_folders_approval_link` TYPE=MyISAM; +ALTER TABLE `zseq_groups_folders_link` TYPE=MyISAM; +ALTER TABLE `zseq_groups_groups_link` TYPE=MyISAM; +ALTER TABLE `zseq_groups_lookup` TYPE=MyISAM; +ALTER TABLE `zseq_groups_units_link` TYPE=MyISAM; +ALTER TABLE `zseq_help` TYPE=MyISAM; +ALTER TABLE `zseq_help_replacement` TYPE=MyISAM; +ALTER TABLE `zseq_links` TYPE=MyISAM; +ALTER TABLE `zseq_metadata_lookup` TYPE=MyISAM; +ALTER TABLE `zseq_mime_types` TYPE=MyISAM; +ALTER TABLE `zseq_news` TYPE=MyISAM; +ALTER TABLE `zseq_organisations_lookup` TYPE=MyISAM; +ALTER TABLE `zseq_permission_assignments` TYPE=MyISAM; +ALTER TABLE `zseq_permission_descriptors` TYPE=MyISAM; +ALTER TABLE `zseq_permission_lookup_assignments` TYPE=MyISAM; +ALTER TABLE `zseq_permission_lookups` TYPE=MyISAM; +ALTER TABLE `zseq_permission_objects` TYPE=MyISAM; +ALTER TABLE `zseq_permissions` TYPE=MyISAM; +ALTER TABLE `zseq_roles` TYPE=MyISAM; +ALTER TABLE `zseq_status_lookup` TYPE=MyISAM; +ALTER TABLE `zseq_system_settings` TYPE=MyISAM; +ALTER TABLE `zseq_time_period` TYPE=MyISAM; +ALTER TABLE `zseq_time_unit_lookup` TYPE=MyISAM; +ALTER TABLE `zseq_units_lookup` TYPE=MyISAM; +ALTER TABLE `zseq_units_organisations_link` TYPE=MyISAM; +ALTER TABLE `zseq_upgrades` TYPE=MyISAM; +ALTER TABLE `zseq_users` TYPE=MyISAM; +ALTER TABLE `zseq_users_groups_link` TYPE=MyISAM; ALTER TABLE `active_sessions` TYPE=InnoDB; ALTER TABLE `archive_restoration_request` TYPE=InnoDB; diff --git a/sql/mysql/upgrade/2.99.7/documents_normalisation.sql b/sql/mysql/upgrade/2.99.7/documents_normalisation.sql index 68f4e34..f27251f 100644 --- a/sql/mysql/upgrade/2.99.7/documents_normalisation.sql +++ b/sql/mysql/upgrade/2.99.7/documents_normalisation.sql @@ -14,7 +14,7 @@ CREATE TABLE `document_content_version` ( UNIQUE KEY `id` (`id`), KEY `storage_path` (`storage_path`), KEY `document_id` (`document_id`) -) ENGINE=InnoDB; +) TYPE=InnoDB; CREATE TABLE `document_metadata_version` ( `id` int(11) NOT NULL default '0', @@ -38,7 +38,7 @@ CREATE TABLE `document_metadata_version` ( CONSTRAINT `document_metadata_version_ibfk_5` FOREIGN KEY (`document_type_id`) REFERENCES `document_types_lookup` (`id`), CONSTRAINT `document_metadata_version_ibfk_6` FOREIGN KEY (`status_id`) REFERENCES `status_lookup` (`id`), CONSTRAINT `document_metadata_version_ibfk_7` FOREIGN KEY (`version_creator_id`) REFERENCES `users` (`id`) -) ENGINE=InnoDB; +) TYPE=InnoDB; ALTER TABLE `documents` ADD metadata_version_id int(11) default NULL; ALTER TABLE `documents` ADD INDEX `metadata_version_id` (`metadata_version_id`); @@ -46,10 +46,10 @@ ALTER TABLE `documents` ADD INDEX `metadata_version_id` (`metadata_version_id`); CREATE TABLE `zseq_document_content_version` ( `id` int(10) unsigned NOT NULL auto_increment, PRIMARY KEY (`id`) -) ENGINE=MyISAM; +) TYPE=MyISAM; CREATE TABLE `zseq_document_metadata_version` ( `id` int(10) unsigned NOT NULL auto_increment, PRIMARY KEY (`id`) -) ENGINE=MyISAM; +) TYPE=MyISAM; SET FOREIGN_KEY_CHECKS=1; -- libgit2 0.21.4