Repository: phoenix Updated Branches: refs/heads/calcite 68717c054 -> ac544b4ba
PHOENIX-3298 Single column primary key may not be null (Eric Lomore) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/ac544b4b Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/ac544b4b Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/ac544b4b Branch: refs/heads/calcite Commit: ac544b4bae35460cd28adf63b7400a34170067f9 Parents: 68717c0 Author: maryannxue <[email protected]> Authored: Thu Oct 6 14:16:02 2016 -0700 Committer: maryannxue <[email protected]> Committed: Thu Oct 6 14:16:02 2016 -0700 ---------------------------------------------------------------------- phoenix-core/src/main/codegen/includes/parserImpls.ftl | 2 +- .../src/main/java/org/apache/calcite/sql/SqlColumnDefNode.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/ac544b4b/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 649fb0a..58018d5 100644 --- a/phoenix-core/src/main/codegen/includes/parserImpls.ftl +++ b/phoenix-core/src/main/codegen/includes/parserImpls.ftl @@ -543,7 +543,7 @@ SqlColumnDefNode ColumnDef() : { SqlIdentifier columnName; SqlDataTypeNode dataType; - boolean isNull = true; + Boolean isNull = null; boolean isPk = false; SortOrder sortOrder = SortOrder.getDefault(); boolean isRowTimestamp = false; http://git-wip-us.apache.org/repos/asf/phoenix/blob/ac544b4b/phoenix-core/src/main/java/org/apache/calcite/sql/SqlColumnDefNode.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/calcite/sql/SqlColumnDefNode.java b/phoenix-core/src/main/java/org/apache/calcite/sql/SqlColumnDefNode.java index 88e1b3d..99d7eed 100644 --- a/phoenix-core/src/main/java/org/apache/calcite/sql/SqlColumnDefNode.java +++ b/phoenix-core/src/main/java/org/apache/calcite/sql/SqlColumnDefNode.java @@ -35,7 +35,7 @@ public class SqlColumnDefNode extends SqlNode{ SqlParserPos pos, SqlIdentifier columnName, SqlDataTypeNode dataType, - boolean isNullable, + Boolean isNullable, boolean isPk, SortOrder sortOrder, String expressionStr,
