Skip to content

Commit

Permalink
Make sure attribute type is changed whether there's a sphinx.yml file…
Browse files Browse the repository at this point in the history
… or not.
  • Loading branch information
pat committed Sep 1, 2011
1 parent d1eff7f commit 780fb80
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions lib/thinking_sphinx/configuration.rb
Expand Up @@ -122,6 +122,10 @@ def reset(custom_app_root=nil)
parse_config
self.version ||= @controller.sphinx_version

ThinkingSphinx::Attribute::SphinxTypeMappings.merge!(
:string => :sql_attr_string
) if Riddle.loaded_version.to_i > 1

self
end

Expand Down Expand Up @@ -301,10 +305,6 @@ def parse_config
self.index_options[:enable_star] = true
self.index_options[:min_prefix_len] = 1
end

ThinkingSphinx::Attribute::SphinxTypeMappings.merge!(
:string => :sql_attr_string
) if Riddle.loaded_version.to_i > 1
end

def set_sphinx_setting(object, key, value, allowed = {})
Expand Down

0 comments on commit 780fb80

Please sign in to comment.