Merge lp:~mmcm/akiban-sql-parser/current-schema into lp:~akiban-technologies/akiban-sql-parser/trunk

[Mike McMahon]

Add CURRENT_SCHEMA as a synonym for CURRENT SCHEMA for consistency and compatibility with Postgres.

[Thomas Jones-Low (tjoneslo)]

As described.

review: Approve

=== modified file 'src/main/javacc/SQLGrammar.jj'
--- src/main/javacc/SQLGrammar.jj	2012-12-12 04:04:27 +0000
+++ src/main/javacc/SQLGrammar.jj	2012-12-14 23:43:23 +0000
@@ -2367,6 +2367,7 @@
 | <CALL: "call">
 | <CURDATE: "curdate">
 | <CURRENT_ROLE: "current_role">
+| <CURRENT_SCHEMA: "current_schema">
 | <CURTIME: "curtime">
 | <DATABASE: "database">
 | <GET_CURRENT_CONNECTION: "getCurrentConnection">
@@ -7347,6 +7348,11 @@
     {
         return parm;
     }
+|
+    parm = currentSchemaNode()
+    {
+        return parm;
+    }
 }
 
 ValueNode
@@ -7385,6 +7391,18 @@
     }
 }
 
+ValueNode
+currentSchemaNode() throws StandardException :
+{}
+{
+    <CURRENT_SCHEMA>
+    {
+        checkOptionalParens();
+        return (ValueNode)nodeFactory.getNode(NodeTypes.CURRENT_SCHEMA_NODE,
+                                              parserContext);
+    }
+}
+
 JavaToSQLValueNode
 newInvocation() throws StandardException :
 {
@@ -14430,6 +14448,7 @@
 | tok = <BOOLEAN>
 | tok = <CALL>
 | tok = <CURRENT_ROLE>
+| tok = <CURRENT_SCHEMA>
 | tok = <EXPLAIN>
 | tok = <GROUPING>
 | tok = <LONGINT>