padraic
2010-08-19 18:45:54 UTC
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[framework-svn][22851] standard/branches/release-1.10: ZF-10000: Merging patch by Martin Hujer to resolve</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>22851</dd>
<dt>Author</dt> <dd>padraic</dd>
<dt>Date</dt> <dd>2010-08-19 11:45:48 -0700 (Thu, 19 Aug 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>ZF-10000: Merging patch by Martin Hujer to resolve</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#standardbranchesrelease110libraryZendDbSelectphp">standard/branches/release-1.10/library/Zend/Db/Select.php</a></li>
<li><a href="#standardbranchesrelease110testsZendDbSelectStaticTestphp">standard/branches/release-1.10/tests/Zend/Db/Select/StaticTest.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="standardbranchesrelease110libraryZendDbSelectphp"></a>
<div class="modfile"><h4>Modified: standard/branches/release-1.10/library/Zend/Db/Select.php (22850 => 22851)</h4>
<pre class="diff"><span>
<span class="info">--- standard/branches/release-1.10/library/Zend/Db/Select.php 2010-08-19 18:40:51 UTC (rev 22850)
+++ standard/branches/release-1.10/library/Zend/Db/Select.php 2010-08-19 18:45:48 UTC (rev 22851)
</span><span class="lines">@@ -526,14 +526,14 @@
</span><span class="cx"> * appears. See {@link where()} for an example
</span><span class="cx"> *
</span><span class="cx"> * @param string $cond The HAVING condition.
</span><del>- * @param string|Zend_Db_Expr $val The value to quote into the condition.
</del><ins>+ * @param mixed $value OPTIONAL The value to quote into the condition.
+ * @param constant $type OPTIONAL The type of the given value </ins><span class="cx"> * @return Zend_Db_Select This Zend_Db_Select object. </span><span class="cx"> */ </span><del>- public function having($cond) </del><ins>+ public function having($cond, $value = null, $type = null) </ins><span class="cx"> { </span><del>- if (func_num_args() > 1) {
- $val = func_get_arg(1);
- $cond = $this->_adapter->quoteInto($cond, $val);
</del><ins>+ if ($value) {
+ $cond = $this->_adapter->quoteInto($cond, $value, $type); </ins><span class="cx"> } </span><span class="cx"> </span><span class="cx"> if ($this->_parts[self::HAVING]) {
</span><span class="lines">@@ -551,16 +551,16 @@
</span><span class="cx"> * Otherwise identical to orHaving().
</span><span class="cx"> *
</span><span class="cx"> * @param string $cond The HAVING condition.
</span><del>- * @param mixed $val The value to quote into the condition.
</del><ins>+ * @param mixed $value OPTIONAL The value to quote into the condition.
+ * @param constant $type OPTIONAL The type of the given value </ins><span class="cx"> * @return Zend_Db_Select This Zend_Db_Select object. </span><span class="cx"> * </span><span class="cx"> * @see having() </span><span class="cx"> */ </span><del>- public function orHaving($cond) </del><ins>+ public function orHaving($cond, $value = null, $type = null) </ins><span class="cx"> { </span><del>- if (func_num_args() > 1) {
- $val = func_get_arg(1);
- $cond = $this->_adapter->quoteInto($cond, $val);
</del><ins>+ if ($value) {
+ $cond = $this->_adapter->quoteInto($cond, $value, $type); </ins><span class="cx"> } </span><span class="cx"> </span><span class="cx"> if ($this->_parts[self::HAVING]) {
</span></span></pre></div>
<a id="standardbranchesrelease110testsZendDbSelectStaticTestphp"></a>
<div class="modfile"><h4>Modified: standard/branches/release-1.10/tests/Zend/Db/Select/StaticTest.php (22850 => 22851)</h4>
<pre class="diff"><span>
<span class="info">--- standard/branches/release-1.10/tests/Zend/Db/Select/StaticTest.php 2010-08-19 18:40:51 UTC (rev 22850)
+++ standard/branches/release-1.10/tests/Zend/Db/Select/StaticTest.php 2010-08-19 18:45:48 UTC (rev 22851) </span><span class="lines">@@ -509,6 +509,99 @@ </span><span class="cx"> $this->assertEquals('SELECT "zfbugs_products"."bug_id", COUNT(*) AS "thecount" FROM "zfbugs_products" GROUP BY "bug_id" HAVING (COUNT(*) > 1) OR (COUNT(*) = 1) ORDER BY "bug_id" ASC', $sql);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ /**
+ * Test if the quotation type could be passed
+ *
+ * @group ZF-10000
+ */
+ public function testSelectHavingQuoteBySpecificType()
+ {
+ $select = $this->_select()
+ ->columns(array('count' => 'COUNT(*)'))
+ ->group('bug_id');
+
+ $select->having('COUNT(*) > ?', '1', Zend_Db::INT_TYPE);
+ $this->assertEquals('SELECT "zfproducts".*, COUNT(*) AS "count" FROM "zfproducts" GROUP BY "bug_id" HAVING (COUNT(*) > 1)', $select->__toString());
+ }
+
+ /**
+ * Test if the quotation is done for int
+ *
+ * @group ZF-10000
+ */
+ public function testSelectHavingQuoteAsIntAutomatically()
+ {
+ $select = $this->_select()
+ ->columns(array('count' => 'COUNT(*)'))
+ ->group('bug_id');
+
+ $select->having('COUNT(*) > ?', 1);
+ $this->assertEquals('SELECT "zfproducts".*, COUNT(*) AS "count" FROM "zfproducts" GROUP BY "bug_id" HAVING (COUNT(*) > 1)', $select->__toString());
+ }
+
+ /**
+ * Test if the quotation is done for string
+ *
+ * @group ZF-10000
+ */
+ public function testSelectHavingQuoteAsStringAutomatically()
+ {
+ $select = $this->_select()
+ ->columns(array('count' => 'COUNT(*)'))
+ ->group('bug_id');
+
+ $select->having('COUNT(*) > ?', '1');
+ $this->assertEquals('SELECT "zfproducts".*, COUNT(*) AS "count" FROM "zfproducts" GROUP BY "bug_id" HAVING (COUNT(*) > \'1\')', $select->__toString());
+ }
+
+ /**
+ * Test if the quotation type could be passed
+ *
+ * @group ZF-10000
+ */
+ public function testSelectOrHavingQuoteBySpecificType()
+ {
+ $select = $this->_select()
+ ->columns(array('count' => 'COUNT(*)'))
+ ->group('bug_id');
+
+ $select->having('COUNT(*) > ?', '1', Zend_Db::INT_TYPE);
+ $select->orHaving('COUNT(*) = ?', '2', Zend_Db::INT_TYPE);
+ $this->assertEquals('SELECT "zfproducts".*, COUNT(*) AS "count" FROM "zfproducts" GROUP BY "bug_id" HAVING (COUNT(*) > 1) OR (COUNT(*) = 2)', $select->__toString());
+ }
+
+ /**
+ * Test if the quotation is done for int
+ *
+ * @group ZF-10000
+ */
+ public function testSelectOrHavingQuoteAsIntAutomatically()
+ {
+ $select = $this->_select()
+ ->columns(array('count' => 'COUNT(*)'))
+ ->group('bug_id');
+
</ins><span class="lines">@@ Diff output truncated at 4096 characters. @@
</span></span></pre>
</div>
</div>
</body>
</html>
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[framework-svn][22851] standard/branches/release-1.10: ZF-10000: Merging patch by Martin Hujer to resolve</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>22851</dd>
<dt>Author</dt> <dd>padraic</dd>
<dt>Date</dt> <dd>2010-08-19 11:45:48 -0700 (Thu, 19 Aug 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>ZF-10000: Merging patch by Martin Hujer to resolve</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#standardbranchesrelease110libraryZendDbSelectphp">standard/branches/release-1.10/library/Zend/Db/Select.php</a></li>
<li><a href="#standardbranchesrelease110testsZendDbSelectStaticTestphp">standard/branches/release-1.10/tests/Zend/Db/Select/StaticTest.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="standardbranchesrelease110libraryZendDbSelectphp"></a>
<div class="modfile"><h4>Modified: standard/branches/release-1.10/library/Zend/Db/Select.php (22850 => 22851)</h4>
<pre class="diff"><span>
<span class="info">--- standard/branches/release-1.10/library/Zend/Db/Select.php 2010-08-19 18:40:51 UTC (rev 22850)
+++ standard/branches/release-1.10/library/Zend/Db/Select.php 2010-08-19 18:45:48 UTC (rev 22851)
</span><span class="lines">@@ -526,14 +526,14 @@
</span><span class="cx"> * appears. See {@link where()} for an example
</span><span class="cx"> *
</span><span class="cx"> * @param string $cond The HAVING condition.
</span><del>- * @param string|Zend_Db_Expr $val The value to quote into the condition.
</del><ins>+ * @param mixed $value OPTIONAL The value to quote into the condition.
+ * @param constant $type OPTIONAL The type of the given value </ins><span class="cx"> * @return Zend_Db_Select This Zend_Db_Select object. </span><span class="cx"> */ </span><del>- public function having($cond) </del><ins>+ public function having($cond, $value = null, $type = null) </ins><span class="cx"> { </span><del>- if (func_num_args() > 1) {
- $val = func_get_arg(1);
- $cond = $this->_adapter->quoteInto($cond, $val);
</del><ins>+ if ($value) {
+ $cond = $this->_adapter->quoteInto($cond, $value, $type); </ins><span class="cx"> } </span><span class="cx"> </span><span class="cx"> if ($this->_parts[self::HAVING]) {
</span><span class="lines">@@ -551,16 +551,16 @@
</span><span class="cx"> * Otherwise identical to orHaving().
</span><span class="cx"> *
</span><span class="cx"> * @param string $cond The HAVING condition.
</span><del>- * @param mixed $val The value to quote into the condition.
</del><ins>+ * @param mixed $value OPTIONAL The value to quote into the condition.
+ * @param constant $type OPTIONAL The type of the given value </ins><span class="cx"> * @return Zend_Db_Select This Zend_Db_Select object. </span><span class="cx"> * </span><span class="cx"> * @see having() </span><span class="cx"> */ </span><del>- public function orHaving($cond) </del><ins>+ public function orHaving($cond, $value = null, $type = null) </ins><span class="cx"> { </span><del>- if (func_num_args() > 1) {
- $val = func_get_arg(1);
- $cond = $this->_adapter->quoteInto($cond, $val);
</del><ins>+ if ($value) {
+ $cond = $this->_adapter->quoteInto($cond, $value, $type); </ins><span class="cx"> } </span><span class="cx"> </span><span class="cx"> if ($this->_parts[self::HAVING]) {
</span></span></pre></div>
<a id="standardbranchesrelease110testsZendDbSelectStaticTestphp"></a>
<div class="modfile"><h4>Modified: standard/branches/release-1.10/tests/Zend/Db/Select/StaticTest.php (22850 => 22851)</h4>
<pre class="diff"><span>
<span class="info">--- standard/branches/release-1.10/tests/Zend/Db/Select/StaticTest.php 2010-08-19 18:40:51 UTC (rev 22850)
+++ standard/branches/release-1.10/tests/Zend/Db/Select/StaticTest.php 2010-08-19 18:45:48 UTC (rev 22851) </span><span class="lines">@@ -509,6 +509,99 @@ </span><span class="cx"> $this->assertEquals('SELECT "zfbugs_products"."bug_id", COUNT(*) AS "thecount" FROM "zfbugs_products" GROUP BY "bug_id" HAVING (COUNT(*) > 1) OR (COUNT(*) = 1) ORDER BY "bug_id" ASC', $sql);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ /**
+ * Test if the quotation type could be passed
+ *
+ * @group ZF-10000
+ */
+ public function testSelectHavingQuoteBySpecificType()
+ {
+ $select = $this->_select()
+ ->columns(array('count' => 'COUNT(*)'))
+ ->group('bug_id');
+
+ $select->having('COUNT(*) > ?', '1', Zend_Db::INT_TYPE);
+ $this->assertEquals('SELECT "zfproducts".*, COUNT(*) AS "count" FROM "zfproducts" GROUP BY "bug_id" HAVING (COUNT(*) > 1)', $select->__toString());
+ }
+
+ /**
+ * Test if the quotation is done for int
+ *
+ * @group ZF-10000
+ */
+ public function testSelectHavingQuoteAsIntAutomatically()
+ {
+ $select = $this->_select()
+ ->columns(array('count' => 'COUNT(*)'))
+ ->group('bug_id');
+
+ $select->having('COUNT(*) > ?', 1);
+ $this->assertEquals('SELECT "zfproducts".*, COUNT(*) AS "count" FROM "zfproducts" GROUP BY "bug_id" HAVING (COUNT(*) > 1)', $select->__toString());
+ }
+
+ /**
+ * Test if the quotation is done for string
+ *
+ * @group ZF-10000
+ */
+ public function testSelectHavingQuoteAsStringAutomatically()
+ {
+ $select = $this->_select()
+ ->columns(array('count' => 'COUNT(*)'))
+ ->group('bug_id');
+
+ $select->having('COUNT(*) > ?', '1');
+ $this->assertEquals('SELECT "zfproducts".*, COUNT(*) AS "count" FROM "zfproducts" GROUP BY "bug_id" HAVING (COUNT(*) > \'1\')', $select->__toString());
+ }
+
+ /**
+ * Test if the quotation type could be passed
+ *
+ * @group ZF-10000
+ */
+ public function testSelectOrHavingQuoteBySpecificType()
+ {
+ $select = $this->_select()
+ ->columns(array('count' => 'COUNT(*)'))
+ ->group('bug_id');
+
+ $select->having('COUNT(*) > ?', '1', Zend_Db::INT_TYPE);
+ $select->orHaving('COUNT(*) = ?', '2', Zend_Db::INT_TYPE);
+ $this->assertEquals('SELECT "zfproducts".*, COUNT(*) AS "count" FROM "zfproducts" GROUP BY "bug_id" HAVING (COUNT(*) > 1) OR (COUNT(*) = 2)', $select->__toString());
+ }
+
+ /**
+ * Test if the quotation is done for int
+ *
+ * @group ZF-10000
+ */
+ public function testSelectOrHavingQuoteAsIntAutomatically()
+ {
+ $select = $this->_select()
+ ->columns(array('count' => 'COUNT(*)'))
+ ->group('bug_id');
+
</ins><span class="lines">@@ Diff output truncated at 4096 characters. @@
</span></span></pre>
</div>
</div>
</body>
</html>