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

// Normalize

Browse Source
This commit is contained in:
rMalie
2012-03-09 09:19:30 +00:00
parent 724c96fbde
commit 50a44277db
54 changed files with 297 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/upgrade/php/add_required_customization_field_flag.php
+2 -2
View File
@@ -29,14 +29,14 @@ define('_CONTAINS_REQUIRED_FIELD_', 2);
function add_required_customization_field_flag()
{
if (($result = Db::getInstance()->ExecuteS('SELECT `id_product` FROM `'._DB_PREFIX_.'customization_field` WHERE `required` = 1')) === false)
if (($result = Db::getInstance()->executeS('SELECT `id_product` FROM `'._DB_PREFIX_.'customization_field` WHERE `required` = 1')) === false)
return false;
if (Db::getInstance()->numRows())
{
$productIds = array();
foreach ($result AS $row)
$productIds[] = (int)($row['id_product']);
if (!Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.'product` SET `customizable` = '._CONTAINS_REQUIRED_FIELD_.' WHERE `id_product` IN ('.implode(', ', $productIds).')'))
if (!Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.'product` SET `customizable` = '._CONTAINS_REQUIRED_FIELD_.' WHERE `id_product` IN ('.implode(', ', $productIds).')'))
return false;
}
return true;
install-dev/upgrade/php/alter_blocklink.php
+2 -2
View File
@@ -28,9 +28,9 @@
function alter_blocklink()
{
// No one will know if the table does not exist :] Thanks Damien for your solution ;)
DB::getInstance()->Execute('ALTER TABLE `'._DB_PREFIX_.'blocklink_lang` CHANGE `id_link` `id_blocklink` INT( 10 ) UNSIGNED NOT NULL');
DB::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'blocklink_lang` CHANGE `id_link` `id_blocklink` INT( 10 ) UNSIGNED NOT NULL');
DB::getInstance()->Execute('ALTER TABLE `'._DB_PREFIX_.'blocklink` CHANGE `id_link` `id_blocklink` INT( 10 ) UNSIGNED NOT NULL');
DB::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'blocklink` CHANGE `id_link` `id_blocklink` INT( 10 ) UNSIGNED NOT NULL');
}
install-dev/upgrade/php/alter_cms_block.php
+4 -4
View File
@@ -28,13 +28,13 @@
function alter_cms_block()
{
// No one will know if the table does not exist :] Thanks Damien for your solution ;)
DB::getInstance()->Execute('ALTER TABLE `'._DB_PREFIX_.'cms_block_lang` CHANGE `id_block_cms` `id_cms_block` INT( 10 ) UNSIGNED NOT NULL');
DB::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'cms_block_lang` CHANGE `id_block_cms` `id_cms_block` INT( 10 ) UNSIGNED NOT NULL');
DB::getInstance()->Execute('ALTER TABLE `'._DB_PREFIX_.'cms_block` CHANGE `id_block_cms` `id_cms_block` INT( 10 ) UNSIGNED NOT NULL');
DB::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'cms_block` CHANGE `id_block_cms` `id_cms_block` INT( 10 ) UNSIGNED NOT NULL');
DB::getInstance()->Execute('ALTER TABLE `'._DB_PREFIX_.'cms_block_page` CHANGE `id_block_cms` `id_cms_block` INT( 10 ) UNSIGNED NOT NULL');
DB::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'cms_block_page` CHANGE `id_block_cms` `id_cms_block` INT( 10 ) UNSIGNED NOT NULL');
DB::getInstance()->Execute('ALTER TABLE `'._DB_PREFIX_.'cms_block_page` CHANGE `id_block_cms_page` `id_cms_block_page` INT( 10 ) UNSIGNED NOT NULL AUTO_INCREMENT');
DB::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'cms_block_page` CHANGE `id_block_cms_page` `id_cms_block_page` INT( 10 ) UNSIGNED NOT NULL AUTO_INCREMENT');
}
install-dev/upgrade/php/alter_productcomments_guest_index.php
+1 -1
View File
@@ -33,7 +33,7 @@ function alter_productcomments_guest_index()
if (!$id_productcomments)
return;
DB::getInstance()->Execute('
DB::getInstance()->execute('
ALTER TABLE `'._DB_PREFIX_.'product_comment`
DROP INDEX `id_guest`, ADD INDEX `id_guest` (`id_guest`);');
}
install-dev/upgrade/php/attribute_group_clean_combinations.php
+2 -2
View File
@@ -27,7 +27,7 @@
function attribute_group_clean_combinations()
{
$attributeCombinations = Db::getInstance()->ExecuteS('SELECT
$attributeCombinations = Db::getInstance()->executeS('SELECT
pac.`id_attribute`, pa.`id_product_attribute`
FROM `'._DB_PREFIX_.'product_attribute` pa
LEFT JOIN `'._DB_PREFIX_.'product_attribute_combination` pac
@@ -39,7 +39,7 @@ function attribute_group_clean_combinations()
if (!empty($toRemove))
{
$res = Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'product_attribute`
$res = Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'product_attribute`
WHERE `id_product_attribute` IN ('.implode(', ', $toRemove).')');
return $res;
}
install-dev/upgrade/php/blocknewsletter.php
+1 -1
View File
@@ -28,6 +28,6 @@
function blocknewsletter()
{
// No one will know if the table does not exist :]
DB::getInstance()->Execute('ALTER TABLE '._DB_PREFIX_.'newsletter ADD `http_referer` VARCHAR(255) NULL');
DB::getInstance()->execute('ALTER TABLE '._DB_PREFIX_.'newsletter ADD `http_referer` VARCHAR(255) NULL');
}
install-dev/upgrade/php/configuration_double_cleaner.php
+3 -3
View File
@@ -27,19 +27,19 @@
function configuration_double_cleaner()
{
$result = Db::getInstance()->ExecuteS('
$result = Db::getInstance()->executeS('
SELECT name, MIN(id_configuration) AS minid
FROM '._DB_PREFIX_.'configuration
GROUP BY name
HAVING count(name) > 1');
foreach ($result as $row)
{
DB::getInstance()->Execute('
DB::getInstance()->execute('
DELETE FROM '._DB_PREFIX_.'configuration
WHERE name = \''.addslashes($row['name']).'\'
AND id_configuration != '.(int)($row['minid']));
}
DB::getInstance()->Execute('
DB::getInstance()->execute('
DELETE FROM '._DB_PREFIX_.'configuration_lang
WHERE id_configuration NOT IN (
SELECT id_configuration
install-dev/upgrade/php/delivery_number_set.php
+2 -2
View File
@@ -31,7 +31,7 @@ function delivery_number_set()
$number = 1;
// Update each order with a number
$result = Db::getInstance()->ExecuteS('
$result = Db::getInstance()->executeS('
SELECT id_order
FROM '._DB_PREFIX_.'orders
ORDER BY id_order');
@@ -44,7 +44,7 @@ function delivery_number_set()
$oS = new OrderState((int)($row2['id_order_state']), Configuration::get('PS_LANG_DEFAULT'));
if ($oS->delivery)
{
Db::getInstance()->Execute('UPDATE '._DB_PREFIX_.'orders SET delivery_number = '.(int)($number++).', `delivery_date` = `date_add` WHERE id_order = '.(int)($order->id));
Db::getInstance()->execute('UPDATE '._DB_PREFIX_.'orders SET delivery_number = '.(int)($number++).', `delivery_date` = `date_add` WHERE id_order = '.(int)($order->id));
break ;
}
}
install-dev/upgrade/php/generate_ntree.php
+2 -2
View File
@@ -27,7 +27,7 @@
function generate_ntree()
{
$categories = Db::getInstance()->ExecuteS('SELECT id_category, id_parent FROM '._DB_PREFIX_.'category ORDER BY id_parent ASC, position ASC');
$categories = Db::getInstance()->executeS('SELECT id_category, id_parent FROM '._DB_PREFIX_.'category ORDER BY id_parent ASC, position ASC');
$categoriesArray = array();
foreach ($categories AS $category)
$categoriesArray[(int)$category['id_parent']]['subcategories'][(int)$category['id_category']] = 1;
@@ -43,7 +43,7 @@ function generate_ntree_subTree(&$categories, $id_category, &$n)
generate_ntree_subTree($categories, (int)$id_subcategory, $n);
$right = (int)$n++;
Db::getInstance()->Execute('UPDATE '._DB_PREFIX_.'category
Db::getInstance()->execute('UPDATE '._DB_PREFIX_.'category
SET nleft = '.(int)$left.', nright = '.(int)$right.'
WHERE id_category = '.(int)$id_category.' LIMIT 1');
}
install-dev/upgrade/php/generate_tax_rules.php
+3 -3
View File
@@ -44,7 +44,7 @@ function generate_tax_rules()
$id_tax_rules_group = Db::getInstance()->insert_id;
$countries = Db::getInstance()->ExecuteS('
$countries = Db::getInstance()->executeS('
SELECT * FROM `'._DB_PREFIX_.'country` c
LEFT JOIN `'._DB_PREFIX_.'zone` z ON (c.`id_zone` = z.`id_zone`)
LEFT JOIN `'._DB_PREFIX_.'tax_zone` tz ON (tz.`id_zone` = z.`id_zone`)
@@ -54,7 +54,7 @@ function generate_tax_rules()
{
foreach ($countries AS $country)
{
$res = Db::getInstance()->Execute('
$res = Db::getInstance()->execute('
INSERT INTO `'._DB_PREFIX_.'tax_rule` (`id_tax_rules_group`, `id_country`, `id_state`, `state_behavior`, `id_tax`)
VALUES (
'.(int)$id_tax_rules_group.',
@@ -67,7 +67,7 @@ function generate_tax_rules()
}
}
$states = Db::getInstance()->ExecuteS('
$states = Db::getInstance()->executeS('
SELECT * FROM `'._DB_PREFIX_.'states s
LEFT JOIN `'._DB_PREFIX_.'tax_state ts ON (ts.`id_state` = s.`id_state`)
WHERE `id_tax` = '.(int)$id_tax
install-dev/upgrade/php/hook_blocksearch_on_header.php
+1 -1
View File
@@ -41,7 +41,7 @@ function hook_blocksearch_on_header()
WHERE `id_hook` = '.(int)$id_hook.'
');
Db::getInstance()->Execute('
Db::getInstance()->execute('
INSERT INTO `'._DB_PREFIX_.'hook_module` (`id_module`, `id_hook`, `position`)
VALUES ('.(int)$id_module.', '.(int)$id_hook.', '.($position+1).')
');
install-dev/upgrade/php/invoice_number_set.php
+2 -2
View File
@@ -31,7 +31,7 @@ function invoice_number_set()
$number = 1;
// Update each order with a number
$result = Db::getInstance()->ExecuteS('
$result = Db::getInstance()->executeS('
SELECT id_order
FROM '._DB_PREFIX_.'orders
ORDER BY id_order');
@@ -44,7 +44,7 @@ function invoice_number_set()
$oS = new OrderState((int)($row2['id_order_state']), Configuration::get('PS_LANG_DEFAULT'));
if ($oS->invoice)
{
Db::getInstance()->Execute('UPDATE '._DB_PREFIX_.'orders SET invoice_number = '.(int)($number++).', `invoice_date` = `date_add` WHERE id_order = '.(int)($order->id));
Db::getInstance()->execute('UPDATE '._DB_PREFIX_.'orders SET invoice_number = '.(int)($number++).', `invoice_date` = `date_add` WHERE id_order = '.(int)($order->id));
break ;
}
}
install-dev/upgrade/php/latin1_database_to_utf8.php
+4 -4
View File
@@ -88,7 +88,7 @@ function latin1_database_to_utf8()
foreach ($tables AS $table)
{
/* Latin1 datas' selection */
if (!Db::getInstance()->Execute('SET NAMES latin1'))
if (!Db::getInstance()->execute('SET NAMES latin1'))
echo 'Cannot change the sql encoding to latin1!';
$query = 'SELECT `'.$table['id'].'`';
foreach ($table['fields'] AS $field)
@@ -96,7 +96,7 @@ function latin1_database_to_utf8()
if (isset($table['lang']) AND $table['lang'])
$query .= ', `id_lang`';
$query .= ' FROM `'._DB_PREFIX_.$table['name'].'`';
$latin1Datas = Db::getInstance()->ExecuteS($query);
$latin1Datas = Db::getInstance()->executeS($query);
if ($latin1Datas === false)
{
$warningExist = true;
@@ -111,7 +111,7 @@ function latin1_database_to_utf8()
if (Db::getInstance()->NumRows())
{
/* Utf-8 datas' restitution */
if (!Db::getInstance()->Execute('SET NAMES utf8'))
if (!Db::getInstance()->execute('SET NAMES utf8'))
echo 'Cannot change the sql encoding to utf8!';
foreach ($latin1Datas AS $latin1Data)
{
@@ -122,7 +122,7 @@ function latin1_database_to_utf8()
$query .= ' WHERE `'.$table['id'].'` = '.(int)($latin1Data[$table['id']]);
if (isset($table['lang']) AND $table['lang'])
$query .= ' AND `id_lang` = '.(int)($latin1Data['id_lang']);
if (!Db::getInstance()->Execute($query))
if (!Db::getInstance()->execute($query))
{
$warningExist = true;
$requests .= '
install-dev/upgrade/php/migrate_block_info_to_cms_block.php
+5 -5
View File
@@ -60,7 +60,7 @@ function migrate_block_info_to_cms_block()
}
// module install
$res &= Db::getInstance()->Execute('
$res &= Db::getInstance()->execute('
CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'cms_block`(
`id_cms_block` int(10) unsigned NOT NULL auto_increment,
`id_cms_category` int(10) unsigned NOT NULL,
@@ -69,9 +69,9 @@ function migrate_block_info_to_cms_block()
`display_store` tinyint(1) unsigned NOT NULL default \'1\',
PRIMARY KEY (`id_cms_block`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8');
$res &= Db::getInstance()->Execute('
$res &= Db::getInstance()->execute('
INSERT INTO `'._DB_PREFIX_.'cms_block` (`id_cms_category`, `location`, `position`) VALUES(1, 0, 0)');
$res &= Db::getInstance()->Execute('
$res &= Db::getInstance()->execute('
CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'cms_block_lang`(
`id_cms_block` int(10) unsigned NOT NULL,
`id_lang` int(10) unsigned NOT NULL,
@@ -83,9 +83,9 @@ function migrate_block_info_to_cms_block()
foreach ($languages AS $language)
$query_lang .= '(1, '.(int)($language['id_lang']).'),';
$query_lang = rtrim($query_lang, ',');
$res &= Db::getInstance()->Execute($query_lang);
$res &= Db::getInstance()->execute($query_lang);
$res &= Db::getInstance()->Execute('
$res &= Db::getInstance()->execute('
CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'cms_block_page`(
`id_cms_block_page` int(10) unsigned NOT NULL auto_increment,
`id_cms_block` int(10) unsigned NOT NULL,
install-dev/upgrade/php/reorderpositions.php
+1 -1
View File
@@ -101,7 +101,7 @@ function reorderpositions()
SET `position` = '.(int)$i.'
WHERE `id_parent` = '.(int)$id_category_parent.'
AND `id_cms_category` = '.(int)$result[$i]['id_cms_category'];
$res &= Db::getInstance()->Execute($sql);
$res &= Db::getInstance()->execute($sql);
}
}
}
install-dev/upgrade/php/set_discount_category.php
+3 -3
View File
@@ -27,9 +27,9 @@
function set_discount_category()
{
$discounts = Db::getInstance()->ExecuteS('SELECT `id_discount` FROM `'._DB_PREFIX_.'discount`');
$categories = Db::getInstance()->ExecuteS('SELECT `id_category` FROM `'._DB_PREFIX_.'category`');
$discounts = Db::getInstance()->executeS('SELECT `id_discount` FROM `'._DB_PREFIX_.'discount`');
$categories = Db::getInstance()->executeS('SELECT `id_category` FROM `'._DB_PREFIX_.'category`');
foreach ($discounts AS $discount)
foreach ($categories AS $category)
Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'discount_category` (`id_discount`,`id_category`) VALUES ('.(int)($discount['id_discount']).','.(int)($category['id_category']).')');
Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'discount_category` (`id_discount`,`id_category`) VALUES ('.(int)($discount['id_discount']).','.(int)($category['id_category']).')');
}
install-dev/upgrade/php/set_payment_module.php
+2 -2
View File
@@ -40,10 +40,10 @@ function set_payment_module()
$content = fread($fd, filesize($file));
if (preg_match_all('/extends PaymentModule/U', $content, $matches))
{
Db::getInstance()->Execute('
Db::getInstance()->execute('
INSERT INTO `'._DB_PREFIX_.'module_country` (id_module, id_country)
SELECT '.(int)($module['id_module']).', id_country FROM `'._DB_PREFIX_.'country` WHERE active = 1');
Db::getInstance()->Execute('
Db::getInstance()->execute('
INSERT INTO `'._DB_PREFIX_.'module_currency` (id_module, id_currency)
SELECT '.(int)($module['id_module']).', id_currency FROM `'._DB_PREFIX_.'currency` WHERE deleted = 0');
}
install-dev/upgrade/php/set_payment_module_group.php
+1 -1
View File
@@ -40,7 +40,7 @@ function set_payment_module_group()
$content = fread($fd, filesize($file));
if (preg_match_all('/extends PaymentModule/U', $content, $matches))
{
Db::getInstance()->Execute('
Db::getInstance()->execute('
INSERT INTO `'._DB_PREFIX_.'module_group` (id_module, id_group)
SELECT '.(int)($module['id_module']).', id_group FROM `'._DB_PREFIX_.'group`');
}
install-dev/upgrade/php/update_carrier_url.php
+1 -1
View File
@@ -36,7 +36,7 @@ function update_carrier_url()
// Check each one and erase carrier URL if not correct URL
foreach ($carriers as $carrier)
if (empty($carrier['url']) || !preg_match('/^https?:\/\/[:#%&_=\(\)\.\? \+\-@\/a-zA-Z0-9]+$/', $carrier['url']))
Db::getInstance()->Execute('
Db::getInstance()->execute('
UPDATE `'._DB_PREFIX_.'carrier`
SET `url` = \'\'
WHERE `id_carrier`= '.(int)($carrier['id_carrier']));
install-dev/upgrade/php/update_module_followup.php
+1 -1
View File
@@ -31,6 +31,6 @@ function update_module_followup()
if (!$id_followup)
return;
Db::getInstance()->Execute('ALTER TABLE `'._DB_PREFIX_.'log_email` ADD INDEX `date_add`(`date_add`), ADD INDEX `id_cart`(`id_cart`);');
Db::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'log_email` ADD INDEX `date_add`(`date_add`), ADD INDEX `id_cart`(`id_cart`);');
}
install-dev/upgrade/php/update_modules_sql.php
+4 -4
View File
@@ -29,12 +29,12 @@ function update_modules_sql()
{
$id_blocklink = Db::getInstance()->getValue('SELECT id_module FROM `'._DB_PREFIX_.'module` WHERE name = "blocklink"');
if ($id_blocklink)
Db::getInstance()->Execute('ALTER IGNORE TABLE `'._DB_PREFIX_.'blocklink_lang` ADD PRIMARY KEY (`id_link`, `id_lang`);');
Db::getInstance()->execute('ALTER IGNORE TABLE `'._DB_PREFIX_.'blocklink_lang` ADD PRIMARY KEY (`id_link`, `id_lang`);');
$id_productcomments = Db::getInstance()->getValue('SELECT id_module FROM `'._DB_PREFIX_.'module` WHERE name = "productcomments"');
if ($id_productcomments)
{
Db::getInstance()->Execute('ALTER IGNORE TABLE `'._DB_PREFIX_.'product_comment_grade` ADD PRIMARY KEY (`id_product_comment`, `id_product_comment_criterion`);');
Db::getInstance()->Execute('ALTER IGNORE TABLE `'._DB_PREFIX_.'product_comment_criterion` DROP PRIMARY KEY, ADD PRIMARY KEY (`id_product_comment_criterion`, `id_lang`);');
Db::getInstance()->Execute('ALTER IGNORE TABLE `'._DB_PREFIX_.'product_comment_criterion_product` ADD PRIMARY KEY(`id_product`, `id_product_comment_criterion`);');
Db::getInstance()->execute('ALTER IGNORE TABLE `'._DB_PREFIX_.'product_comment_grade` ADD PRIMARY KEY (`id_product_comment`, `id_product_comment_criterion`);');
Db::getInstance()->execute('ALTER IGNORE TABLE `'._DB_PREFIX_.'product_comment_criterion` DROP PRIMARY KEY, ADD PRIMARY KEY (`id_product_comment_criterion`, `id_lang`);');
Db::getInstance()->execute('ALTER IGNORE TABLE `'._DB_PREFIX_.'product_comment_criterion_product` ADD PRIMARY KEY(`id_product`, `id_product_comment_criterion`);');
}
}
install-dev/upgrade/php/update_order_canada.php
+1 -1
View File
@@ -99,7 +99,7 @@ function update_order_canada()
{
$values = rtrim($values, ",");
Db::getInstance()->Execute('
Db::getInstance()->execute('
INSERT INTO `'._DB_PREFIX_.'order_tax` (id_order, tax_name, tax_rate, amount)
VALUES '.$values);
}
install-dev/upgrade/php/update_order_detail_taxes.php
+2 -2
View File
@@ -36,7 +36,7 @@ function update_order_detail_taxes()
{
$tax_name = (isset($order_detail_tax['tax_name']) ? $order_detail_tax['tax_name'] : $alternative_tax_name);
Db::getInstance()->Execute(
Db::getInstance()->execute(
'INSERT INTO `'._DB_PREFIX_.'tax` (`rate`, `active`, `deleted`)
VALUES (\''.(float)$order_detail_tax['tax_rate'].'\', 0, 1)'
);
@@ -44,7 +44,7 @@ function update_order_detail_taxes()
$id_tax = Db::getInstance()->Insert_ID();
foreach ($id_lang_list as $id_lang)
{
Db::getInstance()->Execute('
Db::getInstance()->execute('
INSERT INTO `'._DB_PREFIX_.'tax_lang` (`id_tax`, `id_lang`, `name`)
VALUES ('.(int)$id_tax.','.(int)$id_lang['id_lang'].',\''.pSQL($tax_name).'\')
');
install-dev/upgrade/php/update_order_details.php
+3 -3
View File
@@ -27,12 +27,12 @@
function update_order_details()
{
$res = Db::getInstance()->ExecuteS('SHOW COLUMNS FROM `'._DB_PREFIX_.'order_detail` LIKE \'reduction_percent\'');
$res = Db::getInstance()->executeS('SHOW COLUMNS FROM `'._DB_PREFIX_.'order_detail` LIKE \'reduction_percent\'');
if (sizeof($res) == 0)
{
Db::getInstance()->Execute('ALTER TABLE `'._DB_PREFIX_.'order_detail` ADD `reduction_percent` DECIMAL(10, 2) NOT NULL default \'0.00\' AFTER `product_price`');
Db::getInstance()->Execute('ALTER TABLE `'._DB_PREFIX_.'order_detail` ADD `reduction_amount` DECIMAL(20, 6) NOT NULL default \'0.000000\' AFTER `reduction_percent`');
Db::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'order_detail` ADD `reduction_percent` DECIMAL(10, 2) NOT NULL default \'0.00\' AFTER `product_price`');
Db::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'order_detail` ADD `reduction_amount` DECIMAL(20, 6) NOT NULL default \'0.000000\' AFTER `reduction_percent`');
}
}
install-dev/upgrade/php/updateproductcomments.php
+14 -14
View File
@@ -27,31 +27,31 @@
function updateproductcomments()
{
if (Db::getInstance()->ExecuteS('SELECT * FROM '._DB_PREFIX_.'product_comment') !== false)
if (Db::getInstance()->executeS('SELECT * FROM '._DB_PREFIX_.'product_comment') !== false)
{
Db::getInstance()->Execute('CREATE TABLE IF NOT EXISTS '._DB_PREFIX_.'product_comment_criterion_lang (
Db::getInstance()->execute('CREATE TABLE IF NOT EXISTS '._DB_PREFIX_.'product_comment_criterion_lang (
`id_product_comment_criterion` INT( 11 ) UNSIGNED NOT NULL ,
`id_lang` INT(11) UNSIGNED NOT NULL ,
`name` VARCHAR(64) NOT NULL ,
PRIMARY KEY ( `id_product_comment_criterion` , `id_lang` )
) ENGINE='._MYSQL_ENGINE_.' DEFAULT CHARSET=utf8');
Db::getInstance()->Execute('CREATE TABLE IF NOT EXISTS '._DB_PREFIX_.'product_comment_criterion_category (
Db::getInstance()->execute('CREATE TABLE IF NOT EXISTS '._DB_PREFIX_.'product_comment_criterion_category (
`id_product_comment_criterion` int(10) unsigned NOT NULL,
`id_category` int(10) unsigned NOT NULL,
PRIMARY KEY(`id_product_comment_criterion`, `id_category`),
KEY `id_category` (`id_category`)
) ENGINE='._MYSQL_ENGINE_.' DEFAULT CHARSET=utf8');
Db::getInstance()->Execute('ALTER TABLE '._DB_PREFIX_.'product_comment ADD `id_guest` INT(11) NULL AFTER `id_customer`');
Db::getInstance()->Execute('ALTER TABLE '._DB_PREFIX_.'product_comment ADD `customer_name` varchar(64) NULL AFTER `content`');
Db::getInstance()->Execute('ALTER TABLE '._DB_PREFIX_.'product_comment ADD `deleted` tinyint(1) NOT NULL AFTER `validate`');
Db::getInstance()->Execute('ALTER TABLE '._DB_PREFIX_.'product_comment ADD INDEX (id_customer)');
Db::getInstance()->Execute('ALTER TABLE '._DB_PREFIX_.'product_comment ADD INDEX (id_guest)');
Db::getInstance()->Execute('ALTER TABLE '._DB_PREFIX_.'product_comment ADD INDEX (id_product)');
Db::getInstance()->Execute('ALTER TABLE '._DB_PREFIX_.'product_comment_criterion DROP `id_lang`');
Db::getInstance()->Execute('ALTER TABLE '._DB_PREFIX_.'product_comment_criterion DROP `name`');
Db::getInstance()->Execute('ALTER TABLE '._DB_PREFIX_.'product_comment_criterion ADD `id_product_comment_criterion_type` tinyint(1) NOT NULL AFTER `id_product_comment_criterion`');
Db::getInstance()->Execute('ALTER TABLE '._DB_PREFIX_.'product_comment_criterion ADD `active` tinyint(1) NOT NULL AFTER `id_product_comment_criterion_type`');
Db::getInstance()->Execute('ALTER IGNORE TABLE `'._DB_PREFIX_.'product_comment` ADD `title` VARCHAR(64) NULL AFTER `id_guest`;');
Db::getInstance()->execute('ALTER TABLE '._DB_PREFIX_.'product_comment ADD `id_guest` INT(11) NULL AFTER `id_customer`');
Db::getInstance()->execute('ALTER TABLE '._DB_PREFIX_.'product_comment ADD `customer_name` varchar(64) NULL AFTER `content`');
Db::getInstance()->execute('ALTER TABLE '._DB_PREFIX_.'product_comment ADD `deleted` tinyint(1) NOT NULL AFTER `validate`');
Db::getInstance()->execute('ALTER TABLE '._DB_PREFIX_.'product_comment ADD INDEX (id_customer)');
Db::getInstance()->execute('ALTER TABLE '._DB_PREFIX_.'product_comment ADD INDEX (id_guest)');
Db::getInstance()->execute('ALTER TABLE '._DB_PREFIX_.'product_comment ADD INDEX (id_product)');
Db::getInstance()->execute('ALTER TABLE '._DB_PREFIX_.'product_comment_criterion DROP `id_lang`');
Db::getInstance()->execute('ALTER TABLE '._DB_PREFIX_.'product_comment_criterion DROP `name`');
Db::getInstance()->execute('ALTER TABLE '._DB_PREFIX_.'product_comment_criterion ADD `id_product_comment_criterion_type` tinyint(1) NOT NULL AFTER `id_product_comment_criterion`');
Db::getInstance()->execute('ALTER TABLE '._DB_PREFIX_.'product_comment_criterion ADD `active` tinyint(1) NOT NULL AFTER `id_product_comment_criterion_type`');
Db::getInstance()->execute('ALTER IGNORE TABLE `'._DB_PREFIX_.'product_comment` ADD `title` VARCHAR(64) NULL AFTER `id_guest`;');
}
}
install-dev/upgrade/php/updatetabicon_from_11version.php
+1 -1
View File
@@ -30,7 +30,7 @@ function updatetabicon_from_11version()
if (version_compare($oldversion,'1.5.0.0','<'))
{
$rows = Db::getInstance()->ExecuteS('SELECT `id_tab`,`class_name` FROM '._DB_PREFIX_.'tab');
$rows = Db::getInstance()->executeS('SELECT `id_tab`,`class_name` FROM '._DB_PREFIX_.'tab');
if (sizeof($rows))
{
$img_dir = scandir(_PS_ROOT_DIR_.'/img/t/');