<!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>[213870] trunk/Websites/perf.webkit.org</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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><a href="http://trac.webkit.org/projects/webkit/changeset/213870">213870</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2017-03-13 14:44:32 -0700 (Mon, 13 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Database's query functions should support querying for a row with NULL value
https://bugs.webkit.org/show_bug.cgi?id=169504
Reviewed by Antti Koivisto.
Add the support for calling select_* with one of column values set to NULL.
This feature is useful in webkit.org/b/146374 and webkit.org/b/168962.
* public/include/db.php:
(Database::prepare_params): Added $null_columns as an optional argument.
(Database::select_conditions_with_null_columns): Added. Builds up a query string by appending AND x is NULL
to match columns whose value must be NULL.
(Database::_select_update_or_insert_row):
(Database::select_rows):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebsitesperfwebkitorgChangeLog">trunk/Websites/perf.webkit.org/ChangeLog</a></li>
<li><a href="#trunkWebsitesperfwebkitorgpublicincludedbphp">trunk/Websites/perf.webkit.org/public/include/db.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebsitesperfwebkitorgChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/ChangeLog (213869 => 213870)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/ChangeLog 2017-03-13 21:36:46 UTC (rev 213869)
+++ trunk/Websites/perf.webkit.org/ChangeLog 2017-03-13 21:44:32 UTC (rev 213870)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2017-03-13 Ryosuke Niwa <rniwa@webkit.org>
+
+ Database's query functions should support querying for a row with NULL value
+ https://bugs.webkit.org/show_bug.cgi?id=169504
+
+ Reviewed by Antti Koivisto.
+
+ Add the support for calling select_* with one of column values set to NULL.
+ This feature is useful in webkit.org/b/146374 and webkit.org/b/168962.
+
+ * public/include/db.php:
+ (Database::prepare_params): Added $null_columns as an optional argument.
+ (Database::select_conditions_with_null_columns): Added. Builds up a query string by appending AND x is NULL
+ to match columns whose value must be NULL.
+ (Database::_select_update_or_insert_row):
+ (Database::select_rows):
+
</ins><span class="cx"> 2017-03-13 Dewei Zhu <dewei_zhu@apple.com>
</span><span class="cx">
</span><span class="cx"> Add the ability to report a commit with sub-commits.
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgpublicincludedbphp"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/public/include/db.php (213869 => 213870)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/public/include/db.php 2017-03-13 21:36:46 UTC (rev 213869)
+++ trunk/Websites/perf.webkit.org/public/include/db.php 2017-03-13 21:44:32 UTC (rev 213870)
</span><span class="lines">@@ -105,14 +105,20 @@
</span><span class="cx"> return $prefix ? $prefix . '_' . $column : $column;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- private function prepare_params($params, &$placeholders, &$values) {
- $column_names = array_keys($params);
</del><ins>+ private function prepare_params($params, &$placeholders, &$values, $null_columns = NULL) {
+ $column_names = array();
</ins><span class="cx">
</span><span class="cx"> $i = count($values) + 1;
</span><del>- foreach ($column_names as $name) {
</del><ins>+ foreach (array_keys($params) as $name) {
+ $current_value = $params[$name];
+ if ($current_value === NULL && $null_columns !== NULL) {
+ array_push($null_columns, $name);
+ continue;
+ }
</ins><span class="cx"> assert(ctype_alnum_underscore($name));
</span><ins>+ array_push($column_names, $name);
</ins><span class="cx"> array_push($placeholders, '$' . $i);
</span><del>- array_push($values, $params[$name]);
</del><ins>+ array_push($values, $current_value);
</ins><span class="cx"> $i++;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -119,6 +125,18 @@
</span><span class="cx"> return $column_names;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ private function select_conditions_with_null_columns($prefix, $column_names, $placeholders, $null_columns) {
+ $column_names = $this->prefixed_column_names($column_names, $prefix);
+ $placeholders = join(', ', $placeholders);
+
+ if (!$column_names && !$placeholders)
+ $column_names = $placeholders = '1';
+ $query = "($column_names) = ($placeholders)";
+ foreach ($null_columns as $column_name)
+ $query .= ' AND ' . $this->prefixed_name($column_name, $prefix) . ' IS NULL';
+ return $query;
+ }
+
</ins><span class="cx"> function insert_row($table, $prefix, $params, $returning = 'id') {
</span><span class="cx"> $placeholders = array();
</span><span class="cx"> $values = array();
</span><span class="lines">@@ -154,7 +172,8 @@
</span><span class="cx"> $values = array();
</span><span class="cx">
</span><span class="cx"> $select_placeholders = array();
</span><del>- $select_column_names = $this->prepare_params($select_params, $select_placeholders, $values);
</del><ins>+ $select_null_columns = array();
+ $select_column_names = $this->prepare_params($select_params, $select_placeholders, $values, $select_null_columns);
</ins><span class="cx"> $select_values = array_slice($values, 0);
</span><span class="cx">
</span><span class="cx"> if ($insert_params === NULL)
</span><span class="lines">@@ -165,10 +184,10 @@
</span><span class="cx"> assert(!!$returning);
</span><span class="cx"> assert(!$prefix || ctype_alnum_underscore($prefix));
</span><span class="cx"> $returning_column_name = $returning == '*' ? '*' : $this->prefixed_name($returning, $prefix);
</span><del>- $select_column_names = $this->prefixed_column_names($select_column_names, $prefix);
- $select_placeholders = join(', ', $select_placeholders);
- $query = "SELECT $returning_column_name FROM $table WHERE ($select_column_names) = ($select_placeholders)";
</del><span class="cx">
</span><ins>+ $condition = $this->select_conditions_with_null_columns($prefix, $select_column_names, $select_placeholders, $select_null_columns);
+ $query = "SELECT $returning_column_name FROM $table WHERE $condition";
+
</ins><span class="cx"> $insert_column_names = $this->prefixed_column_names($insert_column_names, $prefix);
</span><span class="cx"> $insert_placeholders = join(', ', $insert_placeholders);
</span><span class="cx">
</span><span class="lines">@@ -176,7 +195,7 @@
</span><span class="cx"> $rows = NULL;
</span><span class="cx"> if ($should_update) {
</span><span class="cx"> $rows = $this->query_and_fetch_all("UPDATE $table SET ($insert_column_names) = ($insert_placeholders)
</span><del>- WHERE ($select_column_names) = ($select_placeholders) RETURNING $returning_column_name", $values);
</del><ins>+ WHERE $condition RETURNING $returning_column_name", $values);
</ins><span class="cx"> }
</span><span class="cx"> if (!$rows && $should_insert) {
</span><span class="cx"> $rows = $this->query_and_fetch_all("INSERT INTO $table ($insert_column_names) SELECT $insert_placeholders
</span><span class="lines">@@ -226,11 +245,12 @@
</span><span class="cx">
</span><span class="cx"> $placeholders = array();
</span><span class="cx"> $values = array();
</span><del>- $column_names = $this->prefixed_column_names($this->prepare_params($params, $placeholders, $values), $prefix);
- $placeholders = join(', ', $placeholders);
- if (!$column_names && !$placeholders)
- $column_names = $placeholders = '1';
- $query = "SELECT * FROM $table WHERE ($column_names) = ($placeholders)";
</del><ins>+ $null_columns = array();
+ $column_names = $this->prepare_params($params, $placeholders, $values, $null_columns);
+ $condition = $this->select_conditions_with_null_columns($prefix, $column_names, $placeholders, $null_columns);
+
+ $query = "SELECT * FROM $table WHERE $condition";
+
</ins><span class="cx"> if ($order_by) {
</span><span class="cx"> if (!is_array($order_by))
</span><span class="cx"> $order_by = array($order_by);
</span></span></pre>
</div>
</div>
</body>
</html>