@@ -37,7 +37,7 @@ module ThinkingSphinx module Version #:nodoc: Major = 1 Minor = 1 - Tiny = 22 + Tiny = 23 String = [Major, Minor, Tiny].join('.') end lib/thinking_sphinx.rb @@ -124,10 +124,10 @@ module ThinkingSphinx # Special case is the multi-valued attribute that needs some # extra configuration. # - def config_value(offset = nil) + def config_value(offset = nil, delta = false) if type == :multi multi_config = include_as_association? ? "field" : - source_value(offset).gsub(/\s+/m, " ").strip + source_value(offset, delta).gsub(/\s+/m, " ").strip "uint #{unique_name} from #{multi_config}" else unique_name @@ -183,13 +183,20 @@ module ThinkingSphinx private - def source_value(offset) + def source_value(offset, delta) if is_string? - "#{query_source.to_s.dasherize}; #{columns.first.__name}" - elsif query_source == :ranged_query - "ranged-query; #{query offset} #{query_clause}; #{range_query}" + return "#{query_source.to_s.dasherize}; #{columns.first.__name}" + end + + query = query(offset) + + if query_source == :ranged_query + query += query_clause + query += " AND #{query_delta.strip}" if delta + "ranged-query; #{query}; #{range_query}" else - "query; #{query offset}" + query += "WHERE #{query_delta.strip}" if delta + "query; #{query}" end end @@ -211,6 +218,15 @@ FROM #{quote_table_name base_assoc.table} #{association_joins} "WHERE #{foreign_key} >= $start AND #{foreign_key} <= $end" end + def query_delta + foreign_key = foreign_key_for_mva base_association_for_mva + <<-SQL +#{foreign_key} IN (SELECT #{quote_column model.primary_key} +FROM #{model.quoted_table_name} +WHERE #{@source.index.delta_object.clause(model, true)}) + SQL + end + def range_query assoc = base_association_for_mva foreign_key = foreign_key_for_mva assoc lib/thinking_sphinx/attribute.rb @@ -8,7 +8,7 @@ module ThinkingSphinx attr_accessor :model, :fields, :attributes, :conditions, :groupings, :options - attr_reader :base + attr_reader :base, :index def initialize(index, options = {}) @index = index @@ -56,7 +56,7 @@ module ThinkingSphinx source.parent = "#{name}_core_#{index}" set_source_database_settings source - set_source_attributes source, offset + set_source_attributes source, offset, true set_source_sql source, offset, true source @@ -89,9 +89,9 @@ module ThinkingSphinx source.sql_sock = config[:socket] end - def set_source_attributes(source, offset) + def set_source_attributes(source, offset, delta = false) attributes.each do |attrib| - source.send(attrib.type_to_config) << attrib.config_value(offset) + source.send(attrib.type_to_config) << attrib.config_value(offset, delta) end end lib/thinking_sphinx/source.rb @@ -4,6 +4,8 @@ describe ThinkingSphinx::Attribute do before :each do @index = ThinkingSphinx::Index.new(Person) @source = ThinkingSphinx::Source.new(@index) + + @index.delta_object = ThinkingSphinx::Deltas::DefaultDelta.new @index, @index.local_options end describe '#initialize' do @@ -232,6 +234,23 @@ describe ThinkingSphinx::Attribute do end end + describe "MVA with source query for a delta source" do + before :each do + @attribute = ThinkingSphinx::Attribute.new(@source, + [ThinkingSphinx::Index::FauxColumn.new(:tags, :id)], + :as => :tag_ids, :source => :query + ) + end + + it "should use a query" do + @attribute.type_to_config.should == :sql_attr_multi + + declaration, query = @attribute.config_value(nil, true).split('; ') + declaration.should == "uint tag_ids from query" + query.should == "SELECT `tags`.`person_id` #{ThinkingSphinx.unique_id_expression} AS `id`, `tags`.`id` AS `tag_ids` FROM `tags` WHERE `tags`.`person_id` IN (SELECT `id` FROM `people` WHERE `people`.`delta` = 1)" + end + end + describe "MVA via a HABTM association with a source query" do before :each do @attribute = ThinkingSphinx::Attribute.new(@source, @@ -267,6 +286,24 @@ describe ThinkingSphinx::Attribute do end end + describe "MVA with ranged source query for a delta source" do + before :each do + @attribute = ThinkingSphinx::Attribute.new(@source, + [ThinkingSphinx::Index::FauxColumn.new(:tags, :id)], + :as => :tag_ids, :source => :ranged_query + ) + end + + it "should use a ranged query" do + @attribute.type_to_config.should == :sql_attr_multi + + declaration, query, range_query = @attribute.config_value(nil, true).split('; ') + declaration.should == "uint tag_ids from ranged-query" + query.should == "SELECT `tags`.`person_id` #{ThinkingSphinx.unique_id_expression} AS `id`, `tags`.`id` AS `tag_ids` FROM `tags` WHERE `tags`.`person_id` >= $start AND `tags`.`person_id` <= $end AND `tags`.`person_id` IN (SELECT `id` FROM `people` WHERE `people`.`delta` = 1)" + range_query.should == "SELECT MIN(`tags`.`person_id`), MAX(`tags`.`person_id`) FROM `tags`" + end + end + describe "MVA via a has-many :through with a ranged source query" do before :each do @attribute = ThinkingSphinx::Attribute.new(@source, @@ -341,6 +378,28 @@ describe ThinkingSphinx::Attribute do end end + describe "MVA via two has-many associations with a ranged source query for a delta source" do + before :each do + @index = ThinkingSphinx::Index.new(Alpha) + @source = ThinkingSphinx::Source.new(@index) + @attribute = ThinkingSphinx::Attribute.new(@source, + [ThinkingSphinx::Index::FauxColumn.new(:betas, :gammas, :value)], + :as => :gamma_values, :source => :ranged_query + ) + + @index.delta_object = ThinkingSphinx::Deltas::DefaultDelta.new @index, @index.local_options + end + + it "should use a ranged query" do + @attribute.type_to_config.should == :sql_attr_multi + + declaration, query, range_query = @attribute.config_value(nil, true).split('; ') + declaration.should == "uint gamma_values from ranged-query" + query.should == "SELECT `betas`.`alpha_id` #{ThinkingSphinx.unique_id_expression} AS `id`, `gammas`.`value` AS `gamma_values` FROM `betas` LEFT OUTER JOIN `gammas` ON gammas.beta_id = betas.id WHERE `betas`.`alpha_id` >= $start AND `betas`.`alpha_id` <= $end AND `betas`.`alpha_id` IN (SELECT `id` FROM `alphas` WHERE `alphas`.`delta` = 1)" + range_query.should == "SELECT MIN(`betas`.`alpha_id`), MAX(`betas`.`alpha_id`) FROM `betas`" + end + end + describe "with custom queries" do before :each do index = CricketTeam.sphinx_indexes.first spec/unit/thinking_sphinx/attribute_spec.rb @@ -2,11 +2,11 @@ Gem::Specification.new do |s| s.name = %q{thinking-sphinx} - s.version = "1.1.22" + s.version = "1.1.23" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Pat Allan"] - s.date = %q{2009-06-22} + s.date = %q{2009-06-28} s.description = %q{A concise and easy-to-use Ruby library that connects ActiveRecord to the Sphinx search daemon, managing configuration, indexing and searching.} s.email = %q{pat@freelancing-gods.com} s.files = ["rails/init.rb", "lib/thinking_sphinx/active_record/attribute_updates.rb", "lib/thinking_sphinx/active_record/delta.rb", "lib/thinking_sphinx/active_record/has_many_association.rb", "lib/thinking_sphinx/active_record/search.rb", "lib/thinking_sphinx/active_record.rb", "lib/thinking_sphinx/adapters/abstract_adapter.rb", "lib/thinking_sphinx/adapters/mysql_adapter.rb", "lib/thinking_sphinx/adapters/postgresql_adapter.rb", "lib/thinking_sphinx/association.rb", "lib/thinking_sphinx/attribute.rb", "lib/thinking_sphinx/class_facet.rb", "lib/thinking_sphinx/collection.rb", "lib/thinking_sphinx/configuration.rb", "lib/thinking_sphinx/core/string.rb", "lib/thinking_sphinx/deltas/datetime_delta.rb", "lib/thinking_sphinx/deltas/default_delta.rb", "lib/thinking_sphinx/deltas/delayed_delta/delta_job.rb", "lib/thinking_sphinx/deltas/delayed_delta/flag_as_deleted_job.rb", "lib/thinking_sphinx/deltas/delayed_delta/job.rb", "lib/thinking_sphinx/deltas/delayed_delta.rb", "lib/thinking_sphinx/deltas.rb", "lib/thinking_sphinx/deploy/capistrano.rb", "lib/thinking_sphinx/facet.rb", "lib/thinking_sphinx/facet_collection.rb", "lib/thinking_sphinx/field.rb", "lib/thinking_sphinx/index/builder.rb", "lib/thinking_sphinx/index/faux_column.rb", "lib/thinking_sphinx/index.rb", "lib/thinking_sphinx/property.rb", "lib/thinking_sphinx/rails_additions.rb", "lib/thinking_sphinx/search/facets.rb", "lib/thinking_sphinx/search.rb", "lib/thinking_sphinx/source/internal_properties.rb", "lib/thinking_sphinx/source/sql.rb", "lib/thinking_sphinx/source.rb", "lib/thinking_sphinx/tasks.rb", "lib/thinking_sphinx.rb", "LICENCE", "README.textile", "tasks/distribution.rb", "tasks/testing.rb", "tasks/rails.rake", "vendor/after_commit", "vendor/after_commit/init.rb", "vendor/after_commit/lib", "vendor/after_commit/lib/after_commit", "vendor/after_commit/lib/after_commit/active_record.rb", "vendor/after_commit/lib/after_commit/connection_adapters.rb", "vendor/after_commit/lib/after_commit.rb", "vendor/after_commit/LICENSE", "vendor/after_commit/Rakefile", "vendor/after_commit/README", "vendor/after_commit/test", "vendor/after_commit/test/after_commit_test.rb", "vendor/delayed_job", "vendor/delayed_job/lib", "vendor/delayed_job/lib/delayed", "vendor/delayed_job/lib/delayed/job.rb", "vendor/delayed_job/lib/delayed/message_sending.rb", "vendor/delayed_job/lib/delayed/performable_method.rb", "vendor/delayed_job/lib/delayed/worker.rb", "vendor/riddle", "vendor/riddle/lib", "vendor/riddle/lib/riddle", "vendor/riddle/lib/riddle/client", "vendor/riddle/lib/riddle/client/filter.rb", "vendor/riddle/lib/riddle/client/message.rb", "vendor/riddle/lib/riddle/client/response.rb", "vendor/riddle/lib/riddle/client.rb", "vendor/riddle/lib/riddle/configuration", "vendor/riddle/lib/riddle/configuration/distributed_index.rb", "vendor/riddle/lib/riddle/configuration/index.rb", "vendor/riddle/lib/riddle/configuration/indexer.rb", "vendor/riddle/lib/riddle/configuration/remote_index.rb", "vendor/riddle/lib/riddle/configuration/searchd.rb", "vendor/riddle/lib/riddle/configuration/section.rb", "vendor/riddle/lib/riddle/configuration/source.rb", "vendor/riddle/lib/riddle/configuration/sql_source.rb", "vendor/riddle/lib/riddle/configuration/xml_source.rb", "vendor/riddle/lib/riddle/configuration.rb", "vendor/riddle/lib/riddle/controller.rb", "vendor/riddle/lib/riddle.rb", "spec/unit/thinking_sphinx/active_record/delta_spec.rb", "spec/unit/thinking_sphinx/active_record/has_many_association_spec.rb", "spec/unit/thinking_sphinx/active_record/search_spec.rb", "spec/unit/thinking_sphinx/active_record_spec.rb", "spec/unit/thinking_sphinx/association_spec.rb", "spec/unit/thinking_sphinx/attribute_spec.rb", "spec/unit/thinking_sphinx/collection_spec.rb", "spec/unit/thinking_sphinx/configuration_spec.rb", "spec/unit/thinking_sphinx/core/string_spec.rb", "spec/unit/thinking_sphinx/facet_collection_spec.rb", "spec/unit/thinking_sphinx/facet_spec.rb", "spec/unit/thinking_sphinx/field_spec.rb", "spec/unit/thinking_sphinx/index/builder_spec.rb", "spec/unit/thinking_sphinx/index/faux_column_spec.rb", "spec/unit/thinking_sphinx/index_spec.rb", "spec/unit/thinking_sphinx/rails_additions_spec.rb", "spec/unit/thinking_sphinx/search_spec.rb", "spec/unit/thinking_sphinx/source_spec.rb", "spec/unit/thinking_sphinx_spec.rb"] thinking-sphinx.gemspec cb770957280c312b7a92e3cb23194bbc35cba31c Pat Allan pat@freelancing-gods.com http://github.com/freelancing-god/thinking-sphinx/commit/3f3e798d495bf54ba43bc609f292a22b31853575 3f3e798d495bf54ba43bc609f292a22b31853575 2009-06-27T22:08:27-07:00 2009-06-27T22:08:27-07:00 Allowing for MVAs to use delta column if necessary. 7ed53d8632c19d400155520a4fd7a28117f3df5e Pat Allan pat@freelancing-gods.com