Merge pull request #5 from zhm/add-type-to-const

Add `type` attribute to A_CONST nodes.
pganalyze · Nov 17, 2015 · 95e5e72 · 95e5e72
2 parents 5b8475f + 78442e7
commit 95e5e72
Showing 1 changed file with 25 additions and 3 deletions.
diff --git a/patches/01_output_nodes_as_json.patch b/patches/01_output_nodes_as_json.patch
@@ -17,7 +17,7 @@ new file mode 100644
 index 0000000..eaded0f
 --- /dev/null
 +++ b/src/backend/nodes/outfuncs_json.c
-@@ -0,0 +1,1035 @@
+@@ -0,0 +1,1057 @@
 +/*-------------------------------------------------------------------------
 + *
 + * outfuncs_json.c
@@ -140,7 +140,7 @@ index 0000000..eaded0f
 +static void
 +_outToken(StringInfo str, const char *s)
 +{
-+	if (s == NULL || *s == '\0')
++	if (s == NULL)
 +	{
 +		appendStringInfoString(str, "null");
 +		return;
@@ -817,7 +817,7 @@ index 0000000..eaded0f
 +			break;
 +		case T_BitString:
 +			/* internal representation already has leading 'b' */
-+			appendStringInfoString(str, value->val.str);
++			_outToken(str, value->val.str);
 +			break;
 +		case T_Null:
 +			/* this is seen only within A_Const, not in transformed trees */
@@ -834,6 +834,28 @@ index 0000000..eaded0f
 +{
 +	WRITE_NODE_TYPE("A_CONST");
 +
++	appendStringInfoString(str, "\"type\": ");
++	switch (node->val.type)
++	{
++		case T_Integer:
++			appendStringInfoString(str, "\"integer\", ");
++			break;
++		case T_Float:
++			appendStringInfoString(str, "\"float\", ");
++			break;
++		case T_String:
++			appendStringInfoString(str, "\"string\", ");
++			break;
++		case T_BitString:
++			appendStringInfoString(str, "\"bitstring\", ");
++			break;
++		case T_Null:
++			appendStringInfoString(str, "\"null\", ");
++			break;
++		default:
++			elog(ERROR, "unrecognized value type: %d", (int) node->val.type);
++			break;
++	}
 +	appendStringInfoString(str, "\"val\": ");
 +	_outValue(str, &(node->val));
 +	appendStringInfoString(str, ", ");