freelancing-god-thinking-sphinx 1.1.12 → 1.1.14

data/lib/thinking_sphinx/source/sql.rb

@@ -0,0 +1,124 @@
+module ThinkingSphinx
+  class Source
+    module SQL
+      # Generates the big SQL statement to get the data back for all the fields
+      # and attributes, using all the relevant association joins. If you want
+      # the version filtered for delta values, send through :delta => true in the
+      # options. Won't do much though if the index isn't set up to support a
+      # delta sibling.
+      # 
+      # Examples:
+      # 
+      #   source.to_sql
+      #   source.to_sql(:delta => true)
+      #
+      def to_sql(options={})
+        sql = <<-SQL
+SELECT #{ sql_select_clause options[:offset] }
+FROM #{ @model.quoted_table_name }
+  #{ all_associations.collect { |assoc| assoc.to_sql }.join(' ') }
+WHERE #{ sql_where_clause(options) }
+GROUP BY #{ sql_group_clause }
+        SQL
+
+        sql += " ORDER BY NULL" if adapter.sphinx_identifier == "mysql"
+        sql
+      end
+
+      # Simple helper method for the query range SQL - which is a statement that
+      # returns minimum and maximum id values. These can be filtered by delta -
+      # so pass in :delta => true to get the delta version of the SQL.
+      # 
+      def to_sql_query_range(options={})
+        min_statement = adapter.convert_nulls(
+          "MIN(#{quote_column(@model.primary_key)})", 1
+        )
+        max_statement = adapter.convert_nulls(
+          "MAX(#{quote_column(@model.primary_key)})", 1
+        )
+
+        sql = "SELECT #{min_statement}, #{max_statement} " +
+              "FROM #{@model.quoted_table_name} "
+        if self.delta? && !@index.delta_object.clause(@model, options[:delta]).blank?
+          sql << "WHERE #{@index.delta_object.clause(@model, options[:delta])}"
+        end
+
+        sql
+      end
+
+      # Simple helper method for the query info SQL - which is a statement that
+      # returns the single row for a corresponding id.
+      # 
+      def to_sql_query_info(offset)
+        "SELECT * FROM #{@model.quoted_table_name} WHERE " +
+        "#{quote_column(@model.primary_key)} = (($id - #{offset}) / #{ThinkingSphinx.indexed_models.size})"
+      end
+
+      def sql_select_clause(offset)
+        unique_id_expr = ThinkingSphinx.unique_id_expression(offset)
+
+        (
+          ["#{@model.quoted_table_name}.#{quote_column(@model.primary_key)} #{unique_id_expr} AS #{quote_column(@model.primary_key)} "] + 
+          @fields.collect     { |field|     field.to_select_sql     } +
+          @attributes.collect { |attribute| attribute.to_select_sql }
+        ).compact.join(", ")
+      end
+
+      def sql_where_clause(options)
+        logic = [
+          "#{@model.quoted_table_name}.#{quote_column(@model.primary_key)} >= $start",
+          "#{@model.quoted_table_name}.#{quote_column(@model.primary_key)} <= $end"
+        ]
+
+        if self.delta? && !@index.delta_object.clause(@model, options[:delta]).blank?
+          logic << "#{@index.delta_object.clause(@model, options[:delta])}"
+        end
+
+        logic += (@conditions || [])
+
+        logic.join(" AND ")
+      end
+
+      def sql_group_clause
+        internal_groupings = []
+        if @model.column_names.include?(@model.inheritance_column)
+           internal_groupings << "#{@model.quoted_table_name}.#{quote_column(@model.inheritance_column)}"
+        end
+
+        (
+          ["#{@model.quoted_table_name}.#{quote_column(@model.primary_key)}"] + 
+          @fields.collect     { |field|     field.to_group_sql     }.compact +
+          @attributes.collect { |attribute| attribute.to_group_sql }.compact +
+          @groupings + internal_groupings
+        ).join(", ")
+      end
+
+      def sql_query_pre_for_core
+        if self.delta? && !@index.delta_object.reset_query(@model).blank?
+          [@index.delta_object.reset_query(@model)]
+        else
+          []
+        end
+      end
+
+      def sql_query_pre_for_delta
+        [""]
+      end
+
+      def quote_column(column)
+        @model.connection.quote_column_name(column)
+      end
+
+      def crc_column
+        if @model.column_names.include?(@model.inheritance_column)
+          adapter.cast_to_unsigned(adapter.convert_nulls(
+            adapter.crc(adapter.quote_with_table(@model.inheritance_column), true),
+            @model.to_crc32
+          ))
+        else
+          @model.to_crc32.to_s
+        end
+      end
+    end
+  end
+end

data/lib/thinking_sphinx/tasks.rb

@@ -30,7 +30,7 @@ namespace :thinking_sphinx do
     if sphinx_running?
       puts "Started successfully (pid #{sphinx_pid})."
     else
-      puts "Failed to start searchd daemon. Check #{config.searchd_log_file}."
+      puts "Failed to start searchd daemon. Check #{config.searchd_log_file}"
     end
   end
   

data/spec/unit/thinking_sphinx/active_record_spec.rb

@@ -14,7 +14,7 @@ describe "ThinkingSphinx::ActiveRecord" do
       )
       
       @index = ThinkingSphinx::Index.stub_instance(:delta? => false)
-      ThinkingSphinx::Index.stub_method(:new => @index)
+      ThinkingSphinx::Index::Builder.stub_method(:generate => @index)
     end
     
     after :each do
@@ -24,17 +24,17 @@ describe "ThinkingSphinx::ActiveRecord" do
       ThinkingSphinx.indexed_models.delete "TestModule::TestModel"
     end
     
-    it "should return nil and do nothing if indexes are disabled" do
+    it "should do nothing if indexes are disabled" do
       ThinkingSphinx.stub_method(:define_indexes? => false)
       
-      TestModule::TestModel.define_index {}.should be_nil
+      TestModule::TestModel.define_index {}
       ThinkingSphinx::Index.should_not have_received(:new)
       
       ThinkingSphinx.unstub_method(:define_indexes?)
     end
     
     it "should add a new index to the model" do
-      TestModule::TestModel.define_index do; end
+      TestModule::TestModel.define_index {}
       
       TestModule::TestModel.sphinx_indexes.length.should == 1
     end
@@ -144,7 +144,7 @@ describe "ThinkingSphinx::ActiveRecord" do
     end
 
     it "should return the parent if model inherits an index" do
-      Parent.source_of_sphinx_index.should == Person
+      Admin::Person.source_of_sphinx_index.should == Person
     end
   end
   
@@ -289,10 +289,12 @@ describe "ThinkingSphinx::ActiveRecord" do
     end
 
     it "should allow associations to other STI models" do
-      Child.sphinx_indexes.last.link!
-      sql = Child.sphinx_indexes.last.to_riddle_for_core(0, 0).sql_query
+      source = Child.sphinx_indexes.last.sources.first
+      sql = source.to_riddle_for_core(0, 0).sql_query
       sql.gsub!('$start', '0').gsub!('$end', '100')
-      lambda { Child.connection.execute(sql) }.should_not raise_error(ActiveRecord::StatementInvalid)
+      lambda {
+        Child.connection.execute(sql)
+      }.should_not raise_error(ActiveRecord::StatementInvalid)
     end
   end
   

data/spec/unit/thinking_sphinx/attribute_spec.rb

@@ -1,23 +1,28 @@
 require 'spec/spec_helper'
 
 describe ThinkingSphinx::Attribute do
+  before :each do
+    @index  = ThinkingSphinx::Index.new(Person)
+    @source = ThinkingSphinx::Source.new(@index)
+  end
+  
   describe '#initialize' do
     it 'raises if no columns are provided so that configuration errors are easier to track down' do
       lambda {
-        ThinkingSphinx::Attribute.new([])
+        ThinkingSphinx::Attribute.new(@source, [])
       }.should raise_error(RuntimeError)
     end
 
     it 'raises if an element of the columns param is an integer - as happens when you use id instead of :id - so that configuration errors are easier to track down' do
       lambda {
-        ThinkingSphinx::Attribute.new([1234])
+        ThinkingSphinx::Attribute.new(@source, [1234])
       }.should raise_error(RuntimeError)
     end
   end
   
   describe "unique_name method" do
     before :each do
-      @attribute = ThinkingSphinx::Attribute.new [
+      @attribute = ThinkingSphinx::Attribute.new @source, [
         Object.stub_instance(:__stack => [], :__name => "col_name")
       ]
     end
@@ -42,7 +47,7 @@ describe ThinkingSphinx::Attribute do
   
   describe "column_with_prefix method" do
     before :each do
-      @attribute = ThinkingSphinx::Attribute.new [
+      @attribute = ThinkingSphinx::Attribute.new @source, [
         ThinkingSphinx::Index::FauxColumn.new(:col_name)
       ]
       @attribute.columns.each { |col| @attribute.associations[col] = [] }
@@ -88,7 +93,7 @@ describe ThinkingSphinx::Attribute do
       @assoc_c = Object.stub_instance(:is_many? => true)
       
       @attribute = ThinkingSphinx::Attribute.new(
-        [ThinkingSphinx::Index::FauxColumn.new(:col_name)]
+        @source, [ThinkingSphinx::Index::FauxColumn.new(:col_name)]
       )
       @attribute.associations = {
         :a => @assoc_a, :b => @assoc_b, :c => @assoc_c
@@ -122,7 +127,7 @@ describe ThinkingSphinx::Attribute do
       @col_c = ThinkingSphinx::Index::FauxColumn.new("c")
 
       @attribute = ThinkingSphinx::Attribute.new(
-        [@col_a, @col_b, @col_c]
+        @source, [@col_a, @col_b, @col_c]
       )
     end
     
@@ -146,7 +151,7 @@ describe ThinkingSphinx::Attribute do
   describe "type method" do
     before :each do
       @column = ThinkingSphinx::Index::FauxColumn.new(:col_name)
-      @attribute = ThinkingSphinx::Attribute.new([@column])
+      @attribute = ThinkingSphinx::Attribute.new(@source, [@column])
       @attribute.model = Person
       @attribute.stub_method(:is_many? => false)
     end
@@ -177,7 +182,7 @@ describe ThinkingSphinx::Attribute do
   
   describe "all_ints? method" do
     it "should return true if all columns are integers" do
-      attribute = ThinkingSphinx::Attribute.new(
+      attribute = ThinkingSphinx::Attribute.new(@source,
         [ ThinkingSphinx::Index::FauxColumn.new(:id),
           ThinkingSphinx::Index::FauxColumn.new(:team_id) ]
       )
@@ -188,7 +193,7 @@ describe ThinkingSphinx::Attribute do
     end
     
     it "should return false if only some columns are integers" do
-      attribute = ThinkingSphinx::Attribute.new(
+      attribute = ThinkingSphinx::Attribute.new(@source,
         [ ThinkingSphinx::Index::FauxColumn.new(:id),
           ThinkingSphinx::Index::FauxColumn.new(:first_name) ]
       )
@@ -199,7 +204,7 @@ describe ThinkingSphinx::Attribute do
     end
     
     it "should return false if no columns are integers" do
-      attribute = ThinkingSphinx::Attribute.new(
+      attribute = ThinkingSphinx::Attribute.new(@source,
         [ ThinkingSphinx::Index::FauxColumn.new(:first_name),
           ThinkingSphinx::Index::FauxColumn.new(:last_name) ]
       )
@@ -213,7 +218,7 @@ describe ThinkingSphinx::Attribute do
   describe "with custom queries" do
     before :each do
       index = CricketTeam.sphinx_indexes.first
-      @statement = index.to_riddle_for_core(0, 0).sql_attr_multi.first
+      @statement = index.sources.first.to_riddle_for_core(0, 0).sql_attr_multi.last
     end
     
     it "should track the query type accordingly" do

data/spec/unit/thinking_sphinx/facet_spec.rb

@@ -43,4 +43,236 @@ describe ThinkingSphinx::Facet do
       ThinkingSphinx::Facet.attribute_name_for(ThinkingSphinx::Facet.name_for('attribute_facet')).should == 'attribute_facet'
     end
   end
+  
+  describe ".attribute_name_from_value" do
+    it "should append _facet if the value is a string" do
+      ThinkingSphinx::Facet.attribute_name_from_value('attribute', 'string').
+        should == 'attribute_facet'
+    end
+    
+    it "should not append _facet if the value isn't a string" do
+      ThinkingSphinx::Facet.attribute_name_from_value('attribute', 1).
+        should == 'attribute'
+      ThinkingSphinx::Facet.attribute_name_from_value('attribute', Time.now).
+        should == 'attribute'
+      ThinkingSphinx::Facet.attribute_name_from_value('attribute', true).
+        should == 'attribute'
+      ThinkingSphinx::Facet.attribute_name_from_value('attribute', 1.23).
+        should == 'attribute'
+    end
+    
+    it "should append _facet is the value is an array of strings" do
+      ThinkingSphinx::Facet.attribute_name_from_value('attribute', ['a', 'b']).
+        should == 'attribute_facet'
+    end
+    
+    it "should not append _facet if the value is an array of integers" do
+      ThinkingSphinx::Facet.attribute_name_from_value('attribute', [1, 2]).
+        should == 'attribute'
+    end
+  end
+  
+  describe ".translate?" do
+    before :each do
+      @index     = ThinkingSphinx::Index.new(Alpha)
+      @source    = ThinkingSphinx::Source.new(@index)
+      @attribute = ThinkingSphinx::Attribute.new(
+        @source, ThinkingSphinx::Index::FauxColumn.new(:name)
+      )
+    end
+    
+    it "should return true if the property is a field" do
+      field = ThinkingSphinx::Field.new(
+        @source, ThinkingSphinx::Index::FauxColumn.new(:name)
+      )
+      
+      ThinkingSphinx::Facet.translate?(field).should be_true
+    end
+    
+    it "should return true if the property is a string attribute" do
+      @attribute.stub_method(:type => :string)
+      
+      ThinkingSphinx::Facet.translate?(@attribute).should be_true
+    end
+    
+    it "should return false if the property is an integer attribute" do
+      @attribute.stub_method(:type => :integer)
+      
+      ThinkingSphinx::Facet.translate?(@attribute).should be_false
+    end
+    
+    it "should return false if the property is a boolean attribute" do
+      @attribute.stub_method(:type => :boolean)
+      
+      ThinkingSphinx::Facet.translate?(@attribute).should be_false
+    end
+    
+    it "should return false if the property is a timestamp attribute" do
+      @attribute.stub_method(:type => :datetime)
+      
+      ThinkingSphinx::Facet.translate?(@attribute).should be_false
+    end
+    
+    it "should return false if the property is a float attribute" do
+      @attribute.stub_method(:type => :float)
+      
+      ThinkingSphinx::Facet.translate?(@attribute).should be_false
+    end
+    
+    it "should return false if the property is an MVA of integer values" do
+      @attribute.stub_method(:type => :multi, :all_ints? => true)
+      
+      ThinkingSphinx::Facet.translate?(@attribute).should be_false
+    end
+    
+    it "should return true if the property is an MVA of string values" do
+      @attribute.stub_method(:type => :multi, :all_ints? => false)
+      
+      ThinkingSphinx::Facet.translate?(@attribute).should be_true
+    end
+  end
+  
+  describe "#translate?" do
+    before :each do
+      @index     = ThinkingSphinx::Index.new(Alpha)
+      @source    = ThinkingSphinx::Source.new(@index)
+      @attribute = ThinkingSphinx::Attribute.new(
+        @source, ThinkingSphinx::Index::FauxColumn.new(:name)
+      )
+    end
+    
+    it "should return true if the property is a field" do
+      field = ThinkingSphinx::Field.new(
+        @source, ThinkingSphinx::Index::FauxColumn.new(:name)
+      )
+      
+      ThinkingSphinx::Facet.new(field).translate?.should be_true
+    end
+    
+    it "should return true if the property is a string attribute" do
+      @attribute.stub_method(:type => :string)
+      
+      ThinkingSphinx::Facet.new(@attribute).translate?.should be_true
+    end
+    
+    it "should return false if the property is an integer attribute" do
+      @attribute.stub_method(:type => :integer)
+      
+      ThinkingSphinx::Facet.new(@attribute).translate?.should be_false
+    end
+    
+    it "should return false if the property is a boolean attribute" do
+      @attribute.stub_method(:type => :boolean)
+      
+      ThinkingSphinx::Facet.new(@attribute).translate?.should be_false
+    end
+    
+    it "should return false if the property is a timestamp attribute" do
+      @attribute.stub_method(:type => :datetime)
+      
+      ThinkingSphinx::Facet.new(@attribute).translate?.should be_false
+    end
+    
+    it "should return false if the property is a float attribute" do
+      @attribute.stub_method(:type => :float)
+      
+      ThinkingSphinx::Facet.new(@attribute).translate?.should be_false
+    end
+    
+    it "should return false if the property is an MVA of integer values" do
+      @attribute.stub_method(:type => :multi, :all_ints? => true)
+      
+      ThinkingSphinx::Facet.new(@attribute).translate?.should be_false
+    end
+    
+    it "should return true if the property is an MVA of string values" do
+      @attribute.stub_method(:type => :multi, :all_ints? => false)
+      
+      ThinkingSphinx::Facet.new(@attribute).translate?.should be_true
+    end
+  end
+  
+  describe "#attribute_name" do
+    before :each do
+      @index     = ThinkingSphinx::Index.new(Alpha)
+      @source    = ThinkingSphinx::Source.new(@index)
+      @attribute = ThinkingSphinx::Attribute.new(
+        @source, ThinkingSphinx::Index::FauxColumn.new(:name)
+      )
+    end
+    
+    it "should return the attribute name if built off an integer attribute" do
+      @attribute.stub_method(:type => :integer)
+      
+      ThinkingSphinx::Facet.new(@attribute).attribute_name.should == "name"
+    end
+    
+    it "should return the attribute name if built off a boolean attribute" do
+      @attribute.stub_method(:type => :boolean)
+      
+      ThinkingSphinx::Facet.new(@attribute).attribute_name.should == "name"
+    end
+    
+    it "should return the attribute name if built off a float attribute" do
+      @attribute.stub_method(:type => :float)
+      
+      ThinkingSphinx::Facet.new(@attribute).attribute_name.should == "name"
+    end
+    
+    it "should return the attribute name if built off a timestamp attribute" do
+      @attribute.stub_method(:type => :datetime)
+      
+      ThinkingSphinx::Facet.new(@attribute).attribute_name.should == "name"
+    end
+    
+    it "should return the attribute name with _facet suffix if built off a string attribute" do
+      @attribute.stub_method(:type => :string)
+      
+      ThinkingSphinx::Facet.new(@attribute).attribute_name.should == "name_facet"
+    end
+    
+    it "should return the attribute name with _facet suffix if built off a field" do
+      field = ThinkingSphinx::Field.new(
+        @source, ThinkingSphinx::Index::FauxColumn.new(:name)
+      )
+      
+      ThinkingSphinx::Facet.new(field).attribute_name.should == "name_facet"
+    end
+    
+    it "should return the attribute name if build off an integer MVA" do
+      @attribute.stub_method(:type => :multi, :all_ints? => true)
+      
+      ThinkingSphinx::Facet.new(@attribute).attribute_name.should == "name"
+    end
+    
+    it "should return the attribute name with the _facet suffix if build off an non-integer MVA" do
+      @attribute.stub_method(:type => :multi, :all_ints? => false)
+      
+      ThinkingSphinx::Facet.new(@attribute).attribute_name.should == "name_facet"
+    end
+  end
+  
+  describe "#type" do
+    before :each do
+      @index     = ThinkingSphinx::Index.new(Alpha)
+      @source    = ThinkingSphinx::Source.new(@index)
+    end
+    
+    it "should return :string if the property is a field" do
+      field = ThinkingSphinx::Field.new(
+        @source, ThinkingSphinx::Index::FauxColumn.new(:name)
+      )
+      
+      ThinkingSphinx::Facet.new(field).type.should == :string
+    end
+    
+    it "should return the attribute type if the property is an attribute" do
+      attribute = ThinkingSphinx::Attribute.new(
+        @source, ThinkingSphinx::Index::FauxColumn.new(:name)
+      )
+      attribute.stub_method(:type => :anything)
+      
+      ThinkingSphinx::Facet.new(attribute).type.should == :anything
+    end
+  end
 end