Fix a bug that wrong tag name is used in XML output

It is caused when "REFERENCE_VECTOR_COLUMN._key" is used in output_columns. See a test case for XML output for details.
groonga · Jun 12, 2013 · eaafa38 · eaafa38
1 parent 52cf0f8
commit eaafa38
Show file tree

Hide file tree

Showing 5 changed files with 93 additions and 1 deletion.
diff --git a/lib/output.c b/lib/output.c
@@ -542,7 +542,7 @@ grn_text_atoj(grn_ctx *ctx, grn_obj *outbuf, grn_content_type output_type,
             grn_obj_get_value(ctx, a->obj, id, &buf);
             idp = (grn_id *)GRN_BULK_HEAD(&buf);
             vs = GRN_BULK_VSIZE(&buf) / sizeof(grn_id);
-            grn_output_array_open(ctx, outbuf, output_type, "COLUMN", vs);
+            grn_output_array_open(ctx, outbuf, output_type, "VECTOR", vs);
             for (; vs--; idp++) {
               grn_text_atoj(ctx, outbuf, output_type, (grn_obj *)a->next, *idp);
             }

diff --git a/test/command/suite/select/output_columns/vector/reference/key/json.expected b/test/command/suite/select/output_columns/vector/reference/key/json.expected
@@ -0,0 +1,43 @@
+table_create Users TABLE_HASH_KEY ShortText
+[[0,0.0,0.0],true]
+table_create Bookmarks TABLE_HASH_KEY ShortText
+[[0,0.0,0.0],true]
+column_create Bookmarks users COLUMN_VECTOR Users
+[[0,0.0,0.0],true]
+load --table Bookmarks
+[
+{"_key": "http://groonga.org/", "users": ["mori", "s-yata"]}
+]
+[[0,0.0,0.0],1]
+select Bookmarks --output_columns _key,users._key
+[
+  [
+    0,
+    0.0,
+    0.0
+  ],
+  [
+    [
+      [
+        1
+      ],
+      [
+        [
+          "_key",
+          "ShortText"
+        ],
+        [
+          "users._key",
+          "ShortText"
+        ]
+      ],
+      [
+        "http://groonga.org/",
+        [
+          "mori",
+          "s-yata"
+        ]
+      ]
+    ]
+  ]
+]
diff --git a/test/command/suite/select/output_columns/vector/reference/key/json.test b/test/command/suite/select/output_columns/vector/reference/key/json.test
@@ -0,0 +1,11 @@
+table_create Users TABLE_HASH_KEY ShortText
+
+table_create Bookmarks TABLE_HASH_KEY ShortText
+column_create Bookmarks users COLUMN_VECTOR Users
+
+load --table Bookmarks
+[
+{"_key": "http://groonga.org/", "users": ["mori", "s-yata"]}
+]
+
+select Bookmarks --output_columns _key,users._key
diff --git a/test/command/suite/select/output_columns/vector/reference/key/xml.expected b/test/command/suite/select/output_columns/vector/reference/key/xml.expected
@@ -0,0 +1,27 @@
+table_create Users TABLE_HASH_KEY ShortText
+[[0,0.0,0.0],true]
+table_create Bookmarks TABLE_HASH_KEY ShortText
+[[0,0.0,0.0],true]
+column_create Bookmarks users COLUMN_VECTOR Users
+[[0,0.0,0.0],true]
+load --table Bookmarks
+[
+{"_key": "http://groonga.org/", "users": ["mori", "s-yata"]}
+]
+[[0,0.0,0.0],1]
+select Bookmarks --output_columns _key,users._key --output_type xml
+<?xml version="1.0" encoding="utf-8"?>
+<SEGMENTS>
+<SEGMENT>
+<RESULTPAGE>
+<RESULTSET OFFSET="0" LIMIT="1" NHITS="1">
+<HIT NO="1">
+<FIELD NAME="_key">http://groonga.org/</FIELD>
+<FIELD NAME="users._key">mori, s-yata</FIELD>
+</HIT>
+</RESULTSET>
+</RESULTPAGE>
+</SEGMENT>
+</SEGMENTS>
+
+
diff --git a/test/command/suite/select/output_columns/vector/reference/key/xml.test b/test/command/suite/select/output_columns/vector/reference/key/xml.test
@@ -0,0 +1,11 @@
+table_create Users TABLE_HASH_KEY ShortText
+
+table_create Bookmarks TABLE_HASH_KEY ShortText
+column_create Bookmarks users COLUMN_VECTOR Users
+
+load --table Bookmarks
+[
+{"_key": "http://groonga.org/", "users": ["mori", "s-yata"]}
+]
+
+select Bookmarks --output_columns _key,users._key --output_type xml