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

// order_by improved

Browse Source
This commit is contained in:
vChabot
2012-01-31 15:33:10 +00:00
parent 532c055fc6
commit 10168e397b
5 changed files with 73 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Manufacturer.php
+6 -2
View File
@@ -310,7 +310,11 @@ class ManufacturerCore extends ObjectModel
$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql);
return (int)count($result); return (int)count($result);
} }
if (strpos($order_by, '.') > 0)
{
$order_by = explode('.', $order_by);
$order_by = pSQL($order_by[0]).'.`'.pSQL($order_by[1]).'`';
}
$sql = 'SELECT p.*, stock.out_of_stock, IFNULL(stock.quantity, 0) as quantity, pa.`id_product_attribute`, $sql = 'SELECT p.*, stock.out_of_stock, IFNULL(stock.quantity, 0) as quantity, pa.`id_product_attribute`,
pl.`description`, pl.`description_short`, pl.`link_rewrite`, pl.`meta_description`, pl.`meta_keywords`, pl.`description`, pl.`description_short`, pl.`link_rewrite`, pl.`meta_description`, pl.`meta_keywords`,
pl.`meta_title`, pl.`name`, i.`id_image`, il.`legend`, m.`name` AS manufacturer_name, tl.`name` AS tax_name, t.`rate`, pl.`meta_title`, pl.`name`, i.`id_image`, il.`legend`, m.`name` AS manufacturer_name, tl.`name` AS tax_name, t.`rate`,
@@ -354,7 +358,7 @@ class ManufacturerCore extends ObjectModel
($active_category ? ' INNER JOIN `'._DB_PREFIX_.'category` ca ON cp.`id_category` = ca.`id_category` AND ca.`active` = 1' : '').' ($active_category ? ' INNER JOIN `'._DB_PREFIX_.'category` ca ON cp.`id_category` = ca.`id_category` AND ca.`active` = 1' : '').'
WHERE cg.`id_group` '.$sql_groups.' WHERE cg.`id_group` '.$sql_groups.'
) )
ORDER BY '.(($order_by == 'id_product') ? 'p.' : '').'`'.pSQL($order_by).'` '.pSQL($order_way).' ORDER BY '.(($order_by == 'id_product') ? 'p.' : '').pSQL($order_by).' '.pSQL($order_way).'
LIMIT '.(((int)$p - 1) * (int)$n).','.(int)$n; LIMIT '.(((int)$p - 1) * (int)$n).','.(int)$n;
$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql);
classes/Product.php
+18 -3
View File
@@ -905,6 +905,12 @@ class ProductCore extends ObjectModel
else if ($order_by == 'position') else if ($order_by == 'position')
$order_by_prefix = 'c'; $order_by_prefix = 'c';
if (strpos($order_by, '.') > 0)
{
$order_by = explode('.', $order_by);
$order_by_prefix = $order_by[0];
$order_by = $order_by[1];
}
$sql = 'SELECT p.*, pl.* , t.`rate` AS tax_rate, m.`name` AS manufacturer_name, s.`name` AS supplier_name $sql = 'SELECT p.*, pl.* , t.`rate` AS tax_rate, m.`name` AS manufacturer_name, s.`name` AS supplier_name
FROM `'._DB_PREFIX_.'product` p FROM `'._DB_PREFIX_.'product` p
'.$context->shop->addSqlAssociation('product', 'p').' '.$context->shop->addSqlAssociation('product', 'p').'
@@ -1750,7 +1756,12 @@ class ProductCore extends ObjectModel
$groups = FrontController::getCurrentCustomerGroups(); $groups = FrontController::getCurrentCustomerGroups();
$sql_groups = (count($groups) ? 'IN ('.implode(',', $groups).')' : '= 1'); $sql_groups = (count($groups) ? 'IN ('.implode(',', $groups).')' : '= 1');
if (strpos($order_by, '.') > 0)
{
$order_by = explode('.', $order_by);
$order_by_prefix = $order_by[0];
$order_by = $order_by[1];
}
if ($count) if ($count)
{ {
$sql = 'SELECT COUNT(p.`id_product`) AS nb $sql = 'SELECT COUNT(p.`id_product`) AS nb
@@ -1971,7 +1982,11 @@ class ProductCore extends ObjectModel
$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow($sql); $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow($sql);
return (int)$result['nb']; return (int)$result['nb'];
} }
if (strpos($order_by, '.') > 0)
{
$order_by = explode('.', $order_by);
$order_by = pSQL($order_by[0]).'.`'.pSQL($order_by[1]).'`';
}
$sql = 'SELECT p.*, stock.out_of_stock, IFNULL(stock.quantity, 0) as quantity, pl.`description`, pl.`description_short`, $sql = 'SELECT p.*, stock.out_of_stock, IFNULL(stock.quantity, 0) as quantity, pl.`description`, pl.`description_short`,
pl.`link_rewrite`, pl.`meta_description`, pl.`meta_keywords`, pl.`meta_title`, pl.`link_rewrite`, pl.`meta_description`, pl.`meta_keywords`, pl.`meta_title`,
pl.`name`, i.`id_image`, il.`legend`, t.`rate`, m.`name` AS manufacturer_name, pl.`name`, i.`id_image`, il.`legend`, t.`rate`, m.`name` AS manufacturer_name,
@@ -2005,7 +2020,7 @@ class ProductCore extends ObjectModel
LEFT JOIN `'._DB_PREFIX_.'category_product` cp ON (cp.`id_category` = cg.`id_category`) LEFT JOIN `'._DB_PREFIX_.'category_product` cp ON (cp.`id_category` = cg.`id_category`)
WHERE cg.`id_group` '.$sql_groups.' WHERE cg.`id_group` '.$sql_groups.'
) )
ORDER BY '.(isset($order_by_prefix) ? pSQL($order_by_prefix).'.' : '').'`'.pSQL($order_by).'`'.' '.pSQL($order_way).' ORDER BY '.(isset($order_by_prefix) ? pSQL($order_by_prefix).'.' : '').pSQL($order_by).' '.pSQL($order_way).'
LIMIT '.(int)($page_number * $nb_products).', '.(int)$nb_products; LIMIT '.(int)($page_number * $nb_products).', '.(int)$nb_products;
$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql);
classes/Search.php
+42 -35
View File
@@ -145,28 +145,28 @@ class SearchCore
return $string; return $string;
} }
public static function find($id_lang, $expr, $pageNumber = 1, $pageSize = 1, $orderBy = 'position', public static function find($id_lang, $expr, $page_number = 1, $page_size = 1, $order_by = 'position',
$orderWay = 'desc', $ajax = false, $useCookie = true, Context $context = null) $order_way = 'desc', $ajax = false, $use_cookie = true, Context $context = null)
{ {
if (!$context) if (!$context)
$context = Context::getContext(); $context = Context::getContext();
$db = Db::getInstance(_PS_USE_SQL_SLAVE_); $db = Db::getInstance(_PS_USE_SQL_SLAVE_);
// Only use cookie if id_customer is not present // Only use cookie if id_customer is not present
if ($useCookie) if ($use_cookie)
$id_customer = $context->customer->id; $id_customer = $context->customer->id;
else else
$id_customer = 0; $id_customer = 0;
// TODO : smart page management // TODO : smart page management
if ($pageNumber < 1) $pageNumber = 1; if ($page_number < 1) $page_number = 1;
if ($pageSize < 1) $pageSize = 1; if ($page_size < 1) $page_size = 1;
if (!Validate::isOrderBy($orderBy) || !Validate::isOrderWay($orderWay)) if (!Validate::isOrderBy($order_by) || !Validate::isOrderWay($order_way))
return false; return false;
$intersectArray = array(); $intersect_array = array();
$scoreArray = array(); $score_array = array();
$words = explode(' ', Search::sanitize($expr, $id_lang)); $words = explode(' ', Search::sanitize($expr, $id_lang));
foreach ($words as $key => $word) foreach ($words as $key => $word)
@@ -174,7 +174,7 @@ class SearchCore
{ {
$word = str_replace('%', '\\%', $word); $word = str_replace('%', '\\%', $word);
$word = str_replace('_', '\\_', $word); $word = str_replace('_', '\\_', $word);
$intersectArray[] = 'SELECT si.id_product $intersect_array[] = 'SELECT si.id_product
FROM '._DB_PREFIX_.'search_word sw FROM '._DB_PREFIX_.'search_word sw
LEFT JOIN '._DB_PREFIX_.'search_index si ON sw.id_word = si.id_word LEFT JOIN '._DB_PREFIX_.'search_index si ON sw.id_word = si.id_word
WHERE sw.id_lang = '.(int)$id_lang.' WHERE sw.id_lang = '.(int)$id_lang.'
@@ -186,7 +186,7 @@ class SearchCore
); );
if ($word[0] != '-') if ($word[0] != '-')
$scoreArray[] = 'sw.word LIKE \''.pSQL(Tools::substr($word, 0, PS_SEARCH_MAX_WORD_LENGTH)).'%\''; $score_array[] = 'sw.word LIKE \''.pSQL(Tools::substr($word, 0, PS_SEARCH_MAX_WORD_LENGTH)).'%\'';
} }
else else
unset($words[$key]); unset($words[$key]);
@@ -195,7 +195,7 @@ class SearchCore
return ($ajax ? array() : array('total' => 0, 'result' => array())); return ($ajax ? array() : array('total' => 0, 'result' => array()));
$score = ''; $score = '';
if (count($scoreArray)) if (count($score_array))
$score = ',( $score = ',(
SELECT SUM(weight) SELECT SUM(weight)
FROM '._DB_PREFIX_.'search_word sw FROM '._DB_PREFIX_.'search_word sw
@@ -203,7 +203,7 @@ class SearchCore
WHERE sw.id_lang = '.(int)$id_lang.' WHERE sw.id_lang = '.(int)$id_lang.'
AND sw.id_shop = '.$context->shop->getID(true).' AND sw.id_shop = '.$context->shop->getID(true).'
AND si.id_product = p.id_product AND si.id_product = p.id_product
AND ('.implode(' OR ', $scoreArray).') AND ('.implode(' OR ', $score_array).')
) position'; ) position';
$sql = 'SELECT cp.`id_product` $sql = 'SELECT cp.`id_product`
@@ -221,29 +221,29 @@ class SearchCore
)'); )');
$results = $db->executeS($sql); $results = $db->executeS($sql);
$eligibleProducts = array(); $eligible_products = array();
foreach ($results as $row) foreach ($results as $row)
$eligibleProducts[] = $row['id_product']; $eligible_products[] = $row['id_product'];
foreach ($intersectArray as $query) foreach ($intersect_array as $query)
{ {
$eligibleProducts2 = array(); $eligible_products2 = array();
foreach ($db->executeS($query) as $row) foreach ($db->executeS($query) as $row)
$eligibleProducts2[] = $row['id_product']; $eligible_products2[] = $row['id_product'];
$eligibleProducts = array_intersect($eligibleProducts, $eligibleProducts2); $eligible_products = array_intersect($eligible_products, $eligible_products2);
if (!count($eligibleProducts)) if (!count($eligible_products))
return ($ajax ? array() : array('total' => 0, 'result' => array())); return ($ajax ? array() : array('total' => 0, 'result' => array()));
} }
$eligibleProducts = array_unique($eligibleProducts); $eligible_products = array_unique($eligible_products);
$productPool = ''; $product_pool = '';
foreach ($eligibleProducts as $id_product) foreach ($eligible_products as $id_product)
if ($id_product) if ($id_product)
$productPool .= (int)$id_product.','; $product_pool .= (int)$id_product.',';
if (empty($productPool)) if (empty($product_pool))
return ($ajax ? array() : array('total' => 0, 'result' => array())); return ($ajax ? array() : array('total' => 0, 'result' => array()));
$productPool = ((strpos($productPool, ',') === false) ? (' = '.(int)$productPool.' ') : (' IN ('.rtrim($productPool, ',').') ')); $product_pool = ((strpos($product_pool, ',') === false) ? (' = '.(int)$product_pool.' ') : (' IN ('.rtrim($product_pool, ',').') '));
if ($ajax) if ($ajax)
{ {
@@ -258,11 +258,16 @@ class SearchCore
p.`id_category_default` = cl.`id_category` p.`id_category_default` = cl.`id_category`
AND cl.`id_lang` = '.(int)$id_lang.$context->shop->addSqlRestrictionOnLang('cl').' AND cl.`id_lang` = '.(int)$id_lang.$context->shop->addSqlRestrictionOnLang('cl').'
) )
WHERE p.`id_product` '.$productPool.' WHERE p.`id_product` '.$product_pool.'
ORDER BY position DESC LIMIT 10'; ORDER BY position DESC LIMIT 10';
return $db->executeS($sql); return $db->executeS($sql);
} }
if (strpos($order_by, '.') > 0)
{
$order_by = explode('.', $order_by);
$order_by = pSQL($order_by[0]).'.`'.pSQL($order_by[1]).'`';
}
$sql = 'SELECT p.*, stock.out_of_stock, IFNULL(stock.quantity, 0) as quantity, $sql = 'SELECT p.*, stock.out_of_stock, IFNULL(stock.quantity, 0) as quantity,
pl.`description_short`, pl.`available_now`, pl.`available_later`, pl.`link_rewrite`, pl.`name`, pl.`description_short`, pl.`available_now`, pl.`available_later`, pl.`link_rewrite`, pl.`name`,
tax.`rate`, i.`id_image`, il.`legend`, m.`name` manufacturer_name '.$score.', tax.`rate`, i.`id_image`, il.`legend`, m.`name` manufacturer_name '.$score.',
@@ -286,9 +291,9 @@ class SearchCore
LEFT JOIN `'._DB_PREFIX_.'image` i ON (i.`id_product` = p.`id_product` AND i.`cover` = 1) LEFT JOIN `'._DB_PREFIX_.'image` i ON (i.`id_product` = p.`id_product` AND i.`cover` = 1)
LEFT JOIN `'._DB_PREFIX_.'image_lang` il ON (i.`id_image` = il.`id_image` AND il.`id_lang` = '.(int)$id_lang.') LEFT JOIN `'._DB_PREFIX_.'image_lang` il ON (i.`id_image` = il.`id_image` AND il.`id_lang` = '.(int)$id_lang.')
'.Product::sqlStock('p', 0).' '.Product::sqlStock('p', 0).'
WHERE p.`id_product` '.$productPool.' WHERE p.`id_product` '.$product_pool.'
'.($orderBy ? 'ORDER BY '.$orderBy : '').($orderWay ? ' '.$orderWay : '').' '.($order_by ? 'ORDER BY '.$order_by : '').($order_way ? ' '.$order_way : '').'
LIMIT '.(int)(($pageNumber - 1) * $pageSize).','.(int)$pageSize; LIMIT '.(int)(($page_number - 1) * $page_size).','.(int)$page_size;
$result = $db->executeS($sql); $result = $db->executeS($sql);
$sql = 'SELECT COUNT(*) $sql = 'SELECT COUNT(*)
@@ -304,15 +309,15 @@ class SearchCore
LEFT JOIN `'._DB_PREFIX_.'manufacturer` m ON m.`id_manufacturer` = p.`id_manufacturer` LEFT JOIN `'._DB_PREFIX_.'manufacturer` m ON m.`id_manufacturer` = p.`id_manufacturer`
LEFT JOIN `'._DB_PREFIX_.'image` i ON (i.`id_product` = p.`id_product` AND i.`cover` = 1) LEFT JOIN `'._DB_PREFIX_.'image` i ON (i.`id_product` = p.`id_product` AND i.`cover` = 1)
LEFT JOIN `'._DB_PREFIX_.'image_lang` il ON (i.`id_image` = il.`id_image` AND il.`id_lang` = '.(int)$id_lang.') LEFT JOIN `'._DB_PREFIX_.'image_lang` il ON (i.`id_image` = il.`id_image` AND il.`id_lang` = '.(int)$id_lang.')
WHERE p.`id_product` '.$productPool; WHERE p.`id_product` '.$product_pool;
$total = $db->getValue($sql); $total = $db->getValue($sql);
if (!$result) if (!$result)
$resultProperties = false; $result_properties = false;
else else
$resultProperties = Product::getProductsProperties((int)$id_lang, $result); $result_properties = Product::getProductsProperties((int)$id_lang, $result);
return array('total' => $total,'result' => $resultProperties); return array('total' => $total,'result' => $result_properties);
} }
public static function getTags($db, $id_product, $id_lang) public static function getTags($db, $id_product, $id_lang)
@@ -590,6 +595,8 @@ class SearchCore
if ($pageNumber < 1) $pageNumber = 1; if ($pageNumber < 1) $pageNumber = 1;
if ($pageSize < 1) $pageSize = 10; if ($pageSize < 1) $pageSize = 10;
$id = Context::getContext()->shop->id;
$id_shop = $id ? $id : Configuration::get('PS_SHOP_DEFAULT');
if ($count) if ($count)
{ {
$sql = 'SELECT COUNT(DISTINCT pt.`id_product`) nb $sql = 'SELECT COUNT(DISTINCT pt.`id_product`) nb
@@ -598,7 +605,7 @@ class SearchCore
LEFT JOIN `'._DB_PREFIX_.'product_tag` pt ON (p.`id_product` = pt.`id_product`) LEFT JOIN `'._DB_PREFIX_.'product_tag` pt ON (p.`id_product` = pt.`id_product`)
LEFT JOIN `'._DB_PREFIX_.'tag` t ON (pt.`id_tag` = t.`id_tag` AND t.`id_lang` = '.(int)$id_lang.') LEFT JOIN `'._DB_PREFIX_.'tag` t ON (pt.`id_tag` = t.`id_tag` AND t.`id_lang` = '.(int)$id_lang.')
LEFT JOIN `'._DB_PREFIX_.'category_product` cp ON (cp.`id_product` = p.`id_product`) LEFT JOIN `'._DB_PREFIX_.'category_product` cp ON (cp.`id_product` = p.`id_product`)
LEFT JOIN `'._DB_PREFIX_.'category_shop` cs ON (cp.`id_category` = cs.`id_category`) LEFT JOIN `'._DB_PREFIX_.'category_shop` cs ON (cp.`id_category` = cs.`id_category` AND cs.`id_shop` = '.(int)$id_shop.')
LEFT JOIN `'._DB_PREFIX_.'category_group` cg ON (cg.`id_category` = cp.`id_category`) LEFT JOIN `'._DB_PREFIX_.'category_group` cg ON (cg.`id_category` = cp.`id_category`)
WHERE p.`active` = 1 WHERE p.`active` = 1
AND cs.`id_shop` = '.(int)Context::getContext()->shop->getID().' AND cs.`id_shop` = '.(int)Context::getContext()->shop->getID().'
@@ -635,7 +642,7 @@ class SearchCore
LEFT JOIN `'._DB_PREFIX_.'tag` t ON (pt.`id_tag` = t.`id_tag` AND t.`id_lang` = '.(int)$id_lang.') LEFT JOIN `'._DB_PREFIX_.'tag` t ON (pt.`id_tag` = t.`id_tag` AND t.`id_lang` = '.(int)$id_lang.')
LEFT JOIN `'._DB_PREFIX_.'category_product` cp ON (cp.`id_product` = p.`id_product`) LEFT JOIN `'._DB_PREFIX_.'category_product` cp ON (cp.`id_product` = p.`id_product`)
LEFT JOIN `'._DB_PREFIX_.'category_group` cg ON (cg.`id_category` = cp.`id_category`) LEFT JOIN `'._DB_PREFIX_.'category_group` cg ON (cg.`id_category` = cp.`id_category`)
LEFT JOIN `'._DB_PREFIX_.'category_shop` cs ON (cg.`id_category` = cs.`id_category`) LEFT JOIN `'._DB_PREFIX_.'category_shop` cs ON (cg.`id_category` = cs.`id_category` AND cs.`id_shop` = '.(int)$id_shop.')
'.Product::sqlStock('p', 0).' '.Product::sqlStock('p', 0).'
WHERE p.`active` = 1 WHERE p.`active` = 1
AND cs.`id_shop` = '.(int)Context::getContext()->shop->getID().' AND cs.`id_shop` = '.(int)Context::getContext()->shop->getID().'
classes/Supplier.php
+6 -1
View File
@@ -226,6 +226,11 @@ class SupplierCore extends ObjectModel
$nb_days_new_product = Validate::isUnsignedInt(Configuration::get('PS_NB_DAYS_NEW_PRODUCT')) ? Configuration::get('PS_NB_DAYS_NEW_PRODUCT') : 20; $nb_days_new_product = Validate::isUnsignedInt(Configuration::get('PS_NB_DAYS_NEW_PRODUCT')) ? Configuration::get('PS_NB_DAYS_NEW_PRODUCT') : 20;
if (strpos('.', $order_by) > 0)
{
$order_by = explode('.', $order_by);
$order_by = pSQL($order_by[0]).'.`'.pSQL($order_by[1]).'`';
}
$sql = 'SELECT p.*, stock.out_of_stock, $sql = 'SELECT p.*, stock.out_of_stock,
IFNULL(stock.quantity, 0) as quantity, IFNULL(stock.quantity, 0) as quantity,
pl.`description`, pl.`description`,
@@ -271,7 +276,7 @@ class SupplierCore extends ObjectModel
($active_category ? ' INNER JOIN `'._DB_PREFIX_.'category` ca ON cp.`id_category` = ca.`id_category` AND ca.`active` = 1' : '').' ($active_category ? ' INNER JOIN `'._DB_PREFIX_.'category` ca ON cp.`id_category` = ca.`id_category` AND ca.`active` = 1' : '').'
WHERE cg.`id_group` '.$sql_groups.' WHERE cg.`id_group` '.$sql_groups.'
) )
ORDER BY '.(($order_by == 'id_product') ? 'p.' : '').'`'.pSQL($order_by).'` '.pSQL($order_way).' ORDER BY '.(($order_by == 'id_product') ? 'p.' : '').pSQL($order_by).' '.pSQL($order_way).'
LIMIT '.(((int)$p - 1) * (int)$n).','.(int)$n; LIMIT '.(((int)$p - 1) * (int)$n).','.(int)$n;
$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql);
classes/Validate.php
+1 -1
View File
@@ -555,7 +555,7 @@ class ValidateCore
*/ */
public static function isOrderBy($order) public static function isOrderBy($order)
{ {
return preg_match('/^[a-zA-Z0-9_-]+$/', $order); return preg_match('/^[a-zA-Z0-9._-]+$/', $order);
} }
/** /**