group_shop, shop_group, group_group_shop wtf?!

[mrzoom]

I'm trying to do a manual upgrade from 1.4.6.2 to 1.5.2.0 and the first error of hundreds has to have something with the renaming of group_shop to shop_group.

 

In 1.5.0.0.sql the upgrade script is trying to create group_shop like this:

 

CREATE TABLE IF NOT EXISTS `PREFIX_group_shop` (

`id_group_shop` int(11) unsigned NOT NULL AUTO_INCREMENT,

`name` varchar(64) CHARACTER SET utf8 NOT NULL,

`share_customer` TINYINT(1) NOT NULL,

`share_order` TINYINT(1) NOT NULL,

`share_stock` TINYINT(1) NOT NULL,

`active` tinyint(1) NOT NULL DEFAULT '1',

`deleted` tinyint(1) NOT NULL DEFAULT '0',

PRIMARY KEY (`id_group_shop`)

) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;

 

And on the next line it tries to insert some data:

 

INSERT INTO `PREFIX_group_shop` (`id_group_shop`, `name`, `active`, `deleted`, `share_stock`, `share_customer`, `share_order`) VALUES (1, 'Default', 1, 0, 0, 0, 0);

 

And I get this error:

 

Unknown column 'id_group_shop' in 'field list'

 

It looks like the 1.5.0.10.sql script is runned before the 1.5.0.0.sql script or something, because in 1.5.0.10.sql we have this:

 

CREATE TABLE `PREFIX_group_shop` (

`id_group` INT( 11 ) UNSIGNED NOT NULL,

`id_shop` INT( 11 ) UNSIGNED NOT NULL,

PRIMARY KEY (`id_group`, `id_shop`),

KEY `id_shop` (`id_shop`)

) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;

 

That could explain why id_group_shop is not in field list.