null+****@clear*****
null+****@clear*****
2011年 3月 27日 (日) 22:45:16 JST
Kouhei Sutou 2011-03-27 13:45:16 +0000 (Sun, 27 Mar 2011)
New Revision: 9a580170849b8855d68888d157d7d5198a353d3d
Log:
truncate returns valid JSON object.
Modified files:
lib/proc.c
test/unit/core/test-command-truncate.c
Modified: lib/proc.c (+2 -0)
===================================================================
--- lib/proc.c 2011-03-27 13:32:16 +0000 (c42ab18)
+++ lib/proc.c 2011-03-27 13:45:16 +0000 (209c72f)
@@ -2122,6 +2122,7 @@ static grn_obj *
proc_truncate(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_data)
{
int table_name_len = GRN_TEXT_LEN(VAR(0));
+ GRN_OUTPUT_ARRAY_OPEN("RESULT", 1);
if (table_name_len == 0) {
ERR(GRN_INVALID_ARGUMENT, "table name is missing");
} else {
@@ -2152,6 +2153,7 @@ proc_truncate(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_data)
}
}
GRN_OUTPUT_BOOL(!ctx->rc);
+ GRN_OUTPUT_ARRAY_CLOSE();
return NULL;
}
Modified: test/unit/core/test-command-truncate.c (+2 -1)
===================================================================
--- test/unit/core/test-command-truncate.c 2011-03-27 13:32:16 +0000 (7784348)
+++ test/unit/core/test-command-truncate.c 2011-03-27 13:45:16 +0000 (884dd1b)
@@ -94,7 +94,8 @@ test_no_columns(void)
"[2,\"gunyara-kun\"],"
"[3,\"yu\"]]]",
send_command("select Users"));
- assert_send_command("truncate Users");
+ cut_assert_equal_string("[true]",
+ send_command("truncate Users"));
cut_assert_equal_string(
"[[[0],"
"[[\"_id\",\"UInt32\"],[\"_key\",\"ShortText\"]]"