Merge branch 'develop' into feature-az-offset_keyword

# Conflicts:
#	src/riak_ql_parser.yrl
#	src/riak_ql_to_string.erl

Author: hmmr

README.md

@@ -106,4 +106,4 @@ The runtime query system performs operations on data in the query pipeline by ca
 
 ## Testing Strategy
 
-Details of the testing strategy are written up in [`riak_test` And Test Strategy](./docs/riak_test_and_test_strategy.md)
+Details of the testing strategy are written up in [`riak_test` And Test Strategy](./doc/riak_test_and_test_strategy.md)

include/riak_ql_ddl.hrl

@@ -36,12 +36,16 @@
          }).
 
 
--define(SQL_PARAM, #param_v1).
--define(SQL_PARAM_RECORD_NAME, param_v1).
--define(SQL_PARAM_RECORD_VERSION, 1).
--record(?SQL_PARAM_RECORD_NAME, {
+-define(SQL_PARAM, #param_v2).
+-define(SQL_PARAM_RECORD_NAME, param_v2).
+-define(SQL_PARAM_RECORD_VERSION, v2).
+-record(param_v1, {
           name = [<<>>] :: [binary()]
          }).
+-record(?SQL_PARAM_RECORD_NAME, {
+          name = [<<>>] :: [binary()],
+          ordering = undefined :: undefined | ascending | descending
+         }).
 
 -record(hash_fn_v1, {
           mod       :: atom(),
@@ -50,19 +54,29 @@
           type      :: riak_ql_ddl:simple_field_type()
          }).
 
+-define(DDL_KEY, #key_v1).
+-define(DDL_KEY_RECORD_NAME, key_v1).
 -record(key_v1, {
           ast = [] :: [#hash_fn_v1{} | ?SQL_PARAM{}]
          }).
 
+-define(DDL, #ddl_v2).
+-define(DDL_RECORD_NAME, ddl_v2).
+-define(DDL_RECORD_VERSION, v2).
+-type ddl_version() :: v1 | v2.
 -record(ddl_v1, {
           table              :: binary(),
           fields        = [] :: [#riak_field_v1{}],
           partition_key      :: #key_v1{} | none,
           local_key          :: #key_v1{}
          }).
--define(DDL, #ddl_v1).
--define(DDL_RECORD_NAME, ddl_v1).
--define(DDL_RECORD_VERSION, 1).
+-record(?DDL_RECORD_NAME, {
+          table              :: binary(),
+          fields        = [] :: [#riak_field_v1{}],
+          partition_key      :: #key_v1{} | none,
+          local_key          :: #key_v1{},
+          minimum_capability = v1 :: ddl_version()
+         }).
 
 -define(SQL_NULL, []).
 

priv/riak_ql_keywords.csv

@@ -1,6 +1,10 @@
 and
+asc
 boolean
+by
 create
+desc
+describe
 double
 false
 from
@@ -10,10 +14,13 @@ key
 limit
 not
 null
+offset
 or
+order
 primary
 quantum
 select
+show
 sint64
 table
 timestamp

rebar.config

@@ -11,8 +11,7 @@
 {xref_checks, [undefined_function_calls, undefined_functions,
                locals_not_used,
                deprecated_function_calls, deprecated_functions]}.
-
-
+               
 {eunit_opts, [no_tty, {report, {unite_compact, []}}]}.
 
 %% == escriptize ==