phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jamestay...@apache.org
Subject phoenix git commit: PHOENIX-3263 Allow comma before CONSTRAINT to be optional (Eric Lomore)
Date Thu, 22 Sep 2016 21:39:49 GMT
Repository: phoenix
Updated Branches:
  refs/heads/calcite b612f1696 -> 026bc8a0c


PHOENIX-3263 Allow comma before CONSTRAINT to be optional (Eric Lomore)


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/026bc8a0
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/026bc8a0
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/026bc8a0

Branch: refs/heads/calcite
Commit: 026bc8a0c43aaf595e3aaadb572ef5a6cabc9cb1
Parents: b612f16
Author: James Taylor <jamestaylor@apache.org>
Authored: Thu Sep 22 14:42:17 2016 -0700
Committer: James Taylor <jamestaylor@apache.org>
Committed: Thu Sep 22 14:42:17 2016 -0700

----------------------------------------------------------------------
 phoenix-core/src/main/codegen/includes/parserImpls.ftl | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/026bc8a0/phoenix-core/src/main/codegen/includes/parserImpls.ftl
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/codegen/includes/parserImpls.ftl b/phoenix-core/src/main/codegen/includes/parserImpls.ftl
index 1360b68..649fb0a 100644
--- a/phoenix-core/src/main/codegen/includes/parserImpls.ftl
+++ b/phoenix-core/src/main/codegen/includes/parserImpls.ftl
@@ -144,6 +144,9 @@ SqlNode SqlCreateTable() :
     <LPAREN>
     columnDefs = ColumnDefList()
     (
+    	(
+    		<COMMA>
+    	)?
         <CONSTRAINT> pkConstraint = SimpleIdentifier() <PRIMARY> <KEY>
         <LPAREN> pkConstraintColumnDefs = PkConstraintColumnDefList() <RPAREN>
         |


Mime
View raw message