Author: jamestaylor
Date: Thu Dec 1 21:21:46 2016
New Revision: 1772279
URL: http://svn.apache.org/viewvc?rev=1772279&view=rev
Log:
Adjust formatting on reference page
Modified:
phoenix/phoenix-docs/src/docsrc/help/phoenix.csv
phoenix/site/publish/language/index.html
Modified: phoenix/phoenix-docs/src/docsrc/help/phoenix.csv
URL:
http://svn.apache.org/viewvc/phoenix/phoenix-docs/src/docsrc/help/phoenix.csv?rev=1772279&r1=1772278&r2=1772279&view=diff
==============================================================================
--- phoenix/phoenix-docs/src/docsrc/help/phoenix.csv (original)
+++ phoenix/phoenix-docs/src/docsrc/help/phoenix.csv Thu Dec 1 21:21:46 2016
@@ -550,7 +550,8 @@ SERIAL
"
"Other Grammar","Column Def","
-columnRef dataType [[NOT] NULL] [DEFAULT constantOperand] [PRIMARY KEY [ASC |
DESC] [ROW_TIMESTAMP]]
+columnRef dataType [[NOT] NULL] [DEFAULT constantOperand]
+[PRIMARY KEY [ASC | DESC] [ROW_TIMESTAMP]]
","
Define a new primary key column. The column name is case insensitive by
default and
case sensitive if double quoted. The sort order of a primary key may be
ascending (ASC)
Modified: phoenix/site/publish/language/index.html
URL:
http://svn.apache.org/viewvc/phoenix/site/publish/language/index.html?rev=1772279&r1=1772278&r2=1772279&view=diff
==============================================================================
--- phoenix/site/publish/language/index.html (original)
+++ phoenix/site/publish/language/index.html Thu Dec 1 21:21:46 2016
@@ -1063,11 +1063,12 @@ syntax-end -->
<h3 id="column_def" class="notranslate">Column Def</h3>
<!-- railroad-start -->
-<table class="railroad"><tr class="railroad"><td class="d"><code class="c"><a
href="index.html#column_ref">columnRef</a> <a
href="index.html#data_type">dataType</a></code></td><td class="d"><table
class="railroad"><tr class="railroad"><td class="ts"></td><td
class="d"> </td><td class="te"></td></tr><tr class="railroad"><td
class="ls"></td><td class="d"><table class="railroad"><tr class="railroad"><td
class="d"><table class="railroad"><tr class="railroad"><td class="ts"></td><td
class="d"> </td><td class="te"></td></tr><tr class="railroad"><td
class="ls"></td><td class="d"><code class="c">NOT</code></td><td
class="le"></td></tr></table></td><td class="d"><code
class="c">NULL</code></td></tr></table></td><td
class="le"></td></tr></table></td><td class="d"><table class="railroad"><tr
class="railroad"><td class="ts"></td><td class="d"> </td><td
class="te"></td></tr><tr class="railroad"><td class="ls"></td><td
class="d"><table class="railroad"><tr class="railroad"><td clas
s="d"><code class="c">DEFAULT <a
href="index.html#operand">constantOperand</a></code></td></tr></table></td><td
class="le"></td></tr></table></td><td class="d"><table class="railroad"><tr
class="railroad"><td class="ts"></td><td class="d"> </td><td
class="te"></td></tr><tr class="railroad"><td class="ls"></td><td
class="d"><table class="railroad"><tr class="railroad"><td class="d"><code
class="c">PRIMARY KEY</code></td><td class="d"><table class="railroad"><tr
class="railroad"><td class="ts"></td><td class="d"> </td><td
class="te"></td></tr><tr class="railroad"><td class="ls"></td><td
class="d"><table class="railroad"><tr class="railroad"><td class="ts"></td><td
class="d"><code class="c">ASC</code></td><td class="te"></td></tr><tr
class="railroad"><td class="ls"></td><td class="d"><code
class="c">DESC</code></td><td class="le"></td></tr></table></td><td
class="le"></td></tr></table></td><td class="d"><table class="railroad"><tr
class="railroad"><td class="ts"></td><td clas
s="d"> </td><td class="te"></td></tr><tr class="railroad"><td
class="ls"></td><td class="d"><code class="c">ROW_TIMESTAMP</code></td><td
class="le"></td></tr></table></td></tr></table></td><td
class="le"></td></tr></table></td></tr></table>
+<table class="railroad"><tr class="railroad"><td class="d"><code class="c"><a
href="index.html#column_ref">columnRef</a> <a
href="index.html#data_type">dataType</a></code></td><td class="d"><table
class="railroad"><tr class="railroad"><td class="ts"></td><td
class="d"> </td><td class="te"></td></tr><tr class="railroad"><td
class="ls"></td><td class="d"><table class="railroad"><tr class="railroad"><td
class="d"><table class="railroad"><tr class="railroad"><td class="ts"></td><td
class="d"> </td><td class="te"></td></tr><tr class="railroad"><td
class="ls"></td><td class="d"><code class="c">NOT</code></td><td
class="le"></td></tr></table></td><td class="d"><code
class="c">NULL</code></td></tr></table></td><td
class="le"></td></tr></table></td><td class="d"><table class="railroad"><tr
class="railroad"><td class="ts"></td><td class="d"> </td><td
class="te"></td></tr><tr class="railroad"><td class="ls"></td><td
class="d"><table class="railroad"><tr class="railroad"><td clas
s="d"><code class="c">DEFAULT <a
href="index.html#operand">constantOperand</a></code></td></tr></table></td><td
class="le"></td></tr></table></td></tr></table><br /><table
class="railroad"><tr class="railroad"><td class="ts"></td><td
class="d"> </td><td class="te"></td></tr><tr class="railroad"><td
class="ls"></td><td class="d"><table class="railroad"><tr class="railroad"><td
class="d"><code class="c">PRIMARY KEY</code></td><td class="d"><table
class="railroad"><tr class="railroad"><td class="ts"></td><td
class="d"> </td><td class="te"></td></tr><tr class="railroad"><td
class="ls"></td><td class="d"><table class="railroad"><tr class="railroad"><td
class="ts"></td><td class="d"><code class="c">ASC</code></td><td
class="te"></td></tr><tr class="railroad"><td class="ls"></td><td
class="d"><code class="c">DESC</code></td><td
class="le"></td></tr></table></td><td class="le"></td></tr></table></td><td
class="d"><table class="railroad"><tr class="railroad"><td class="ts"></td><td
class="d"> </td><td class="te"></td></tr><tr class="railroad"><td
class="ls"></td><td class="d"><code class="c">ROW_TIMESTAMP</code></td><td
class="le"></td></tr></table></td></tr></table></td><td
class="le"></td></tr></table>
<!-- railroad-end -->
<!-- syntax-start
<pre>
-<a href="index.html#column_ref">columnRef</a> <a
href="index.html#data_type">dataType</a> [[NOT] NULL] [DEFAULT <a
href="index.html#operand">constantOperand</a>] [PRIMARY KEY [ASC | DESC]
[ROW_TIMESTAMP]]
+<a href="index.html#column_ref">columnRef</a> <a
href="index.html#data_type">dataType</a> [[NOT] NULL] [DEFAULT <a
href="index.html#operand">constantOperand</a>]
+[PRIMARY KEY [ASC | DESC] [ROW_TIMESTAMP]]
</pre>
syntax-end -->
<p>Define a new primary key column. The column name is case insensitive by
default and case sensitive if double quoted. The sort order of a primary key
may be ascending (<code>ASC</code>) or descending (<code>DESC</code>). The
default is ascending. You may also specify a default value (Phoenix 4.9 or
above) for the column with a constant expression. If the column is the only
column that forms the primary key, then it can be designated as
<code>ROW_TIMESTAMP</code> column provided its data type is one of these:
<code>BIGINT, UNSIGNED_LONG, DATE, TIME</code> and <code>TIMESTAMP</code>.</p>
