Author: david
Date: Tue May 17 16:46:44 2011
New Revision: 9106
Log:
Update propel generator to use 'Engine=XXXX' notation for compatibility with
MySQL 5.5+ (See: http://code.google.com/p/qubit-toolkit/issues/detail?id=1985)
Modified:
trunk/data/sql/lib.model.schema.sql
trunk/data/sql/plugins.qbAclPlugin.lib.model.schema.sql
trunk/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/mysql/MysqlDDLBuilder.php
Modified: trunk/data/sql/lib.model.schema.sql
==============================================================================
--- trunk/data/sql/lib.model.schema.sql Tue May 17 16:18:56 2011 (r9105)
+++ trunk/data/sql/lib.model.schema.sql Tue May 17 16:46:44 2011 (r9106)
@@ -47,7 +47,7 @@
CONSTRAINT `actor_FK_5`
FOREIGN KEY (`parent_id`)
REFERENCES `actor` (`id`)
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- actor_i18n
@@ -78,7 +78,7 @@
FOREIGN KEY (`id`)
REFERENCES `actor` (`id`)
ON DELETE CASCADE
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- contact_information
@@ -112,7 +112,7 @@
FOREIGN KEY (`actor_id`)
REFERENCES `actor` (`id`)
ON DELETE CASCADE
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- contact_information_i18n
@@ -134,7 +134,7 @@
FOREIGN KEY (`id`)
REFERENCES `contact_information` (`id`)
ON DELETE CASCADE
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- digital_object
@@ -187,7 +187,7 @@
CONSTRAINT `digital_object_FK_6`
FOREIGN KEY (`parent_id`)
REFERENCES `digital_object` (`id`)
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- event
@@ -226,7 +226,7 @@
CONSTRAINT `event_FK_4`
FOREIGN KEY (`actor_id`)
REFERENCES `actor` (`id`)
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- event_i18n
@@ -247,7 +247,7 @@
FOREIGN KEY (`id`)
REFERENCES `event` (`id`)
ON DELETE CASCADE
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- function
@@ -289,7 +289,7 @@
CONSTRAINT `function_FK_5`
FOREIGN KEY (`description_detail_id`)
REFERENCES `term` (`id`)
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- function_i18n
@@ -317,7 +317,7 @@
FOREIGN KEY (`id`)
REFERENCES `function` (`id`)
ON DELETE CASCADE
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- historical_event
@@ -343,7 +343,7 @@
CONSTRAINT `historical_event_FK_2`
FOREIGN KEY (`type_id`)
REFERENCES `term` (`id`)
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- information_object
@@ -401,7 +401,7 @@
FOREIGN KEY (`description_detail_id`)
REFERENCES `term` (`id`)
ON DELETE SET NULL
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- information_object_i18n
@@ -440,7 +440,7 @@
FOREIGN KEY (`id`)
REFERENCES `information_object` (`id`)
ON DELETE CASCADE
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- keymap
@@ -462,7 +462,7 @@
KEY `keymap_I_2`(`target_id`),
KEY `keymap_I_3`(`source`),
KEY `keymap_I_4`(`target`)
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- map
@@ -479,7 +479,7 @@
`id` INTEGER NOT NULL AUTO_INCREMENT,
`serial_number` INTEGER default 0 NOT NULL,
PRIMARY KEY (`id`)
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- map_i18n
@@ -499,7 +499,7 @@
FOREIGN KEY (`id`)
REFERENCES `map` (`id`)
ON DELETE CASCADE
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- menu
@@ -526,7 +526,7 @@
FOREIGN KEY (`parent_id`)
REFERENCES `menu` (`id`)
ON DELETE CASCADE
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- menu_i18n
@@ -546,7 +546,7 @@
FOREIGN KEY (`id`)
REFERENCES `menu` (`id`)
ON DELETE CASCADE
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- note
@@ -588,7 +588,7 @@
CONSTRAINT `note_FK_4`
FOREIGN KEY (`parent_id`)
REFERENCES `note` (`id`)
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- note_i18n
@@ -607,7 +607,7 @@
FOREIGN KEY (`id`)
REFERENCES `note` (`id`)
ON DELETE CASCADE
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- oai_harvest
@@ -634,7 +634,7 @@
FOREIGN KEY (`oai_repository_id`)
REFERENCES `oai_repository` (`id`)
ON DELETE CASCADE
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- oai_repository
@@ -654,7 +654,7 @@
`updated_at` DATETIME NOT NULL,
`serial_number` INTEGER default 0 NOT NULL,
PRIMARY KEY (`id`)
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- object
@@ -671,7 +671,7 @@
`id` INTEGER NOT NULL AUTO_INCREMENT,
`serial_number` INTEGER default 0 NOT NULL,
PRIMARY KEY (`id`)
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- object_term_relation
@@ -702,7 +702,7 @@
FOREIGN KEY (`term_id`)
REFERENCES `term` (`id`)
ON DELETE CASCADE
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- other_name
@@ -731,7 +731,7 @@
FOREIGN KEY (`type_id`)
REFERENCES `term` (`id`)
ON DELETE SET NULL
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- other_name_i18n
@@ -751,7 +751,7 @@
FOREIGN KEY (`id`)
REFERENCES `other_name` (`id`)
ON DELETE CASCADE
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- physical_object
@@ -782,7 +782,7 @@
CONSTRAINT `physical_object_FK_3`
FOREIGN KEY (`parent_id`)
REFERENCES `physical_object` (`id`)
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- physical_object_i18n
@@ -803,7 +803,7 @@
FOREIGN KEY (`id`)
REFERENCES `physical_object` (`id`)
ON DELETE CASCADE
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- place
@@ -834,7 +834,7 @@
CONSTRAINT `place_FK_3`
FOREIGN KEY (`type_id`)
REFERENCES `term` (`id`)
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- place_i18n
@@ -856,7 +856,7 @@
FOREIGN KEY (`id`)
REFERENCES `place` (`id`)
ON DELETE CASCADE
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- place_map_relation
@@ -896,7 +896,7 @@
CONSTRAINT `place_map_relation_FK_5`
FOREIGN KEY (`type_id`)
REFERENCES `term` (`id`)
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- property
@@ -921,7 +921,7 @@
FOREIGN KEY (`object_id`)
REFERENCES `object` (`id`)
ON DELETE CASCADE
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- property_i18n
@@ -940,7 +940,7 @@
FOREIGN KEY (`id`)
REFERENCES `property` (`id`)
ON DELETE CASCADE
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- relation
@@ -974,7 +974,7 @@
CONSTRAINT `relation_FK_4`
FOREIGN KEY (`type_id`)
REFERENCES `term` (`id`)
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- repository
@@ -1006,7 +1006,7 @@
FOREIGN KEY (`desc_detail_id`)
REFERENCES `term` (`id`)
ON DELETE SET NULL
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- repository_i18n
@@ -1039,7 +1039,7 @@
FOREIGN KEY (`id`)
REFERENCES `repository` (`id`)
ON DELETE CASCADE
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- rights
@@ -1067,7 +1067,7 @@
CONSTRAINT `rights_FK_2`
FOREIGN KEY (`permission_id`)
REFERENCES `term` (`id`)
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- rights_i18n
@@ -1086,7 +1086,7 @@
FOREIGN KEY (`id`)
REFERENCES `rights` (`id`)
ON DELETE CASCADE
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- rights_actor_relation
@@ -1120,7 +1120,7 @@
CONSTRAINT `rights_actor_relation_FK_4`
FOREIGN KEY (`type_id`)
REFERENCES `term` (`id`)
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- rights_term_relation
@@ -1154,7 +1154,7 @@
CONSTRAINT `rights_term_relation_FK_3`
FOREIGN KEY (`type_id`)
REFERENCES `term` (`id`)
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- setting
@@ -1173,7 +1173,7 @@
`id` INTEGER NOT NULL AUTO_INCREMENT,
`serial_number` INTEGER default 0 NOT NULL,
PRIMARY KEY (`id`)
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- setting_i18n
@@ -1192,7 +1192,7 @@
FOREIGN KEY (`id`)
REFERENCES `setting` (`id`)
ON DELETE CASCADE
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- slug
@@ -1214,7 +1214,7 @@
FOREIGN KEY (`object_id`)
REFERENCES `object` (`id`)
ON DELETE CASCADE
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- static_page
@@ -1232,7 +1232,7 @@
FOREIGN KEY (`id`)
REFERENCES `object` (`id`)
ON DELETE CASCADE
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- static_page_i18n
@@ -1252,7 +1252,7 @@
FOREIGN KEY (`id`)
REFERENCES `static_page` (`id`)
ON DELETE CASCADE
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- status
@@ -1286,7 +1286,7 @@
FOREIGN KEY (`status_id`)
REFERENCES `term` (`id`)
ON DELETE CASCADE
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- system_event
@@ -1317,7 +1317,7 @@
CONSTRAINT `system_event_FK_2`
FOREIGN KEY (`user_id`)
REFERENCES `user` (`id`)
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- taxonomy
@@ -1345,7 +1345,7 @@
CONSTRAINT `taxonomy_FK_2`
FOREIGN KEY (`parent_id`)
REFERENCES `taxonomy` (`id`)
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- taxonomy_i18n
@@ -1365,7 +1365,7 @@
FOREIGN KEY (`id`)
REFERENCES `taxonomy` (`id`)
ON DELETE CASCADE
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- term
@@ -1397,7 +1397,7 @@
CONSTRAINT `term_FK_3`
FOREIGN KEY (`parent_id`)
REFERENCES `term` (`id`)
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- term_i18n
@@ -1416,7 +1416,7 @@
FOREIGN KEY (`id`)
REFERENCES `term` (`id`)
ON DELETE CASCADE
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- user
@@ -1437,7 +1437,7 @@
FOREIGN KEY (`id`)
REFERENCES `actor` (`id`)
ON DELETE CASCADE
-)Type=InnoDB;
+)Engine=InnoDB;
# This restores the fkey checks, after having unset them earlier
SET FOREIGN_KEY_CHECKS = 1;
Modified: trunk/data/sql/plugins.qbAclPlugin.lib.model.schema.sql
==============================================================================
--- trunk/data/sql/plugins.qbAclPlugin.lib.model.schema.sql Tue May 17
16:18:56 2011 (r9105)
+++ trunk/data/sql/plugins.qbAclPlugin.lib.model.schema.sql Tue May 17
16:46:44 2011 (r9106)
@@ -26,7 +26,7 @@
FOREIGN KEY (`parent_id`)
REFERENCES `acl_group` (`id`)
ON DELETE CASCADE
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- acl_group_i18n
@@ -46,7 +46,7 @@
FOREIGN KEY (`id`)
REFERENCES `acl_group` (`id`)
ON DELETE CASCADE
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- acl_permission
@@ -84,7 +84,7 @@
FOREIGN KEY (`object_id`)
REFERENCES `object` (`id`)
ON DELETE CASCADE
-)Type=InnoDB;
+)Engine=InnoDB;
#-----------------------------------------------------------------------------
#-- acl_user_group
@@ -110,7 +110,7 @@
FOREIGN KEY (`group_id`)
REFERENCES `acl_group` (`id`)
ON DELETE CASCADE
-)Type=InnoDB;
+)Engine=InnoDB;
# This restores the fkey checks, after having unset them earlier
SET FOREIGN_KEY_CHECKS = 1;
Modified:
trunk/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/mysql/MysqlDDLBuilder.php
==============================================================================
---
trunk/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/mysql/MysqlDDLBuilder.php
Tue May 17 16:18:56 2011 (r9105)
+++
trunk/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/mysql/MysqlDDLBuilder.php
Tue May 17 16:46:44 2011 (r9106)
@@ -153,7 +153,7 @@
}
}
- $script .= "Type=$mysqlTableType";
+ $script .= "Engine=$mysqlTableType";
$dbVendorSpecific =
$table->getDatabase()->getVendorInfoForType($databaseType);
$tableVendorSpecific =
$table->getVendorInfoForType($databaseType);
--
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/qubit-commits?hl=en.
