Kouhei Sutou
null+****@clear*****
Tue May 13 11:38:22 JST 2014
Kouhei Sutou 2014-05-13 11:38:22 +0900 (Tue, 13 May 2014) New Revision: 2c12f34f6af51134edb0ddc43cb19f4b4c38e77a https://github.com/ranguba/rroonga/commit/2c12f34f6af51134edb0ddc43cb19f4b4c38e77a Message: grndump: don't use needless "--key_type" for table_create Reported by Genki Takiuchi. Thanks!!! Modified files: lib/groonga/dumper.rb test/test-context.rb test/test-database-dumper.rb test/test-schema-dumper.rb Modified: lib/groonga/dumper.rb (+1 -1) =================================================================== --- lib/groonga/dumper.rb 2014-05-04 23:54:02 +0900 (6054231) +++ lib/groonga/dumper.rb 2014-05-13 11:38:22 +0900 (d3d1d76) @@ -565,7 +565,7 @@ module Groonga end parameters << "#{flags.join('|')}" if table.domain - parameters << "--key_type #{table.domain.name}" + parameters << table.domain.name end if table.range parameters << "--value_type #{table.range.name}" Modified: test/test-context.rb (+8 -8) =================================================================== --- test/test-context.rb 2014-05-04 23:54:02 +0900 (5b81f30) +++ test/test-context.rb 2014-05-13 11:38:22 +0900 (47578a4) @@ -132,7 +132,7 @@ class ContextTest < Test::Unit::TestCase class RestoreTest < self def test_simple commands = <<EOD -table_create Items TABLE_HASH_KEY --key_type ShortText +table_create Items TABLE_HASH_KEY ShortText column_create Items title COLUMN_SCALAR Text EOD restore(commands) @@ -143,44 +143,44 @@ EOD def test_continuation_lines dumped_commands = <<-EOD table_create Items TABLE_HASH_KEY\\ - --key_type ShortText + ShortText EOD restore(dumped_commands) assert_equal(<<-EOC, dump) -table_create Items TABLE_HASH_KEY --key_type ShortText +table_create Items TABLE_HASH_KEY ShortText EOC end def test_empty_line restore(<<-EOC) -table_create Items TABLE_HASH_KEY --key_type ShortText +table_create Items TABLE_HASH_KEY ShortText column_create Items title COLUMN_SCALAR Text EOC assert_equal(<<-EOC, dump) -table_create Items TABLE_HASH_KEY --key_type ShortText +table_create Items TABLE_HASH_KEY ShortText column_create Items title COLUMN_SCALAR Text EOC end def test_comment restore(<<-EOC) -table_create Items TABLE_HASH_KEY --key_type ShortText +table_create Items TABLE_HASH_KEY ShortText # column_create Items url COLUMN_SCALAR ShortText column_create Items title COLUMN_SCALAR Text EOC assert_equal(<<-EOC, dump) -table_create Items TABLE_HASH_KEY --key_type ShortText +table_create Items TABLE_HASH_KEY ShortText column_create Items title COLUMN_SCALAR Text EOC end def test_block - table_create = "table_create Items TABLE_HASH_KEY --key_type ShortText" + table_create = "table_create Items TABLE_HASH_KEY ShortText" column_create = "column_create Items title COLUMN_SCALAR Text" commands = <<-COMMANDS #{table_create} Modified: test/test-database-dumper.rb (+4 -4) =================================================================== --- test/test-database-dumper.rb 2014-05-04 23:54:02 +0900 (58d46f8) +++ test/test-database-dumper.rb 2014-05-13 11:38:22 +0900 (4dee37b) @@ -88,10 +88,10 @@ column_create Posts rank COLUMN_SCALAR Int32 column_create Posts tag_text COLUMN_SCALAR ShortText column_create Posts title COLUMN_SCALAR Text -table_create Tags TABLE_HASH_KEY --key_type ShortText --default_tokenizer TokenDelimit +table_create Tags TABLE_HASH_KEY ShortText --default_tokenizer TokenDelimit column_create Tags name COLUMN_SCALAR Text -table_create Users TABLE_HASH_KEY --key_type ShortText +table_create Users TABLE_HASH_KEY ShortText column_create Users name COLUMN_SCALAR Text SCHEMA end @@ -315,7 +315,7 @@ table_create Posts TABLE_NO_KEY column_create Posts tag_text COLUMN_SCALAR ShortText column_create Posts title COLUMN_SCALAR Text -table_create Tags TABLE_HASH_KEY --key_type ShortText --default_tokenizer TokenDelimit +table_create Tags TABLE_HASH_KEY ShortText --default_tokenizer TokenDelimit load --table Posts [ @@ -346,7 +346,7 @@ COMMAND def test_have_records assert_equal(<<-DUMP, dump) -table_create Users TABLE_PAT_KEY --key_type ShortText +table_create Users TABLE_PAT_KEY ShortText load --table Users [ Modified: test/test-schema-dumper.rb (+6 -6) =================================================================== --- test/test-schema-dumper.rb 2014-05-04 23:54:02 +0900 (6e046a2) +++ test/test-schema-dumper.rb 2014-05-13 11:38:22 +0900 (0b42912) @@ -275,9 +275,9 @@ column_create Posts title COLUMN_SCALAR ShortText def test_reference_table define_reference_table_schema assert_equal(<<-SCHEMA, dump) -table_create Terms TABLE_HASH_KEY --key_type ShortText +table_create Terms TABLE_HASH_KEY ShortText -table_create IndexTerms TABLE_HASH_KEY --key_type Terms +table_create IndexTerms TABLE_HASH_KEY Terms SCHEMA end @@ -303,10 +303,10 @@ column_create Comments item COLUMN_SCALAR Items def test_index define_index_schema assert_equal(<<-SCHEMA, dump) -table_create Items TABLE_HASH_KEY --key_type ShortText +table_create Items TABLE_HASH_KEY ShortText column_create Items title COLUMN_SCALAR ShortText -table_create Terms TABLE_PAT_KEY --key_type ShortText --default_tokenizer TokenBigram --normalizer NormalizerAuto +table_create Terms TABLE_PAT_KEY ShortText --default_tokenizer TokenBigram --normalizer NormalizerAuto column_create Terms Items__key COLUMN_INDEX|WITH_POSITION Items _key column_create Terms Items_title COLUMN_INDEX|WITH_POSITION Items title @@ -316,7 +316,7 @@ column_create Terms Items_title COLUMN_INDEX|WITH_POSITION Items title def test_weight_vector define_weight_vector_schema assert_equal(<<-SCHEMA, dump) -table_create Memos TABLE_PAT_KEY --key_type ShortText +table_create Memos TABLE_PAT_KEY ShortText column_create Memos tags COLUMN_VECTOR|WITH_WEIGHT ShortText SCHEMA end @@ -324,7 +324,7 @@ column_create Memos tags COLUMN_VECTOR|WITH_WEIGHT ShortText def test_double_array_trie define_double_array_trie_schema assert_equal(<<-SCHEMA, dump) -table_create Accounts TABLE_DAT_KEY --key_type ShortText +table_create Accounts TABLE_DAT_KEY ShortText column_create Accounts name COLUMN_SCALAR ShortText SCHEMA end -------------- next part -------------- HTML����������������������������...Download
