[pgmoneta#357] bool, null/empty string support for json parser

jesperpedersen · Aug 15, 2024 · 8a946e7 · 8a946e7
1 parent 7ba2633
commit 8a946e7
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 3 deletions.
diff --git a/src/libpgmoneta/json.c b/src/libpgmoneta/json.c
@@ -708,7 +708,11 @@ json_add(struct json* obj, char* key, uintptr_t val, enum value_type type)
 static bool
 value_start(char ch)
 {
-   return (isdigit(ch) || ch == '-' || ch == '+') || (ch == '[') || (ch == '{') || (ch == '"');
+   return (isdigit(ch) || ch == '-' || ch == '+') || // number
+          (ch == '[') || // array
+          (ch == '{') || // item
+          (ch == '"' || ch == 'n') || // string or null string
+          (ch == 't' || ch == 'f'); // potential boolean value
 }
 
 static int
@@ -728,7 +732,14 @@ fill_value(char* str, char* key, uint64_t* index, struct json* o)
       {
          goto error;
       }
-      json_add(o, key, (uintptr_t)val, ValueString);
+      if (val == NULL)
+      {
+         json_add(o, key, (uintptr_t)"", ValueString);
+      }
+      else
+      {
+         json_add(o, key, (uintptr_t)val, ValueString);
+      }
       idx++;
       free(val);
    }
@@ -785,6 +796,32 @@ fill_value(char* str, char* key, uint64_t* index, struct json* o)
       }
       json_add(o, key, (uintptr_t)val, ValueJSON);
    }
+   else if (str[idx] == 'n' || str[idx] == 't' || str[idx] == 'f')
+   {
+      char* val = NULL;
+      while (idx < len && str[idx] >= 'a' && str[idx] <= 'z')
+      {
+         val = pgmoneta_append_char(val, str[idx++]);
+      }
+      if (pgmoneta_compare_string(val, "null"))
+      {
+         json_add(o, key, 0, ValueString);
+      }
+      else if (pgmoneta_compare_string(val, "true"))
+      {
+         json_add(o, key, true, ValueBool);
+      }
+      else if (pgmoneta_compare_string(val, "false"))
+      {
+         json_add(o, key, false, ValueBool);
+      }
+      else
+      {
+         free(val);
+         goto error;
+      }
+      free(val);
+   }
    else
    {
       goto error;

diff --git a/src/libpgmoneta/value.c b/src/libpgmoneta/value.c
@@ -421,7 +421,7 @@ string_to_string_cb(uintptr_t data, char* tag, int indent)
    memset(buf, 0, MISC_LENGTH);
    if (str == NULL)
    {
-      snprintf(buf, MISC_LENGTH, "(null)");
+      snprintf(buf, MISC_LENGTH, "null");
    }
    else
    {