pixeltrix-thinking-sphinx 1.1.5 → 1.2.1

data/lib/thinking_sphinx/index.rb

@@ -9,8 +9,7 @@ module ThinkingSphinx
   # Enjoy.
   # 
   class Index
-    attr_accessor :model, :fields, :attributes, :conditions, :groupings,
-      :delta_object, :options
+    attr_accessor :model, :sources, :delta_object
     
     # Create a new index instance by passing in the model it is tied to, and
     # a block to build it with (optional but recommended). For documentation
@@ -28,15 +27,17 @@ module ThinkingSphinx
     #
     def initialize(model, &block)
       @model        = model
-      @associations = {}
-      @fields       = []
-      @attributes   = []
-      @conditions   = []
-      @groupings    = []
+      @sources      = []
       @options      = {}
       @delta_object = nil
-      
-      initialize_from_builder(&block) if block_given?
+    end
+    
+    def fields
+      @sources.collect { |source| source.fields }.flatten
+    end
+    
+    def attributes
+      @sources.collect { |source| source.attributes }.flatten
     end
     
     def name
@@ -47,99 +48,39 @@ module ThinkingSphinx
       model.name.underscore.tr(':/\\', '_')
     end
     
-    def to_riddle_for_core(offset, index)
-      add_internal_attributes
-      link!
-      
-      source = Riddle::Configuration::SQLSource.new(
-        "#{name}_core_#{index}", adapter.sphinx_identifier
-      )
-      
-      set_source_database_settings  source
-      set_source_attributes         source
-      set_source_sql                source, offset
-      set_source_settings           source
-      
-      source
-    end
-    
-    def to_riddle_for_delta(offset, index)
-      add_internal_attributes
-      link!
-      
-      source = Riddle::Configuration::SQLSource.new(
-        "#{name}_delta_#{index}", adapter.sphinx_identifier
-      )
-      source.parent = "#{name}_core_#{index}"
-      
-      set_source_database_settings  source
-      set_source_attributes         source
-      set_source_sql                source, offset, true
-      
-      source
+    def prefix_fields
+      fields.select { |field| field.prefixes }
     end
     
-    # Link all the fields and associations to their corresponding
-    # associations and joins. This _must_ be called before interrogating
-    # the index's fields and associations for anything that may reference
-    # their SQL structure.
-    # 
-    def link!
-      base = ::ActiveRecord::Associations::ClassMethods::JoinDependency.new(
-        @model, [], nil
-      )
-      
-      @fields.each { |field|
-        field.model ||= @model
-        field.columns.each { |col|
-          field.associations[col] = associations(col.__stack.clone)
-          field.associations[col].each { |assoc| assoc.join_to(base) }
-        }
-      }
-      
-      @attributes.each { |attribute|
-        attribute.model ||= @model
-        attribute.columns.each { |col|
-          attribute.associations[col] = associations(col.__stack.clone)
-          attribute.associations[col].each { |assoc| assoc.join_to(base) }
-        }
-      }
+    def infix_fields
+      fields.select { |field| field.infixes }
     end
     
-    # Flag to indicate whether this index has a corresponding delta index.
-    #
-    def delta?
-      !@delta_object.nil?
+    def local_options
+      @options
     end
     
-    def adapter
-      @adapter ||= @model.sphinx_database_adapter
-    end
-        
-    def prefix_fields
-      @fields.select { |field| field.prefixes }
-    end
-    
-    def infix_fields
-      @fields.select { |field| field.infixes }
-    end
-        
-    def index_options
+    def options
       all_index_options = ThinkingSphinx::Configuration.instance.index_options.clone
       @options.keys.select { |key|
-        ThinkingSphinx::Configuration::IndexOptions.include?(key.to_s)
+        ThinkingSphinx::Configuration::IndexOptions.include?(key.to_s) ||
+        ThinkingSphinx::Configuration::CustomOptions.include?(key.to_s)
       }.each { |key| all_index_options[key.to_sym] = @options[key] }
       all_index_options
     end
-        
-    def quote_column(column)
-      @model.connection.quote_column_name(column)
+    
+    def delta?
+      !@delta_object.nil?
     end
     
     private
     
+    def adapter
+      @adapter ||= @model.sphinx_database_adapter
+    end
+    
     def utf8?
-      self.index_options[:charset_type] == "utf-8"
+      options[:charset_type] == "utf-8"
     end
     
     # Does all the magic with the block provided to the base #initialize.
@@ -147,268 +88,12 @@ module ThinkingSphinx
     # on it, then pulls all relevant settings - fields, attributes, conditions,
     # properties - into the new index.
     # 
-    # Also creates a CRC attribute for the model.
-    # 
     def initialize_from_builder(&block)
-      builder = Class.new(Builder)
-      builder.setup
-      
-      builder.instance_eval &block
-      
-      unless @model.descends_from_active_record?
-        stored_class = @model.store_full_sti_class ? @model.name : @model.name.demodulize
-        builder.where("#{@model.quoted_table_name}.#{quote_column(@model.inheritance_column)} = '#{stored_class}'")
-      end
-      
-      set_model = Proc.new { |item| item.model = @model }
-      
-      @fields       = builder.fields &set_model
-      @attributes   = builder.attributes.each &set_model
-      @conditions   = builder.conditions
-      @groupings    = builder.groupings
-      @delta_object = ThinkingSphinx::Deltas.parse self, builder.properties
-      @options      = builder.properties
-      
-      is_faceted = Proc.new { |item| item.faceted }
-      add_facet  = Proc.new { |item| @model.sphinx_facets << item.to_facet }
-      
-      @model.sphinx_facets ||= []
-      @fields.select(    &is_faceted).each &add_facet
-      @attributes.select(&is_faceted).each &add_facet
-      
-      # We want to make sure that if the database doesn't exist, then Thinking
-      # Sphinx doesn't mind when running non-TS tasks (like db:create, db:drop
-      # and db:migrate). It's a bit hacky, but I can't think of a better way.
-    rescue StandardError => err
-      case err.class.name
-      when "Mysql::Error", "ActiveRecord::StatementInvalid"
-        return
-      else
-        raise err
-      end
-    end
-    
-    # Returns all associations used amongst all the fields and attributes.
-    # This includes all associations between the model and what the actual
-    # columns are from.
-    # 
-    def all_associations
-      @all_associations ||= (
-        # field associations
-        @fields.collect { |field|
-          field.associations.values
-        }.flatten +
-        # attribute associations
-        @attributes.collect { |attrib|
-          attrib.associations.values
-        }.flatten
-      ).uniq.collect { |assoc|
-        # get ancestors as well as column-level associations
-        assoc.ancestors
-      }.flatten.uniq
-    end
-    
-    # Gets a stack of associations for a specific path.
-    # 
-    def associations(path, parent = nil)
-      assocs = []
-      
-      if parent.nil?
-        assocs = association(path.shift)
-      else
-        assocs = parent.children(path.shift)
-      end
-      
-      until path.empty?
-        point = path.shift
-        assocs = assocs.collect { |assoc|
-          assoc.children(point)
-        }.flatten
-      end
-      
-      assocs
-    end
-    
-    # Gets the association stack for a specific key.
-    # 
-    def association(key)
-      @associations[key] ||= Association.children(@model, key)
-    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)),
-          @model.to_crc32
-        ))
-      else
-        @model.to_crc32.to_s
-      end
-    end
-    
-    def add_internal_attributes
-      @attributes << Attribute.new(
-        FauxColumn.new(@model.primary_key.to_sym),
-        :type => :integer,
-        :as   => :sphinx_internal_id
-      ) unless @attributes.detect { |attr| attr.alias == :sphinx_internal_id }
-      
-      @attributes << Attribute.new(
-        FauxColumn.new(crc_column),
-        :type => :integer,
-        :as   => :class_crc
-      ) unless @attributes.detect { |attr| attr.alias == :class_crc }
-      
-      @attributes << Attribute.new(
-        FauxColumn.new("'" + (@model.send(:subclasses).collect { |klass|
-          klass.to_crc32.to_s
-        } << @model.to_crc32.to_s).join(",") + "'"),
-        :type => :multi,
-        :as   => :subclass_crcs
-      ) unless @attributes.detect { |attr| attr.alias == :subclass_crcs }
-      
-      @attributes << Attribute.new(
-        FauxColumn.new("0"),
-        :type => :integer,
-        :as   => :sphinx_deleted
-      ) unless @attributes.detect { |attr| attr.alias == :sphinx_deleted }
-    end
-        
-    def set_source_database_settings(source)
-      config = @model.connection.instance_variable_get(:@config)
-      
-      source.sql_host = config[:host]           || "localhost"
-      source.sql_user = config[:username]       || config[:user] || ""
-      source.sql_pass = (config[:password].to_s || "").gsub('#', '\#')
-      source.sql_db   = config[:database]
-      source.sql_port = config[:port]
-      source.sql_sock = config[:socket]
-    end
-    
-    def set_source_attributes(source)
-      attributes.each do |attrib|
-        source.send(attrib.type_to_config) << attrib.config_value
-      end
-    end
-    
-    def set_source_sql(source, offset, delta = false)
-      source.sql_query        = to_sql(:offset => offset, :delta => delta).gsub(/\n/, ' ')
-      source.sql_query_range  = to_sql_query_range(:delta => delta)
-      source.sql_query_info   = to_sql_query_info(offset)
-      
-      source.sql_query_pre += send(!delta ? :sql_query_pre_for_core : :sql_query_pre_for_delta)
-      
-      if @options[:group_concat_max_len]
-        source.sql_query_pre << "SET SESSION group_concat_max_len = #{@options[:group_concat_max_len]}"
-      end
-      
-      source.sql_query_pre += [adapter.utf8_query_pre].compact if utf8?
-    end
-    
-    def set_source_settings(source)
-      ThinkingSphinx::Configuration.instance.source_options.each do |key, value|
-        source.send("#{key}=".to_sym, value)
-      end
-      
-      @options.each do |key, value|
-        source.send("#{key}=".to_sym, value) if ThinkingSphinx::Configuration::SourceOptions.include?(key.to_s) && !value.nil?
-      end
-    end
-    
-    def sql_query_pre_for_core
-      if self.delta? && !@delta_object.reset_query(@model).blank?
-        [@delta_object.reset_query(@model)]
-      else
-        []
-      end
+      #
     end
     
     def sql_query_pre_for_delta
       [""]
     end
-    
-    # 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:
-    # 
-    #   index.to_sql
-    #   index.to_sql(:delta => true)
-    #
-    def to_sql(options={})
-      assocs = all_associations
-      
-      where_clause = ""
-      if self.delta? && !@delta_object.clause(@model, options[:delta]).blank?
-        where_clause << " AND #{@delta_object.clause(@model, options[:delta])}"
-      end
-      unless @conditions.empty?
-        where_clause << " AND " << @conditions.join(" AND ")
-      end
-      
-      internal_groupings = []
-      if @model.column_names.include?(@model.inheritance_column)
-         internal_groupings << "#{@model.quoted_table_name}.#{quote_column(@model.inheritance_column)}"
-      end
-      
-      unique_id_expr = "* #{ThinkingSphinx.indexed_models.size} + #{options[:offset] || 0}"
-      
-      sql = <<-SQL
-SELECT #{ (
-  ["#{@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 }
-).join(", ") }
-FROM #{ @model.table_name }
-  #{ assocs.collect { |assoc| assoc.to_sql }.join(' ') }
-WHERE #{@model.quoted_table_name}.#{quote_column(@model.primary_key)} >= $start
-  AND #{@model.quoted_table_name}.#{quote_column(@model.primary_key)} <= $end
-  #{ where_clause }
-GROUP BY #{ (
-  ["#{@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(", ") }
-      SQL
-      
-      if @model.connection.class.name == "ActiveRecord::ConnectionAdapters::MysqlAdapter"
-        sql += " ORDER BY NULL"
-      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
-    
-    # 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? && !@delta_object.clause(@model, options[:delta]).blank?
-        sql << "WHERE #{@delta_object.clause(@model, options[:delta])}"
-      end
-      
-      sql
-    end
   end
 end

data/lib/thinking_sphinx/property.rb

@@ -0,0 +1,160 @@
+module ThinkingSphinx
+  class Property
+    attr_accessor :alias, :columns, :associations, :model, :faceted, :admin
+    
+    def initialize(source, columns, options = {})
+      @source       = source
+      @model        = source.model
+      @columns      = Array(columns)
+      @associations = {}
+
+      raise "Cannot define a field or attribute in #{source.model.name} with no columns. Maybe you are trying to index a field with a reserved name (id, name). You can fix this error by using a symbol rather than a bare name (:id instead of id)." if @columns.empty? || @columns.any? { |column| !column.respond_to?(:__stack) }
+      
+      @alias    = options[:as]
+      @faceted  = options[:facet]
+      @admin    = options[:admin]
+      
+      @columns.each { |col|
+        @associations[col] = association_stack(col.__stack.clone).each { |assoc|
+          assoc.join_to(source.base)
+        }
+      }
+    end
+    
+    # Returns the unique name of the attribute - which is either the alias of
+    # the attribute, or the name of the only column - if there is only one. If
+    # there isn't, there should be an alias. Else things probably won't work.
+    # Consider yourself warned.
+    # 
+    def unique_name
+      if @columns.length == 1
+        @alias || @columns.first.__name
+      else
+        @alias
+      end
+    end
+    
+    def to_facet
+      return nil unless @faceted
+      
+      ThinkingSphinx::Facet.new(self)
+    end
+    
+    # Get the part of the GROUP BY clause related to this attribute - if one is
+    # needed. If not, all you'll get back is nil. The latter will happen if
+    # there isn't actually a real column to get data from, or if there's
+    # multiple data values (read: a has_many or has_and_belongs_to_many
+    # association).
+    # 
+    def to_group_sql
+      case
+      when is_many?, is_string?, ThinkingSphinx.use_group_by_shortcut?
+        nil
+      else
+        @columns.collect { |column|
+          column_with_prefix(column)
+        }
+      end
+    end
+    
+    def changed?(instance)
+      return true if is_string? || @columns.any? { |col| !col.__stack.empty? }
+      
+      !@columns.all? { |col|
+        instance.respond_to?("#{col.__name.to_s}_changed?") &&
+        !instance.send("#{col.__name.to_s}_changed?")
+      }
+    end
+    
+    def admin?
+      admin
+    end
+    
+    def public?
+      !admin
+    end
+    
+    private
+    
+    # Could there be more than one value related to the parent record? If so,
+    # then this will return true. If not, false. It's that simple.
+    # 
+    def is_many?
+      associations.values.flatten.any? { |assoc| assoc.is_many? }
+    end
+    
+    # Returns true if any of the columns are string values, instead of database
+    # column references.
+    def is_string?
+      columns.all? { |col| col.is_string? }
+    end
+    
+    def adapter
+      @adapter ||= @model.sphinx_database_adapter
+    end
+    
+    def quote_with_table(table, column)
+      "#{quote_table_name(table)}.#{quote_column(column)}"
+    end
+    
+    def quote_column(column)
+      @model.connection.quote_column_name(column)
+    end
+    
+    def quote_table_name(table_name)
+      @model.connection.quote_table_name(table_name)
+    end
+    
+    # Indication of whether the columns should be concatenated with a space
+    # between each value. True if there's either multiple sources or multiple
+    # associations.
+    # 
+    def concat_ws?
+      multiple_associations? || @columns.length > 1
+    end
+        
+    # Checks whether any column requires multiple associations (which only
+    # happens for polymorphic situations).
+    # 
+    def multiple_associations?
+      associations.any? { |col,assocs| assocs.length > 1 }
+    end
+    
+    # Builds a column reference tied to the appropriate associations. This
+    # dives into the associations hash and their corresponding joins to
+    # figure out how to correctly reference a column in SQL.
+    # 
+    def column_with_prefix(column)
+      if column.is_string?
+        column.__name
+      elsif associations[column].empty?
+        "#{@model.quoted_table_name}.#{quote_column(column.__name)}"
+      else
+        associations[column].collect { |assoc|
+          assoc.has_column?(column.__name) ?
+          "#{quote_with_table(assoc.join.aliased_table_name, column.__name)}" :
+          nil
+        }.compact.join(', ')
+      end
+    end
+    
+    # Gets a stack of associations for a specific path.
+    # 
+    def association_stack(path, parent = nil)
+      assocs = []
+      
+      if parent.nil?
+        assocs = @source.association(path.shift)
+      else
+        assocs = parent.children(path.shift)
+      end
+      
+      until path.empty?
+        point  = path.shift
+        assocs = assocs.collect { |assoc| assoc.children(point) }.flatten
+      end
+      
+      assocs
+    end
+  end
+end

data/lib/thinking_sphinx/rails_additions.rb

@@ -49,10 +49,13 @@ module ThinkingSphinx
   end
 end
 
-if ActiveRecord::ConnectionAdapters.constants.include?("MysqlAdapter")
-  ActiveRecord::ConnectionAdapters::MysqlAdapter.send(
-    :include, ThinkingSphinx::MysqlQuotedTableName
-  ) unless ActiveRecord::ConnectionAdapters::MysqlAdapter.instance_methods.include?("quote_table_name")
+if ActiveRecord::ConnectionAdapters.constants.include?("MysqlAdapter") or ActiveRecord::Base.respond_to?(:jdbcmysql_connection)
+  adapter = ActiveRecord::ConnectionAdapters.const_get(
+    defined?(JRUBY_VERSION) ? :JdbcAdapter : :MysqlAdapter
+  )
+  unless adapter.instance_methods.include?("quote_table_name")
+    adapter.send(:include, ThinkingSphinx::MysqlQuotedTableName)
+  end
 end
 
 module ThinkingSphinx