dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Fix #PSCFV-4569

Browse Source
This commit is contained in:
rGaillard
2012-10-01 16:16:54 +00:00
parent c4297e990b
commit 9a4496c4aa
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/ObjectModel.php
+1 -1
View File
@@ -1040,7 +1040,7 @@ abstract class ObjectModelCore
$multi_shop_join = ' LEFT JOIN `'._DB_PREFIX_.bqSQL($this->def['table']).'_'.bqSQL($assoc['type']).'`
AS `multi_shop_'.bqSQL($this->def['table']).'`
ON (main.`'.bqSQL($this->def['primary']).'` = `multi_shop_'.bqSQL($this->def['table']).'`.`'.bqSQL($this->def['primary']).'`)';
$sql_filter = 'AND id_shop = '.Context::getContext()->shop->id.' '.$sql_filter;
$sql_filter = 'AND `multi_shop_'.bqSQL($this->def['table']).'`.id_shop = '.Context::getContext()->shop->id.' '.$sql_filter;
$sql_join = $multi_shop_join.' '.$sql_join;
}
else
install-dev/data/db_structure.sql
-1
View File
@@ -360,7 +360,6 @@ CREATE TABLE `PREFIX_category_product` (
CREATE TABLE `PREFIX_cms` (
`id_cms` int(10) unsigned NOT NULL AUTO_INCREMENT,
`id_shop` INT(11) UNSIGNED NOT NULL DEFAULT '1',
`id_cms_category` int(10) unsigned NOT NULL,
`position` int(10) unsigned NOT NULL DEFAULT '0',
`active` tinyint(1) unsigned NOT NULL default '0',
install-dev/upgrade/sql/1.5.0.18.sql
+2
View File
@@ -17,3 +17,5 @@ ALTER TABLE `PREFIX_attribute_impact` CHANGE `weight` `weight` DECIMAL(20, 6) NO
ALTER TABLE `PREFIX_order_detail` CHANGE `product_weight` `product_weight` DECIMAL(20, 6) NOT NULL DEFAULT '0';
ALTER TABLE `PREFIX_stock_available` DROP INDEX `product_sqlstock`;
ALTER TABLE `PREFIX_stock_available` ADD UNIQUE (`id_product`, `id_product_attribute`, `id_shop`);
ALTER TABLE `PREFIX_cms` DROP `id_shop`;
ALTER TABLE `PREFIX_cms` ADD INDEX (`id_cms_category`);