Peter M. Groen / knowledgetree

Commit 400649d18a00a7744693d5691c53d16489197203

Authored by nbm
1 parent 49d036f3

Use TYPE= for table types, not ENGINE= 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4801 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 6 changed files with 65 additions and 65 deletions
sql/mysql/upgrade/2.99.3/authentication_sources.sql
  View file @400649d
@@ -16,11 +16,11 @@ CREATE TABLE `authentication_sources` ( @@ -16,11 +16,11 @@ CREATE TABLE `authentication_sources` (
16 `is_group_source` tinyint(1) NOT NULL default '0', 16 `is_group_source` tinyint(1) NOT NULL default '0',
17 PRIMARY KEY (`id`), 17 PRIMARY KEY (`id`),
18 KEY `namespace` (`namespace`) 18 KEY `namespace` (`namespace`)
19 -) ENGINE=InnoDB; 19 +) TYPE=InnoDB;
20 20
21 CREATE TABLE `zseq_authentication_sources` ( 21 CREATE TABLE `zseq_authentication_sources` (
22 `id` int(10) unsigned NOT NULL auto_increment, 22 `id` int(10) unsigned NOT NULL auto_increment,
23 PRIMARY KEY (`id`) 23 PRIMARY KEY (`id`)
24 -) ENGINE=MyISAM; 24 +) TYPE=MyISAM;
25 25
26 SET FOREIGN_KEY_CHECKS=1; 26 SET FOREIGN_KEY_CHECKS=1;
sql/mysql/upgrade/2.99.5/dashlet_disabling.sql
  View file @400649d
@@ -8,13 +8,13 @@ CREATE TABLE `dashlet_disables` ( @@ -8,13 +8,13 @@ CREATE TABLE `dashlet_disables` (
8 UNIQUE KEY `id` (`id`), 8 UNIQUE KEY `id` (`id`),
9 INDEX (`user_id`), 9 INDEX (`user_id`),
10 INDEX (`dashlet_namespace`) 10 INDEX (`dashlet_namespace`)
11 -) ENGINE=InnoDB ; 11 +) TYPE=InnoDB ;
12 12
13 13
14 CREATE TABLE `zseq_dashlet_disables` ( 14 CREATE TABLE `zseq_dashlet_disables` (
15 `id` int(10) unsigned NOT NULL auto_increment, 15 `id` int(10) unsigned NOT NULL auto_increment,
16 PRIMARY KEY (`id`) 16 PRIMARY KEY (`id`)
17 -) ENGINE=MyISAM ; 17 +) TYPE=MyISAM ;
18 18
19 19
20 SET FOREIGN_KEY_CHECKS=1; 20 SET FOREIGN_KEY_CHECKS=1;
sql/mysql/upgrade/2.99.5/role_allocations.sql
  View file @400649d
@@ -7,12 +7,12 @@ CREATE TABLE `role_allocations` ( @@ -7,12 +7,12 @@ CREATE TABLE `role_allocations` (
7 `permission_descriptor_id` int(11) NOT NULL default '0', 7 `permission_descriptor_id` int(11) NOT NULL default '0',
8 UNIQUE KEY `id` (`id`), 8 UNIQUE KEY `id` (`id`),
9 KEY `folder_id` (`folder_id`) 9 KEY `folder_id` (`folder_id`)
10 -) ENGINE=InnoDB ; 10 +) TYPE=InnoDB ;
11 11
12 CREATE TABLE `zseq_role_allocations` ( 12 CREATE TABLE `zseq_role_allocations` (
13 `id` int(10) unsigned NOT NULL auto_increment, 13 `id` int(10) unsigned NOT NULL auto_increment,
14 PRIMARY KEY (`id`) 14 PRIMARY KEY (`id`)
15 -) ENGINE=MyISAM ; 15 +) TYPE=MyISAM ;
16 16
17 17
18 SET FOREIGN_KEY_CHECKS=1; 18 SET FOREIGN_KEY_CHECKS=1;
sql/mysql/upgrade/2.99.6/plugin-registration.sql
  View file @400649d
@@ -7,10 +7,10 @@ CREATE TABLE `plugins` ( @@ -7,10 +7,10 @@ CREATE TABLE `plugins` (
7 `data` text, 7 `data` text,
8 PRIMARY KEY (`id`), 8 PRIMARY KEY (`id`),
9 KEY `name` (`namespace`) 9 KEY `name` (`namespace`)
10 -) ENGINE=InnoDB DEFAULT CHARSET=latin1; 10 +) TYPE=InnoDB DEFAULT CHARSET=latin1;
11 11
12 CREATE TABLE `zseq_plugins` ( 12 CREATE TABLE `zseq_plugins` (
13 `id` int(10) unsigned NOT NULL auto_increment, 13 `id` int(10) unsigned NOT NULL auto_increment,
14 PRIMARY KEY (`id`) 14 PRIMARY KEY (`id`)
15 -) ENGINE=MyISAM DEFAULT CHARSET=latin1; 15 +) TYPE=MyISAM DEFAULT CHARSET=latin1;
16 16
sql/mysql/upgrade/2.99.6/table_cleanup.sql
  View file @400649d
@@ -14,59 +14,59 @@ DROP TABLE IF EXISTS `zseq_web_documents_status_lookup`; @@ -14,59 +14,59 @@ DROP TABLE IF EXISTS `zseq_web_documents_status_lookup`;
14 DROP TABLE IF EXISTS `zseq_web_sites`; 14 DROP TABLE IF EXISTS `zseq_web_sites`;
15 15
16 -- Make sure sequence tables are MyISAM to avoid transaction-safety. 16 -- Make sure sequence tables are MyISAM to avoid transaction-safety.
17 -ALTER TABLE `zseq_active_sessions` ENGINE=MyISAM;  
18 -ALTER TABLE `zseq_archive_restoration_request` ENGINE=MyISAM;  
19 -ALTER TABLE `zseq_archiving_settings` ENGINE=MyISAM;  
20 -ALTER TABLE `zseq_archiving_type_lookup` ENGINE=MyISAM;  
21 -ALTER TABLE `zseq_browse_criteria` ENGINE=MyISAM;  
22 -ALTER TABLE `zseq_data_types` ENGINE=MyISAM;  
23 -ALTER TABLE `zseq_dependant_document_instance` ENGINE=MyISAM;  
24 -ALTER TABLE `zseq_dependant_document_template` ENGINE=MyISAM;  
25 -ALTER TABLE `zseq_discussion_comments` ENGINE=MyISAM;  
26 -ALTER TABLE `zseq_discussion_threads` ENGINE=MyISAM;  
27 -ALTER TABLE `zseq_document_archiving_link` ENGINE=MyISAM;  
28 -ALTER TABLE `zseq_document_fields` ENGINE=MyISAM;  
29 -ALTER TABLE `zseq_document_fields_link` ENGINE=MyISAM;  
30 -ALTER TABLE `zseq_document_link` ENGINE=MyISAM;  
31 -ALTER TABLE `zseq_document_link_types` ENGINE=MyISAM;  
32 -ALTER TABLE `zseq_document_subscriptions` ENGINE=MyISAM;  
33 -ALTER TABLE `zseq_document_transaction_types_lookup` ENGINE=MyISAM;  
34 -ALTER TABLE `zseq_document_transactions` ENGINE=MyISAM;  
35 -ALTER TABLE `zseq_document_type_fields_link` ENGINE=MyISAM;  
36 -ALTER TABLE `zseq_document_types_lookup` ENGINE=MyISAM;  
37 -ALTER TABLE `zseq_documents` ENGINE=MyISAM;  
38 -ALTER TABLE `zseq_folder_doctypes_link` ENGINE=MyISAM;  
39 -ALTER TABLE `zseq_folder_subscriptions` ENGINE=MyISAM;  
40 -ALTER TABLE `zseq_folders` ENGINE=MyISAM;  
41 -ALTER TABLE `zseq_folders_users_roles_link` ENGINE=MyISAM;  
42 -ALTER TABLE `zseq_groups_folders_approval_link` ENGINE=MyISAM;  
43 -ALTER TABLE `zseq_groups_folders_link` ENGINE=MyISAM;  
44 -ALTER TABLE `zseq_groups_groups_link` ENGINE=MyISAM;  
45 -ALTER TABLE `zseq_groups_lookup` ENGINE=MyISAM;  
46 -ALTER TABLE `zseq_groups_units_link` ENGINE=MyISAM;  
47 -ALTER TABLE `zseq_help` ENGINE=MyISAM;  
48 -ALTER TABLE `zseq_help_replacement` ENGINE=MyISAM;  
49 -ALTER TABLE `zseq_links` ENGINE=MyISAM;  
50 -ALTER TABLE `zseq_metadata_lookup` ENGINE=MyISAM;  
51 -ALTER TABLE `zseq_mime_types` ENGINE=MyISAM;  
52 -ALTER TABLE `zseq_news` ENGINE=MyISAM;  
53 -ALTER TABLE `zseq_organisations_lookup` ENGINE=MyISAM;  
54 -ALTER TABLE `zseq_permission_assignments` ENGINE=MyISAM;  
55 -ALTER TABLE `zseq_permission_descriptors` ENGINE=MyISAM;  
56 -ALTER TABLE `zseq_permission_lookup_assignments` ENGINE=MyISAM;  
57 -ALTER TABLE `zseq_permission_lookups` ENGINE=MyISAM;  
58 -ALTER TABLE `zseq_permission_objects` ENGINE=MyISAM;  
59 -ALTER TABLE `zseq_permissions` ENGINE=MyISAM;  
60 -ALTER TABLE `zseq_roles` ENGINE=MyISAM;  
61 -ALTER TABLE `zseq_status_lookup` ENGINE=MyISAM;  
62 -ALTER TABLE `zseq_system_settings` ENGINE=MyISAM;  
63 -ALTER TABLE `zseq_time_period` ENGINE=MyISAM;  
64 -ALTER TABLE `zseq_time_unit_lookup` ENGINE=MyISAM;  
65 -ALTER TABLE `zseq_units_lookup` ENGINE=MyISAM;  
66 -ALTER TABLE `zseq_units_organisations_link` ENGINE=MyISAM;  
67 -ALTER TABLE `zseq_upgrades` ENGINE=MyISAM;  
68 -ALTER TABLE `zseq_users` ENGINE=MyISAM;  
69 -ALTER TABLE `zseq_users_groups_link` ENGINE=MyISAM; 17 +ALTER TABLE `zseq_active_sessions` TYPE=MyISAM;
  18 +ALTER TABLE `zseq_archive_restoration_request` TYPE=MyISAM;
  19 +ALTER TABLE `zseq_archiving_settings` TYPE=MyISAM;
  20 +ALTER TABLE `zseq_archiving_type_lookup` TYPE=MyISAM;
  21 +ALTER TABLE `zseq_browse_criteria` TYPE=MyISAM;
  22 +ALTER TABLE `zseq_data_types` TYPE=MyISAM;
  23 +ALTER TABLE `zseq_dependant_document_instance` TYPE=MyISAM;
  24 +ALTER TABLE `zseq_dependant_document_template` TYPE=MyISAM;
  25 +ALTER TABLE `zseq_discussion_comments` TYPE=MyISAM;
  26 +ALTER TABLE `zseq_discussion_threads` TYPE=MyISAM;
  27 +ALTER TABLE `zseq_document_archiving_link` TYPE=MyISAM;
  28 +ALTER TABLE `zseq_document_fields` TYPE=MyISAM;
  29 +ALTER TABLE `zseq_document_fields_link` TYPE=MyISAM;
  30 +ALTER TABLE `zseq_document_link` TYPE=MyISAM;
  31 +ALTER TABLE `zseq_document_link_types` TYPE=MyISAM;
  32 +ALTER TABLE `zseq_document_subscriptions` TYPE=MyISAM;
  33 +ALTER TABLE `zseq_document_transaction_types_lookup` TYPE=MyISAM;
  34 +ALTER TABLE `zseq_document_transactions` TYPE=MyISAM;
  35 +ALTER TABLE `zseq_document_type_fields_link` TYPE=MyISAM;
  36 +ALTER TABLE `zseq_document_types_lookup` TYPE=MyISAM;
  37 +ALTER TABLE `zseq_documents` TYPE=MyISAM;
  38 +ALTER TABLE `zseq_folder_doctypes_link` TYPE=MyISAM;
  39 +ALTER TABLE `zseq_folder_subscriptions` TYPE=MyISAM;
  40 +ALTER TABLE `zseq_folders` TYPE=MyISAM;
  41 +ALTER TABLE `zseq_folders_users_roles_link` TYPE=MyISAM;
  42 +ALTER TABLE `zseq_groups_folders_approval_link` TYPE=MyISAM;
  43 +ALTER TABLE `zseq_groups_folders_link` TYPE=MyISAM;
  44 +ALTER TABLE `zseq_groups_groups_link` TYPE=MyISAM;
  45 +ALTER TABLE `zseq_groups_lookup` TYPE=MyISAM;
  46 +ALTER TABLE `zseq_groups_units_link` TYPE=MyISAM;
  47 +ALTER TABLE `zseq_help` TYPE=MyISAM;
  48 +ALTER TABLE `zseq_help_replacement` TYPE=MyISAM;
  49 +ALTER TABLE `zseq_links` TYPE=MyISAM;
  50 +ALTER TABLE `zseq_metadata_lookup` TYPE=MyISAM;
  51 +ALTER TABLE `zseq_mime_types` TYPE=MyISAM;
  52 +ALTER TABLE `zseq_news` TYPE=MyISAM;
  53 +ALTER TABLE `zseq_organisations_lookup` TYPE=MyISAM;
  54 +ALTER TABLE `zseq_permission_assignments` TYPE=MyISAM;
  55 +ALTER TABLE `zseq_permission_descriptors` TYPE=MyISAM;
  56 +ALTER TABLE `zseq_permission_lookup_assignments` TYPE=MyISAM;
  57 +ALTER TABLE `zseq_permission_lookups` TYPE=MyISAM;
  58 +ALTER TABLE `zseq_permission_objects` TYPE=MyISAM;
  59 +ALTER TABLE `zseq_permissions` TYPE=MyISAM;
  60 +ALTER TABLE `zseq_roles` TYPE=MyISAM;
  61 +ALTER TABLE `zseq_status_lookup` TYPE=MyISAM;
  62 +ALTER TABLE `zseq_system_settings` TYPE=MyISAM;
  63 +ALTER TABLE `zseq_time_period` TYPE=MyISAM;
  64 +ALTER TABLE `zseq_time_unit_lookup` TYPE=MyISAM;
  65 +ALTER TABLE `zseq_units_lookup` TYPE=MyISAM;
  66 +ALTER TABLE `zseq_units_organisations_link` TYPE=MyISAM;
  67 +ALTER TABLE `zseq_upgrades` TYPE=MyISAM;
  68 +ALTER TABLE `zseq_users` TYPE=MyISAM;
  69 +ALTER TABLE `zseq_users_groups_link` TYPE=MyISAM;
70 70
71 ALTER TABLE `active_sessions` TYPE=InnoDB; 71 ALTER TABLE `active_sessions` TYPE=InnoDB;
72 ALTER TABLE `archive_restoration_request` TYPE=InnoDB; 72 ALTER TABLE `archive_restoration_request` TYPE=InnoDB;
sql/mysql/upgrade/2.99.7/documents_normalisation.sql
  View file @400649d
@@ -14,7 +14,7 @@ CREATE TABLE `document_content_version` ( @@ -14,7 +14,7 @@ CREATE TABLE `document_content_version` (
14 UNIQUE KEY `id` (`id`), 14 UNIQUE KEY `id` (`id`),
15 KEY `storage_path` (`storage_path`), 15 KEY `storage_path` (`storage_path`),
16 KEY `document_id` (`document_id`) 16 KEY `document_id` (`document_id`)
17 -) ENGINE=InnoDB; 17 +) TYPE=InnoDB;
18 18
19 CREATE TABLE `document_metadata_version` ( 19 CREATE TABLE `document_metadata_version` (
20 `id` int(11) NOT NULL default '0', 20 `id` int(11) NOT NULL default '0',
@@ -38,7 +38,7 @@ CREATE TABLE `document_metadata_version` ( @@ -38,7 +38,7 @@ CREATE TABLE `document_metadata_version` (
38 CONSTRAINT `document_metadata_version_ibfk_5` FOREIGN KEY (`document_type_id`) REFERENCES `document_types_lookup` (`id`), 38 CONSTRAINT `document_metadata_version_ibfk_5` FOREIGN KEY (`document_type_id`) REFERENCES `document_types_lookup` (`id`),
39 CONSTRAINT `document_metadata_version_ibfk_6` FOREIGN KEY (`status_id`) REFERENCES `status_lookup` (`id`), 39 CONSTRAINT `document_metadata_version_ibfk_6` FOREIGN KEY (`status_id`) REFERENCES `status_lookup` (`id`),
40 CONSTRAINT `document_metadata_version_ibfk_7` FOREIGN KEY (`version_creator_id`) REFERENCES `users` (`id`) 40 CONSTRAINT `document_metadata_version_ibfk_7` FOREIGN KEY (`version_creator_id`) REFERENCES `users` (`id`)
41 -) ENGINE=InnoDB; 41 +) TYPE=InnoDB;
42 42
43 ALTER TABLE `documents` ADD metadata_version_id int(11) default NULL; 43 ALTER TABLE `documents` ADD metadata_version_id int(11) default NULL;
44 ALTER TABLE `documents` ADD INDEX `metadata_version_id` (`metadata_version_id`); 44 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`); @@ -46,10 +46,10 @@ ALTER TABLE `documents` ADD INDEX `metadata_version_id` (`metadata_version_id`);
46 CREATE TABLE `zseq_document_content_version` ( 46 CREATE TABLE `zseq_document_content_version` (
47 `id` int(10) unsigned NOT NULL auto_increment, 47 `id` int(10) unsigned NOT NULL auto_increment,
48 PRIMARY KEY (`id`) 48 PRIMARY KEY (`id`)
49 -) ENGINE=MyISAM; 49 +) TYPE=MyISAM;
50 50
51 CREATE TABLE `zseq_document_metadata_version` ( 51 CREATE TABLE `zseq_document_metadata_version` (
52 `id` int(10) unsigned NOT NULL auto_increment, 52 `id` int(10) unsigned NOT NULL auto_increment,
53 PRIMARY KEY (`id`) 53 PRIMARY KEY (`id`)
54 -) ENGINE=MyISAM; 54 +) TYPE=MyISAM;
55 SET FOREIGN_KEY_CHECKS=1; 55 SET FOREIGN_KEY_CHECKS=1;