Merge lp:~akiban-technologies/akiban-sql-parser/1.0.16-update into lp:~akiban-technologies/akiban-sql-parser/trunk

[Nathan Williams]

Bump version to 1.0.16 after release.

=== modified file 'README.rst'
--- README.rst	2012-11-30 15:38:33 +0000
+++ README.rst	2013-05-09 16:59:26 +0000
@@ -1,58 +1,129 @@
-************************************
 Akiban SQL Parser
-************************************
+=================
 
 Overview
-========
+--------
 
 The Akiban SQL Parser is a complete, production-quality Java parser for the SQL
 language. It defines the SQL grammar as implemented by Akiban, but can be used
 independently. It is derived from the Apache Derby parser.
 
-Building the Akiban SQL Parser From Source
-==========================================
-
-Use Maven (http://maven.apache.org) to build the Akiban SQL Parser.
-
-To build::
-
-  mvn install
-
-The resulting jar files are in the ``target`` directory. To build the Javadoc::
+
+Building From Source
+--------------------
+
+`Maven <http://maven.apache.org>`_ is used to build, test, and deploy.
+
+Run tests and create jars::
+
+  mvn package
+
+The resulting jar files are in the ``target`` directory.
+
+Generate the documentation::
 
   mvn javadoc:javadoc
 
 The resulting Javadoc HTML files are in ``target/site/apidocs``.
 
-Install Akiban SQL Parser from Binaries
-=======================================
+
+Using From Maven
+----------------
+
+The Akiban SQL Parser is in the standard Maven Central repository. Any Maven 
+project can use it directly by adding the appropriate entries to the
+``dependencies`` section of its ``pom.xml`` file:
+
+.. code-block:: xml
+
+  <dependencies>
+    <dependency>
+      <groupId>com.akiban</groupId>
+      <artifactId>akiban-sql-parser</artifactId>
+      <version>1.0.15</version>
+    </dependency>
+  </dependencies>
+
+
+Installing From Binaries
+------------------------
 
 Pre-built jars can be downloaded directly from
-https://launchpad.net/akiban-sql-parser/+download
-
-Unpack the distribution kit into a convenient directory using the
-appropriate utility (e.g. unzip or tar).
+https://launchpad.net/akiban-sql-parser/+download. Expand the package into a
+into a convenient directory using the appropriate utility
+(e.g. ``unzip`` or ``tar``).
 
 Review the ``LICENSE.txt`` file located in the root of the installation
-directory. The Akiban SQL Parser is licensed under the Eclipse Public
-License or a free-use community license, see our
-`licensing options <http://www.akiban.com/akiban-licensing-options>`_
-for more details. By installing, copying or otherwise using the Software
+directory. The Akiban SQL Parser is licensed under the Apache License,
+Version 2.0. By installing, copying or otherwise using the Software
 contained in the distribution kit, you agree to be bound by the terms of the
 license agreement. If you do not agree to these terms, remove and destroy all
 copies of the software in your possession immediately.
 
+
 Working with the Akiban SQL Parser
-==================================
-
-Add the jar file (e.g. ``akiban-sql-parser-1.0.12.jar``), found in the root
-directory of the distribution kit, to your project's classpath. For example,
-copy it to ``jre/lib/ext`` in your Java Runtime Environment, or add it to
-your classpath environment variable..
+----------------------------------
+
+The following example demonstrates the simplest usage:
+
+.. code-block:: java
+
+  import com.akiban.sql.parser.SQLParser;
+  import com.akiban.sql.parser.StatementNode;
+  
+  public class ParserHello {
+      public static void main(String[] args) throws Exception {
+          SQLParser parser = new SQLParser();
+          for(String s : args) {
+              StatementNode stmt = parser.parseStatement(s);
+              stmt.treePrint();
+          }
+      }
+  }
+
+A new `SQLParser <http://akiban.github.io/sql-parser/javadoc/com/akiban/sql/parser/SQLParser.html>`_
+is instantiated and each command line argument is
+`parsed <http://akiban.github.io/sql-parser/javadoc/com/akiban/sql/parser/SQLParser.html#parseStatement%28java.lang.String%29>`_
+and `printed <http://akiban.github.io/sql-parser/javadoc/com/akiban/sql/parser/QueryTreeNode.html#treePrint%28%29>`_
+to standard output. The result is a debug dump of all nodes in the underlying Abstract Syntax Tree.
+More advanced usages will generally parse a statement and then pass a custom
+`Visitor <http://akiban.github.io/sql-parser/javadoc/com/akiban/sql/parser/Visitor.html>`_ to the
+`accept() <http://akiban.github.io/sql-parser/javadoc/com/akiban/sql/parser/QueryTreeNode.html#accept%28com.akiban.sql.parser.Visitor%29>`_ method.
+
+To compile and run the example from the command line, copy the code into a
+file named ``ParserHello.java`` and ensure the parser jar file, found in
+the root directory of the binary package, is in your ``classpath``::
+
+  $ export CLASSPATH="akiban-sql-parser-1.0.15.jar:."
+
+Compile::
+
+  $ javac ParserHello.java
+
+Run (output trimmed for simplicity)::
+
+  $ java ParserHello "SELECT a FROM b"
+  com.akiban.sql.parser.CursorNode@5889dee2
+  statementType: SELECT
+  resultSet:
+      com.akiban.sql.parser.SelectNode@4387f4d7
+      resultColumns:
+          [0]:
+          com.akiban.sql.parser.ResultColumn@5123968
+          name: a
+          expression:
+              com.akiban.sql.parser.ColumnReference@6f76dd71
+              columnName: a
+      fromList:
+          [0]:
+          com.akiban.sql.parser.FromBaseTable@18317b1d
+          tableName: b
+
 
 More Information
-================
-
-For more information, join the Aiban mailing list on google groups
-(https://groups.google.com/a/akiban.com/d/forum/akiban-user) or hop on the
-#akiban channel on irc.freenode.net
+----------------
+
+For more information, join the 
+`akiban-user <https://groups.google.com/a/akiban.com/d/forum/akiban-user>`_
+mailing list on Google Groups or hop on the #akiban channel on irc.freenode.net
+

=== modified file 'pom.xml'
--- pom.xml	2013-05-08 22:13:20 +0000
+++ pom.xml	2013-05-09 16:59:26 +0000
@@ -13,7 +13,7 @@
 
     <groupId>com.akiban</groupId>
     <artifactId>akiban-sql-parser</artifactId>
-    <version>1.0.15-SNAPSHOT</version>
+    <version>1.0.16-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Akiban SQL Parser</name>