Kouhei Sutou
null+****@clear*****
Tue Mar 21 14:11:17 JST 2017
Kouhei Sutou 2017-03-21 14:11:17 +0900 (Tue, 21 Mar 2017) New Revision: ee10ffa05c154a713d501553839c058325d5f92e https://github.com/ranguba/groonga-client-model/commit/ee10ffa05c154a713d501553839c058325d5f92e Message: Fix groonga:schema:load doesn't load db/schema.grn GitHub: fix #1 Reported by okkez. Thanks!!! Modified files: lib/groonga_client_model/railties/groonga.rake lib/groonga_client_model/schema_loader.rb lib/groonga_client_model/test/groonga_server_runner.rb Modified: lib/groonga_client_model/railties/groonga.rake (+4 -2) =================================================================== --- lib/groonga_client_model/railties/groonga.rake 2017-03-21 14:10:04 +0900 (7fdcbfe) +++ lib/groonga_client_model/railties/groonga.rake 2017-03-21 14:11:17 +0900 (b442e60) @@ -28,9 +28,11 @@ namespace :groonga do end namespace :schema do - desc "Loads db/schema.grn into the Groonga database" + schema_path = GroongaClientModel::SchemaLoader.default_path + desc "Loads #{schema_path} into the Groonga database" task load: ["config:load"] do - schema_loader = GroongaClientModel::SchemaLoader.new(Rails.root) + full_schema_path = Rails.root + schema_path + schema_loader = GroongaClientModel::SchemaLoader.new(full_schema_path) schema_loader.load end end Modified: lib/groonga_client_model/schema_loader.rb (+6 -0) =================================================================== --- lib/groonga_client_model/schema_loader.rb 2017-03-21 14:10:04 +0900 (da5a4de) +++ lib/groonga_client_model/schema_loader.rb 2017-03-21 14:11:17 +0900 (31cbb33) @@ -18,6 +18,12 @@ require "groonga/command/parser" module GroongaClientModel class SchemaLoader + class << self + def default_path + "db/schema.grn" + end + end + def initialize(schema) @schema = schema end Modified: lib/groonga_client_model/test/groonga_server_runner.rb (+2 -2) =================================================================== --- lib/groonga_client_model/test/groonga_server_runner.rb 2017-03-21 14:10:04 +0900 (e68554d) +++ lib/groonga_client_model/test/groonga_server_runner.rb 2017-03-21 14:11:17 +0900 (6b531c3) @@ -41,8 +41,8 @@ module GroongaClientModel base_dir = Pathname.pwd end - schema_path = base_dir + "db" + "schema.grn" - migrate_path = base_dir + "db" + "groonga" + "migrate" + schema_path = base_dir + SchemaLoader.default_path + migrate_path = base_dir + Migrator.default_search_path if schema_path.exist? schema_path.open do |schema_file| schema_loader = SchemaLoader.new(schema_file) -------------- next part -------------- HTML����������������������������...Download