null+****@clear*****
null+****@clear*****
2012年 1月 29日 (日) 14:41:20 JST
Kouhei Sutou 2012-01-29 14:41:20 +0900 (Sun, 29 Jan 2012)
New Revision: be3475f02359e359d22891fa72bf7680de0ae805
Log:
[command][column_rename] add. fixes #1234
Added files:
test/unit/core/test-command-column-rename.c
Modified files:
lib/proc.c
test/unit/core/Makefile.am
Modified: lib/proc.c (+73 -10)
===================================================================
--- lib/proc.c 2012-01-29 14:27:26 +0900 (5067480)
+++ lib/proc.c 2012-01-29 14:41:20 +0900 (95e3636)
@@ -894,26 +894,26 @@ proc_table_remove(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_d
static grn_obj *
proc_table_rename(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_data)
{
- grn_rc rc;
+ grn_rc rc = GRN_SUCCESS;
grn_obj *table = NULL;
if (GRN_TEXT_LEN(VAR(0)) == 0) {
- ERR(GRN_INVALID_ARGUMENT, "[table][rename] table name isn't specified");
- rc = ctx->rc;
+ rc = GRN_INVALID_ARGUMENT;
+ ERR(rc, "[table][rename] table name isn't specified");
goto exit;
}
table = grn_ctx_get(ctx, GRN_TEXT_VALUE(VAR(0)), GRN_TEXT_LEN(VAR(0)));
if (!table) {
- ERR(GRN_INVALID_ARGUMENT,
+ rc = GRN_INVALID_ARGUMENT;
+ ERR(rc,
"[table][rename] table isn't found: <%.*s>",
GRN_TEXT_LEN(VAR(0)), GRN_TEXT_VALUE(VAR(0)));
- rc = ctx->rc;
goto exit;
}
if (GRN_TEXT_LEN(VAR(1)) == 0) {
- ERR(GRN_INVALID_ARGUMENT,
+ rc = GRN_INVALID_ARGUMENT;
+ ERR(rc,
"[table][rename] new table name isn't specified: <%.*s>",
GRN_TEXT_LEN(VAR(0)), GRN_TEXT_VALUE(VAR(0)));
- rc = ctx->rc;
goto exit;
}
rc = grn_table_rename(ctx, table,
@@ -926,9 +926,7 @@ proc_table_rename(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_d
}
exit:
GRN_OUTPUT_BOOL(!rc);
- if (table) {
- grn_obj_unlink(ctx, table);
- }
+ if (table) { grn_obj_unlink(ctx, table); }
return NULL;
}
@@ -1037,6 +1035,66 @@ proc_column_remove(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_
return NULL;
}
+static grn_obj *
+proc_column_rename(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_data)
+{
+ grn_rc rc = GRN_SUCCESS;
+ grn_obj *table = NULL;
+ grn_obj *column = NULL;
+ if (GRN_TEXT_LEN(VAR(0)) == 0) {
+ rc = GRN_INVALID_ARGUMENT;
+ ERR(rc, "[column][rename] table name isn't specified");
+ goto exit;
+ }
+ table = grn_ctx_get(ctx, GRN_TEXT_VALUE(VAR(0)), GRN_TEXT_LEN(VAR(0)));
+ if (!table) {
+ rc = GRN_INVALID_ARGUMENT;
+ ERR(rc,
+ "[column][rename] table isn't found: <%.*s>",
+ GRN_TEXT_LEN(VAR(0)), GRN_TEXT_VALUE(VAR(0)));
+ goto exit;
+ }
+ if (GRN_TEXT_LEN(VAR(1)) == 0) {
+ rc = GRN_INVALID_ARGUMENT;
+ ERR(rc,
+ "[column][rename] column name isn't specified: <%.*s>",
+ GRN_TEXT_LEN(VAR(0)), GRN_TEXT_VALUE(VAR(0)));
+ goto exit;
+ }
+ column = grn_obj_column(ctx, table,
+ GRN_TEXT_VALUE(VAR(1)), GRN_TEXT_LEN(VAR(1)));
+ if (!column) {
+ rc = GRN_INVALID_ARGUMENT;
+ ERR(rc,
+ "[column][rename] column isn't found: <%.*s.%.*s>",
+ GRN_TEXT_LEN(VAR(0)), GRN_TEXT_VALUE(VAR(0)),
+ GRN_TEXT_LEN(VAR(1)), GRN_TEXT_VALUE(VAR(1)));
+ goto exit;
+ }
+ if (GRN_TEXT_LEN(VAR(2)) == 0) {
+ rc = GRN_INVALID_ARGUMENT;
+ ERR(rc,
+ "[column][rename] new column name isn't specified: <%.*s.%.*s>",
+ GRN_TEXT_LEN(VAR(0)), GRN_TEXT_VALUE(VAR(0)),
+ GRN_TEXT_LEN(VAR(1)), GRN_TEXT_VALUE(VAR(1)));
+ goto exit;
+ }
+ rc = grn_column_rename(ctx, column,
+ GRN_TEXT_VALUE(VAR(2)), GRN_TEXT_LEN(VAR(2)));
+ if (rc != GRN_SUCCESS && ctx->rc == GRN_SUCCESS) {
+ ERR(rc,
+ "[column][rename] failed to rename: <%.*s.%.*s> -> <%.*s.%.*s>",
+ GRN_TEXT_LEN(VAR(0)), GRN_TEXT_VALUE(VAR(0)),
+ GRN_TEXT_LEN(VAR(1)), GRN_TEXT_VALUE(VAR(1)),
+ GRN_TEXT_LEN(VAR(0)), GRN_TEXT_VALUE(VAR(0)),
+ GRN_TEXT_LEN(VAR(2)), GRN_TEXT_VALUE(VAR(2)));
+ }
+exit:
+ GRN_OUTPUT_BOOL(!rc);
+ if (column) { grn_obj_unlink(ctx, column); }
+ if (table) { grn_obj_unlink(ctx, table); }
+ return NULL;
+}
#define GRN_STRLEN(s) ((s) ? strlen(s) : 0)
@@ -2746,6 +2804,11 @@ grn_db_init_builtin_query(grn_ctx *ctx)
DEF_VAR(vars[1], "name");
DEF_COMMAND("column_remove", proc_column_remove, 2, vars);
+ DEF_VAR(vars[0], "table");
+ DEF_VAR(vars[1], "name");
+ DEF_VAR(vars[2], "new_name");
+ DEF_COMMAND("column_rename", proc_column_rename, 3, vars);
+
DEF_VAR(vars[0], "path");
DEF_COMMAND(GRN_EXPR_MISSING_NAME, proc_missing, 1, vars);
Modified: test/unit/core/Makefile.am (+2 -0)
===================================================================
--- test/unit/core/Makefile.am 2012-01-29 14:27:26 +0900 (9b21246)
+++ test/unit/core/Makefile.am 2012-01-29 14:41:20 +0900 (473bc7b)
@@ -48,6 +48,7 @@ noinst_LTLIBRARIES = \
test-command-table-rename.la \
test-command-column-create.la \
test-command-column-list.la \
+ test-command-column-rename.la \
test-command-select.la \
test-command-select-sort.la \
test-command-select-prefix-search.la \
@@ -135,6 +136,7 @@ test_command_table_list_la_SOURCES = test-command-table-list.c
test_command_table_rename_la_SOURCES = test-command-table-rename.c
test_command_column_create_la_SOURCES = test-command-column-create.c
test_command_column_list_la_SOURCES = test-command-column-list.c
+test_command_column_rename_la_SOURCES = test-command-column-rename.c
test_command_select_la_SOURCES = test-command-select.c
test_command_select_sort_la_SOURCES = test-command-select-sort.c
test_command_select_prefix_search_la_SOURCES = test-command-select-prefix-search.c
Added: test/unit/core/test-command-column-rename.c (+169 -0) 100644
===================================================================
--- /dev/null
+++ test/unit/core/test-command-column-rename.c 2012-01-29 14:41:20 +0900 (1294719)
@@ -0,0 +1,169 @@
+/* -*- c-basic-offset: 2; coding: utf-8 -*- */
+/*
+ Copyright (C) 2012 Kouhei Sutou <kou****@clear*****>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License version 2.1 as published by the Free Software Foundation.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+
+#include <gcutter.h>
+#include <glib/gstdio.h>
+
+#include "../lib/grn-assertions.h"
+
+#include <str.h>
+
+#define get(name) grn_ctx_get(context, name, strlen(name))
+
+void test_success(void);
+void test_error_no_argument(void);
+void test_error_nonexistent_table_name(void);
+void test_error_missing_column_name(void);
+void test_error_nonexistent_column_name(void);
+void test_error_missing_new_column_name(void);
+
+static gchar *tmp_directory;
+static const gchar *database_path;
+
+static grn_ctx *context;
+static grn_obj *database;
+
+void
+cut_startup(void)
+{
+ tmp_directory = g_build_filename(grn_test_get_tmp_dir(),
+ "column-rename",
+ NULL);
+}
+
+void
+cut_shutdown(void)
+{
+ g_free(tmp_directory);
+}
+
+static void
+remove_tmp_directory(void)
+{
+ cut_remove_path(tmp_directory, NULL);
+}
+
+void
+cut_setup(void)
+{
+ remove_tmp_directory();
+ g_mkdir_with_parents(tmp_directory, 0700);
+
+ context = g_new0(grn_ctx, 1);
+ grn_ctx_init(context, 0);
+
+ database_path = cut_build_path(tmp_directory,
+ "command-column-rename",
+ NULL);
+ database = grn_db_create(context, database_path, NULL);
+}
+
+void
+cut_teardown(void)
+{
+ grn_obj_close(context, database);
+ grn_ctx_fin(context);
+ g_free(context);
+
+ remove_tmp_directory();
+}
+
+static void
+populate(void)
+{
+ assert_send_commands("table_create Users TABLE_HASH_KEY ShortText\n"
+ "column_create Users name COLUMN_SCALAR ShortText\n"
+ "load --table Users\n"
+ "[\n"
+ "[\"_key\",\"name\"],\n"
+ "[\"morita\",\"Daijiro MORI\"],\n"
+ "[\"yata\",\"Susumu Yata\"]\n"
+ "]");
+}
+
+void
+test_success(void)
+{
+ populate();
+ assert_send_command("column_rename Users name full_name");
+ cut_assert_equal_string(
+ "table_create Users TABLE_HASH_KEY ShortText\n"
+ "column_create Users full_name COLUMN_SCALAR ShortText\n"
+ "load --table Users\n"
+ "[\n"
+ "[\"_key\",\"full_name\"],\n"
+ "[\"morita\",\"Daijiro MORI\"],\n"
+ "[\"yata\",\"Susumu Yata\"]\n"
+ "]",
+ send_command("dump"));
+}
+
+void
+test_error_no_argument(void)
+{
+ populate();
+ grn_test_assert_send_command_error(
+ context,
+ GRN_INVALID_ARGUMENT,
+ "[column][rename] table name isn't specified",
+ "column_rename");
+}
+
+void
+test_error_nonexistent_table_name(void)
+{
+ populate();
+ grn_test_assert_send_command_error(
+ context,
+ GRN_INVALID_ARGUMENT,
+ "[column][rename] table isn't found: <nonexistent>",
+ "column_rename nonexistent");
+}
+
+void
+test_error_missing_column_name(void)
+{
+ populate();
+ grn_test_assert_send_command_error(
+ context,
+ GRN_INVALID_ARGUMENT,
+ "[column][rename] column name isn't specified: <Users>",
+ "column_rename Users");
+}
+
+void
+test_error_nonexistent_column_name(void)
+{
+ populate();
+ grn_test_assert_send_command_error(
+ context,
+ GRN_INVALID_ARGUMENT,
+ "[column][rename] column isn't found: <Users.nonexistent>",
+ "column_rename Users nonexistent");
+}
+
+void
+test_error_missing_new_column_name(void)
+{
+ populate();
+ grn_test_assert_send_command_error(
+ context,
+ GRN_INVALID_ARGUMENT,
+ "[column][rename] new column name isn't specified: <Users.name>",
+ "column_rename Users name");
+}