<!DOCTYPE html>
<html>
<head>
</head>
<body>
<dl style="line-height: 1.5; margin-left: 2em">
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Author</dt>
<dd style="margin-left: 8.5em">Kouhei Sutou <kou****@clear*****></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Date</dt>
<dd style="margin-left: 8.5em">2013-06-12 15:08:04 +0900 (Wed, 12 Jun 2013)</dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">New Revision</dt>
<dd style="margin-left: 8.5em"><a href="https://github.com/groonga/groonga/commit/0442b91dc2a11c7253c2bccbbf9ffe71bff17704">0442b91dc2a11c7253c2bccbbf9ffe71bff17704</a></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Message</dt>
<dd style="margin-left: 8.5em"><pre style="border: 1px solid #aaa; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; padding: 0.5em; width: auto">doc: add summary about match_column and query_string parameters in query()</pre></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Modified files</dt>
<dd style="margin-left: 8.5em">
<ul>
<li><a href="https://github.com/groonga/groonga/commit/0442b91dc2a11c7253c2bccbbf9ffe71bff17704#diff-0">doc/source/reference/functions/query.txt</a></li>
</ul>
</dd>
</dl>
<div class="diff-section" style="clear: both">
<table style="border-collapse: collapse; border: 1px solid #aaa">
<thead>
<tr class="diff-header" style="border: 1px solid #aaa">
<td colspan="3">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre"> Modified: doc/source/reference/functions/query.txt (+10 -4)</span>
<span class="diff-header-mark" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">===================================================================</span>
</pre>
</td>
</tr>
</thead>
<tbody>
<tr>
<th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/0442b91dc2a11c7253c2bccbbf9ffe71bff17704#L0L113">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/0442b91dc2a11c7253c2bccbbf9ffe71bff17704#L0L114">114</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/0442b91dc2a11c7253c2bccbbf9ffe71bff17704#L0L115">115</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/0442b91dc2a11c7253c2bccbbf9ffe71bff17704#L0L116">116</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/0442b91dc2a11c7253c2bccbbf9ffe71bff17704#L0L117">117</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/0442b91dc2a11c7253c2bccbbf9ffe71bff17704#L0L118">118</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/0442b91dc2a11c7253c2bccbbf9ffe71bff17704#L0L119">119</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/0442b91dc2a11c7253c2bccbbf9ffe71bff17704#L0L120">120</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/0442b91dc2a11c7253c2bccbbf9ffe71bff17704#L0L121">121</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/0442b91dc2a11c7253c2bccbbf9ffe71bff17704#L0L122">122</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/0442b91dc2a11c7253c2bccbbf9ffe71bff17704#L0L123">123</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/0442b91dc2a11c7253c2bccbbf9ffe71bff17704#L0L124">124</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/0442b91dc2a11c7253c2bccbbf9ffe71bff17704#L0L125">125</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/0442b91dc2a11c7253c2bccbbf9ffe71bff17704#L0L126">126</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/0442b91dc2a11c7253c2bccbbf9ffe71bff17704#L0L127">127</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/0442b91dc2a11c7253c2bccbbf9ffe71bff17704#L0L128">128</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/0442b91dc2a11c7253c2bccbbf9ffe71bff17704#L0L129">129</a></span>
</pre>
</th>
<th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/0442b91dc2a11c7253c2bccbbf9ffe71bff17704#L0R113">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/0442b91dc2a11c7253c2bccbbf9ffe71bff17704#L0R114">114</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/0442b91dc2a11c7253c2bccbbf9ffe71bff17704#L0R115">115</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/0442b91dc2a11c7253c2bccbbf9ffe71bff17704#L0R116">116</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/0442b91dc2a11c7253c2bccbbf9ffe71bff17704#L0R117">117</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/0442b91dc2a11c7253c2bccbbf9ffe71bff17704#L0R118">118</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/0442b91dc2a11c7253c2bccbbf9ffe71bff17704#L0R119">119</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/0442b91dc2a11c7253c2bccbbf9ffe71bff17704#L0R120">120</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/0442b91dc2a11c7253c2bccbbf9ffe71bff17704#L0R121">121</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/0442b91dc2a11c7253c2bccbbf9ffe71bff17704#L0R122">122</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/0442b91dc2a11c7253c2bccbbf9ffe71bff17704#L0R123">123</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/0442b91dc2a11c7253c2bccbbf9ffe71bff17704#L0R124">124</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/0442b91dc2a11c7253c2bccbbf9ffe71bff17704#L0R125">125</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/0442b91dc2a11c7253c2bccbbf9ffe71bff17704#L0R126">126</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/0442b91dc2a11c7253c2bccbbf9ffe71bff17704#L0R127">127</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/0442b91dc2a11c7253c2bccbbf9ffe71bff17704#L0R128">128</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/0442b91dc2a11c7253c2bccbbf9ffe71bff17704#L0R129">129</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/0442b91dc2a11c7253c2bccbbf9ffe71bff17704#L0R130">130</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/0442b91dc2a11c7253c2bccbbf9ffe71bff17704#L0R131">131</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/0442b91dc2a11c7253c2bccbbf9ffe71bff17704#L0R132">132</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/0442b91dc2a11c7253c2bccbbf9ffe71bff17704#L0R133">133</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/0442b91dc2a11c7253c2bccbbf9ffe71bff17704#L0R134">134</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/0442b91dc2a11c7253c2bccbbf9ffe71bff17704#L0R135">135</a></span>
</pre>
</th>
<td class="diff-content" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -114,16 +114,22 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">There are two required parameter, ``match_column`` and ``query_string``.</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> ``match_column``</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> """"""""""""""""</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- It specifies ``match_column`` equivalent parameter.</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+It specifies the default target column for fulltext search by</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+``query_string`` parameter value. It is the same role as</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+``match_column`` parameter in ``select``.</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">-See :ref:`select-match-columns` about match_column.</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+See :ref:`select-match-columns` about ``match_column`` parameter in</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+``select``.</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre"> ``query_string``</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> """"""""""""""""</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- It specifies ``query`` equivalent parameter.</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+It specifies the search condition in</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+:doc:`/reference/grn_expr/query_syntax`. It is the same role as</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+``query`` parameter in ``select``.</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">-See :ref:`select-query` about query string.</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+See :ref:`select-match-columns` about ``query`` parameter in</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+``select``.</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre"> Optional parameter</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> ^^^^^^^^^^^^^^^^^^</span>
</pre>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>