groonga-client-rails 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ca5a60fd3fca5df8832cd9c8be6683466666614
-  data.tar.gz: 7da2fe87adb1ba2e2b2c9f0bee00edcb84581a0a
+  metadata.gz: a5944798b653ef748f6429cdd1fdb0a558c89654
+  data.tar.gz: 1c78060794d0cf29cef4557f57ff9d1e13d50b50
 SHA512:
-  metadata.gz: 114bb69be2a9d780fc5d4864f4f16fd902902046fa8895bd54a1174f64c96b2245425e255d93aad06984be15e0ea4e087bab119f65907fc18596eba53d7c82f7
-  data.tar.gz: 220a17172ebb90296290974f7232a56f3e54a9878155a7b9b45b6d70779f1168bbd5ff6b20fa48b752957ef89776dd32fcfc7138dcaa3b5ee0c4a016cc9f6b13
+  metadata.gz: 6de16e66a42cd4cf2eb103c904dd52d5709c7de1f6d6de76b3ab493adc8fb28a656cb35a9eeb4cec175a09d9beecb73d68535787690b57eade16fd05868a3237
+  data.tar.gz: 48f6ef9c6225805038aca00ca820835676fe1fc6752dbe8259c5618265d66aed2f8672f60627a7ff5ab203d10c6cbfd8dcb1d57369197cc94a86fba7af924426

data/doc/text/news.md

@@ -1,5 +1,15 @@
 # NEWS
 
+## 0.9.7 - 2016-12-22
+
+### Improvements
+
+  * Supported reference column.
+
+  * Added response error checks on synchronization.
+
+  * Supported disabling normalizer.
+
 ## 0.9.6 - 2016-12-21
 
 ### Improvements

data/lib/groonga/client/rails/version.rb

@@ -17,7 +17,7 @@
 module Groonga
   class Client
     module Rails
-      VERSION = "0.9.6"
+      VERSION = "0.9.7"
     end
   end
 end

data/lib/groonga/client/searcher/schema.rb

@@ -60,6 +60,10 @@ module Groonga
             @options[:type] || "Text"
           end
 
+          def normalizer
+            @options[:normalizer]
+          end
+
           def text_family_type?
             case type
             when "ShortText", "Text", "LongText"
@@ -73,6 +77,10 @@ module Groonga
             @options[:vector]
           end
 
+          def reference?
+            @options[:reference]
+          end
+
           def have_index?
             @options[:index]
           end

data/lib/groonga/client/searcher/schema_synchronizer.rb

@@ -33,11 +33,10 @@ module Groonga
           current_table = find_current_table
           return if current_table # TODO: validation
 
-          Client.open do |client|
-            client.table_create(:name => @schema.table,
-                                :flags => "TABLE_PAT_KEY",
-                                :key_type => "ShortText")
-          end
+          execute(:table_create,
+                  :name => @schema.table,
+                  :flags => "TABLE_PAT_KEY",
+                  :key_type => "ShortText")
         end
 
         def sync_columns
@@ -49,26 +48,50 @@ module Groonga
 
         def sync_column(column, current_column)
           if current_column.nil?
-            Client.open do |client|
-              flags = []
-              if column.vector?
-                flags << "COLUMN_VECTOR"
-              else
-                flags << "COLUMN_SCALAR"
-              end
-              client.column_create(:table => @schema.table,
-                                   :name => column.name,
-                                   :type => column.type,
-                                   :flags => flags.join("|"))
+            flags = []
+            if column.vector?
+              flags << "COLUMN_VECTOR"
+            else
+              flags << "COLUMN_SCALAR"
+            end
+            if column.reference?
+              reference_table_name = generate_reference_table_name(column)
+              sync_reference_table(column, reference_table_name)
+              type = reference_table_name
+            else
+              type = column.type
             end
+            execute(:column_create,
+                    :table => @schema.table,
+                    :name => column.name,
+                    :type => type,
+                    :flags => flags.join("|"))
           end
 
           sync_column_index(column, current_column)
         end
 
+        def sync_reference_table(column, reference_table_name)
+          return if @current_schema.tables[reference_table_name]
+
+          parameters = {
+            :name => reference_table_name,
+            :flags => "TABLE_PAT_KEY",
+          }
+          parameters[:key_type] = column.type
+          if column.text_family_type?
+            parameters[:normalizer] = decide_normalizer(column.normalizer)
+          end
+          execute(:table_create, parameters)
+        end
+
         def sync_column_index(column, current_column)
           if column.have_index?
-            lexicon_name = "lexicon_#{@schema.table}_#{column.name}"
+            if column.reference?
+              lexicon_name = generate_reference_table_name(column)
+            else
+              lexicon_name = generate_lexicon_name(column)
+            end
             index_column_name = "index"
             if current_column
               indexes = current_column.indexes
@@ -78,7 +101,7 @@ module Groonga
             indexes.each do |index|
               return if index.full_name == "#{lexicon_name}.#{index_column_name}"
             end
-            sync_lexicon(column, lexicon_name)
+            sync_lexicon(column, lexicon_name) unless column.reference?
             create_index_column(column, lexicon_name, index_column_name)
           else
             remove_indexes(current_column)
@@ -95,37 +118,35 @@ module Groonga
           if column.have_full_text_search_index?
             parameters[:key_type] = "ShortText"
             parameters[:default_tokenizer] = "TokenBigram"
-            parameters[:normalizer] = "NormalizerAuto"
+            parameters[:normalizer] = decide_normalizer(column.normalizer)
+          elsif column.reference?
+            parameters[:key_type] = generate_reference_table_name(column)
           else
             parameters[:key_type] = column.type
             if column.text_family_type?
-              parameters[:normalizer] = "NormalizerAuto"
+              parameters[:normalizer] = decide_normalizer(column.normalizer)
             end
           end
-          Client.open do |client|
-            client.table_create(parameters)
-          end
+          execute(:table_create, parameters)
         end
 
         def create_index_column(column, lexicon_name, index_column_name)
           flags = "COLUMN_INDEX"
           flags += "|WITH_POSITION" if column.have_full_text_search_index?
-          Client.open do |client|
-            client.column_create(:table => lexicon_name,
-                                 :name => index_column_name,
-                                 :flags => flags,
-                                 :type => @schema.table,
-                                 :source => column.name)
-          end
+          execute(:column_create,
+                  :table => lexicon_name,
+                  :name => index_column_name,
+                  :flags => flags,
+                  :type => @schema.table,
+                  :source => column.name)
         end
 
         def remove_indexes(current_column)
           return if current_column.nil?
           current_column.indexes.each do |index|
-            Client.open do |client|
-              clinet.column_remove(:table => index.table.name,
-                                   :name => index.name)
-            end
+            execute(:column_remove,
+                    :table => index.table.name,
+                    :name => index.name)
           end
         end
 
@@ -141,6 +162,32 @@ module Groonga
             current_table.columns
           end
         end
+
+        def decide_normalizer(custom_normalizer)
+          if custom_normalizer == false
+            nil
+          else
+            custom_normalizer || "NormalizerAuto"
+          end
+        end
+
+        def execute(name, parameters)
+          Client.open do |client|
+            response = client.execute(name, parameters)
+            unless response.success?
+              raise Client::Request::ErrorResponse.new(response)
+            end
+            response
+          end
+        end
+
+        def generate_reference_table_name(column)
+          "reference_#{@schema.table}_#{column.name}"
+        end
+
+        def generate_lexicon_name(column)
+          "lexicon_#{@schema.table}_#{column.name}"
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groonga-client-rails
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-21 00:00:00.000000000 Z
+date: 2016-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: groonga-client