[TEP-COMMIT] [CVS catalog] fix the batch query total size logic
hpdl-OfajU3CKLf1/[email protected] 8 Mar 2005 23:32:34 -0000
| Newsgroups | gmane.comp.web.oscommerce.cvs |
|---|---|
| Message-ID | <[email protected]> |
<html>
<head>
<style><!--
body {background-color:#ffffff;}
.file {border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;}
.pathname {font-family:monospace; float:right;}
.fileheader {margin-bottom:.5em;}
.diff {margin:0;}
.tasklist {padding:4px;border:1px dashed #000000;margin-top:1em;}
.tasklist ul {margin-top:0;margin-bottom:0;}
tr.alt {background-color:#eeeeee}
#added {background-color:#ddffdd;}
#addedchars {background-color:#99ff99;font-weight:bolder;}
tr.alt #added {background-color:#ccf7cc;}
#removed {background-color:#ffdddd;}
#removedchars {background-color:#ff9999;font-weight:bolder;}
tr.alt #removed {background-color:#f7cccc;}
#info {color:#888888;}
#context {background-color:#eeeeee;}
td {padding-left:.3em;padding-right:.3em;}
tr.head {border-bottom-width:1px;border-bottom-style:solid;}
tr.head td {padding:0;padding-top:.2em;}
.task {background-color:#ffff00;}
.comment {padding:4px;border:1px dashed #000000;background-color:#ffffdd}
.error {color:red;}
hr {border-width:0px;height:2px;background:black;}
--></style>
</head>
<body>
<table cellspacing="0" cellpadding="0" border="0" rules="cols">
<tr class="head"><td colspan="4">Commit in <b><tt>catalog/catalog/includes/classes/database</tt></b><span id="info"> on MAIN</span></td></tr>
<tr><td><tt><a href="#file1">mysql.php</a></tt></td><td align="right" id="added">+24</td><td align="right" id="removed">-2</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/classes/database/mysql.php?rev=1.7&content-type=text/vnd.viewcvs-markup">1.7</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/classes/database/mysql.php.diff?r1=1.7&r2=1.8">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/classes/database/mysql.php?rev=1.8&content-type=text/vnd.viewcvs-markup">1.8</a></td></tr>
</table>
<pre class="comment">
fix the batch query total size logic
</pre>
<hr /><a name="file1" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog">catalog</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog">catalog</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes">includes</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/classes">classes</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/classes/database">database</a><br /></span>
<div class="fileheader"><big><b>mysql.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/classes/database/mysql.php?rev=1.7&content-type=text/vnd.viewcvs-markup">1.7</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/classes/database/mysql.php.diff?r1=1.7&r2=1.8">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/classes/database/mysql.php?rev=1.8&content-type=text/vnd.viewcvs-markup">1.8</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.7 -r1.8
--- mysql.php 2004/11/28 20:04:06 1.7
+++ mysql.php 2005/03/08 23:32:31 1.8
@@ -226,8 +226,30 @@
</small></pre><pre class="diff" id="context"> if (strpos($sql_query, 'SQL_CALC_FOUND_ROWS') !== false) {
$bb = $this->query('select found_rows() as total');
} else {
</pre><pre class="diff" id="removed">- $total_query = substr($sql_query, 0, strpos($sql_query, ' limit'));
- $bb = $this->query('select count(' . $select_field . ') as total ' . substr($total_query, strpos($sql_query, 'from ')));
</pre><pre class="diff" id="added">+ $total_query = substr($sql_query, 0, strpos($sql_query, ' limit '));
+
+ $pos_to = strlen($total_query);
+ $pos_from = strpos($total_query, ' from ');
+
+ if (($pos_group_by = strpos($total_query, ' group by ', $pos_from)) !== false) {
+ if ($pos_group_by < $pos_to) {
+ $pos_to = $pos_group_by;
+ }
+ }
+
+ if (($pos_having = strpos($total_query, ' having ', $pos_from)) !== false) {
+ if ($pos_having < $pos_to) {
+ $pos_to = $pos_having;
+ }
+ }
+
+ if (($pos_order_by = strpos($total_query, ' order by ', $pos_from)) !== false) {
+ if ($pos_order_by < $pos_to) {
+ $pos_to = $pos_order_by;
+ }
+ }
+
+ $bb = $this->query('select count(' . $select_field . ') as total ' . substr($total_query, $pos_from, ($pos_to - $pos_from)));
</pre><pre class="diff" id="context"> }
return $bb->value('total');
</pre></div>
<center><small><a href="http://www.badgers-in-foil.co.uk/projects/cvsspam/" title="commit -> email">CVSspam</a> 0.2.9</small></center>
</body></html>
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click