thinking-sphinx 2.1.0 → 3.0.0.pre

data/lib/thinking_sphinx/sinatra.rb

@@ -1,7 +0,0 @@
-require 'thinking_sphinx'
-
-ThinkingSphinx::Configuration.instance
-
-ActiveSupport.on_load :active_record do
-  include ThinkingSphinx::ActiveRecord
-end

data/lib/thinking_sphinx/source.rb

@@ -1,194 +0,0 @@
-require 'thinking_sphinx/source/internal_properties'
-require 'thinking_sphinx/source/sql'
-
-module ThinkingSphinx
-  class Source
-    include ThinkingSphinx::Source::InternalProperties
-    include ThinkingSphinx::Source::SQL
-
-    attr_accessor :model, :fields, :attributes, :joins, :conditions, :groupings,
-      :options
-    attr_reader :base, :index, :database_configuration
-
-    def initialize(index, options = {})
-      @index        = index
-      @model        = index.model
-      @fields       = []
-      @attributes   = []
-      @joins        = []
-      @conditions   = []
-      @groupings    = []
-      @options      = options
-      @associations = {}
-      @database_configuration = @model.connection.
-        instance_variable_get(:@config).clone
-
-      @base = join_dependency_class.new(
-        @model, [], initial_joins
-      )
-
-      add_internal_attributes_and_facets
-    end
-
-    def name
-      index.name
-    end
-
-    def to_riddle_for_core(offset, position)
-      source = Riddle::Configuration::SQLSource.new(
-        "#{index.core_name}_#{position}", adapter.sphinx_identifier
-      )
-
-      set_source_database_settings  source
-      set_source_fields             source
-      set_source_attributes         source, offset
-      set_source_settings           source
-      set_source_sql                source, offset
-
-      source
-    end
-
-    def to_riddle_for_delta(offset, position)
-      source = Riddle::Configuration::SQLSource.new(
-        "#{index.delta_name}_#{position}", adapter.sphinx_identifier
-      )
-      source.parent = "#{index.core_name}_#{position}"
-
-      set_source_database_settings  source
-      set_source_fields             source
-      set_source_attributes         source, offset, true
-      set_source_settings           source
-      set_source_sql                source, offset, true
-
-      source
-    end
-
-    def delta?
-      !@index.delta_object.nil?
-    end
-
-    # Gets the association stack for a specific key.
-    #
-    def association(key)
-      @associations[key] ||= Association.children(@model, key)
-    end
-
-    private
-
-    def adapter
-      @adapter ||= @model.sphinx_database_adapter
-    end
-
-    def available_attributes
-      attributes.select { |attrib| attrib.available? }
-    end
-
-    def set_source_database_settings(source)
-      config = @database_configuration
-
-      source.sql_host = config[:host]           || "localhost"
-      source.sql_user = config[:username]       || config[:user] || ENV['USER']
-      source.sql_pass = (config[:password].to_s || "").gsub('#', '\#')
-      source.sql_db   = config[:database]
-      source.sql_port = config[:port]
-      source.sql_sock = config[:socket]
-
-      # MySQL SSL support
-      source.mysql_ssl_ca   = config[:sslca]   if config[:sslca]
-      source.mysql_ssl_cert = config[:sslcert] if config[:sslcert]
-      source.mysql_ssl_key  = config[:sslkey]  if config[:sslkey]
-    end
-
-    def set_source_fields(source)
-      fields.each do |field|
-        source.sql_file_field   << field.unique_name if field.file?
-        source.sql_field_string << field.unique_name if field.with_attribute?
-        source.sql_field_str2wordcount << field.unique_name if field.with_wordcount?
-      end
-    end
-
-    def set_source_attributes(source, offset, delta = false)
-      available_attributes.each do |attrib|
-        source.send(attrib.type_to_config) << attrib.config_value(offset, delta)
-      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 @index.local_options[:group_concat_max_len]
-        source.sql_query_pre << "SET SESSION group_concat_max_len = #{@index.local_options[:group_concat_max_len]}"
-      end
-
-      source.sql_query_pre += [adapter.utf8_query_pre].compact if utf8?
-      source.sql_query_pre << adapter.utc_query_pre
-    end
-
-    def set_source_settings(source)
-      config = ThinkingSphinx::Configuration.instance
-      config.source_options.each do |key, value|
-        source.send("#{key}=".to_sym, value)
-      end
-
-      source_options = ThinkingSphinx::Configuration::SourceOptions
-      @options.each do |key, value|
-        if source_options.include?(key.to_s) && !value.nil?
-          source.send("#{key}=".to_sym, value)
-        end
-      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 if attrib.include_as_association?
-        }.compact.flatten +
-        # explicit joins
-        @joins.collect { |join|
-          join.associations
-        }.flatten
-      ).uniq.collect { |assoc|
-        # get ancestors as well as column-level associations
-        assoc.ancestors
-      }.flatten.uniq
-    end
-
-    def utf8?
-      @index.options[:charset_type] =~ /utf-8|zh_cn.utf-8/
-    end
-
-    def join_dependency_class
-      if rails_3_1?
-        ::ActiveRecord::Associations::JoinDependency
-      else
-        ::ActiveRecord::Associations::ClassMethods::JoinDependency
-      end
-    end
-
-    def initial_joins
-      if rails_3_1?
-        []
-      else
-        nil
-      end
-    end
-
-    def rails_3_1?
-      ::ActiveRecord::Associations.constants.include?(:JoinDependency) ||
-      ::ActiveRecord::Associations.constants.include?('JoinDependency')
-    end
-  end
-end

data/lib/thinking_sphinx/source/internal_properties.rb

@@ -1,51 +0,0 @@
-module ThinkingSphinx
-  class Source
-    module InternalProperties
-      def add_internal_attributes_and_facets
-        add_internal_attribute :sphinx_internal_id, nil,
-          @model.primary_key_for_sphinx.to_sym
-        add_internal_attribute :sphinx_deleted,     :integer, "0"
-        add_internal_attribute :class_crc,          :integer, crc_column, true
-        
-        unless Riddle.loaded_version.to_i < 2
-          add_internal_attribute :sphinx_internal_class, :string, internal_class_column, true
-          add_internal_facet :sphinx_internal_class
-        else
-          add_internal_facet :class_crc
-        end
-      end
-
-      def add_internal_attribute(name, type, contents, facet = false)
-        return unless attribute_by_alias(name).nil?
-
-        Attribute.new(self,
-          ThinkingSphinx::Index::FauxColumn.new(contents),
-          :type   => type,
-          :as     => name,
-          :facet  => facet,
-          :admin  => true
-        )
-      end
-
-      def add_internal_facet(name)
-        return unless facet_by_alias(name).nil?
-
-        @model.sphinx_facets << ClassFacet.new(attribute_by_alias(name))
-      end
-
-      def attribute_by_alias(attr_alias)
-        @attributes.detect { |attrib| attrib.alias == attr_alias }
-      end
-
-      def facet_by_alias(name)
-        @model.sphinx_facets.detect { |facet| facet.name == name }
-      end
-
-      def subclasses_to_s
-        "'" + (@model.send(:descendants).collect { |klass|
-          klass.to_crc32.to_s
-        } << @model.to_crc32.to_s).join(",") + "'"
-      end
-    end
-  end
-end

data/lib/thinking_sphinx/source/sql.rb

@@ -1,174 +0,0 @@
-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={})
-        relation    = @model.unscoped
-        pre_select  = 'SQL_NO_CACHE ' if adapter.sphinx_identifier == "mysql"
-        relation    = relation.select(
-          pre_select.to_s + sql_select_clause(options[:offset])
-        )
-
-        all_associations.each do |assoc|
-          relation = relation.joins(assoc.arel_join)
-        end
-
-        relation = relation.where(sql_where_clause(options))
-        relation = relation.group(sql_group_clause)
-        relation = relation.order('NULL') if adapter.sphinx_identifier == "mysql"
-        relation.to_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={})
-        return nil if @index.options[:disable_range]
-
-        min_statement = adapter.convert_nulls(
-          "MIN(#{quote_column(@model.primary_key_for_sphinx)})", 1
-        )
-        max_statement = adapter.convert_nulls(
-          "MAX(#{quote_column(@model.primary_key_for_sphinx)})", 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_for_sphinx)} = (($id - #{offset}) / #{ThinkingSphinx.context.indexed_models.size})"
-      end
-
-      def sql_select_clause(offset)
-        unique_id_expr = ThinkingSphinx.unique_id_expression(adapter, offset)
-
-        (
-          ["#{@model.quoted_table_name}.#{quote_column(@model.primary_key_for_sphinx)} #{unique_id_expr} AS #{quote_column(@model.primary_key_for_sphinx)} "] +
-          @fields.collect     { |field|     field.to_select_sql     } +
-          @attributes.collect { |attribute| attribute.to_select_sql }
-        ).compact.join(", ")
-      end
-
-      def sql_where_clause(options)
-        logic = []
-        logic += [
-          "#{@model.quoted_table_name}.#{quote_column(@model.primary_key_for_sphinx)} >= $start",
-          "#{@model.quoted_table_name}.#{quote_column(@model.primary_key_for_sphinx)} <= $end"
-        ] unless @index.options[:disable_range]
-
-        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_for_sphinx)}"] +
-          @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.table_exists? &&
-          @model.column_names.include?(@model.inheritance_column)
-
-          types = types_to_crcs
-          return @model.to_crc32.to_s if types.empty?
-
-          adapter.case(adapter.convert_nulls(
-            adapter.quote_with_table(@model.inheritance_column), @model.name),
-            types, @model.to_crc32)
-        else
-          @model.to_crc32.to_s
-        end
-      end
-
-      def internal_class_column
-        quoted_name = "'#{@model.name}'"
-
-        if @model.table_exists? &&
-          @model.column_names.include?(@model.inheritance_column)
-
-          types = types_to_hash
-          return quoted_name if types.empty?
-
-          adapter.case(adapter.convert_nulls(
-            adapter.quote_with_table(@model.inheritance_column), @model.name),
-            types, quoted_name)
-        else
-          quoted_name
-        end
-      end
-
-      def type_values
-        return @model.sphinx_types unless @model.sphinx_types.nil?
-
-        @model.connection.select_values <<-SQL
-SELECT DISTINCT #{@model.inheritance_column}
-FROM #{@model.table_name}
-        SQL
-      end
-
-      def types_to_crcs
-        type_values.compact.inject({}) { |hash, type|
-          hash[type] = type.to_crc32
-          hash
-        }
-      end
-
-      def types_to_hash
-        type_values.compact.inject({}) { |hash, type|
-          hash[type] = "'#{type}'"
-          hash
-        }
-      end
-    end
-  end
-end

data/spec/fixtures/data.sql

@@ -1,32 +0,0 @@
-insert into `people` (gender, first_name, middle_initial, last_name, street_address, city, state, postcode, email, birthday, team_id, team_type) values('female','Ellie','K','Ford','38 Mills Street','Eagle Farm Bc','QLD','4009','Ellie.K.Ford@mailinator.com','1970/1/23 00:00:00', 3, 'CricketTeam');
-insert into `people` (gender, first_name, middle_initial, last_name, street_address, city, state, postcode, email, birthday, team_id, team_type) values('female','Aaliyah','E','Allen','71 Murphy Street','Wyola West','WA','6407','Aaliyah.E.Allen@dodgit.com','1980/3/23 00:00:00', 3, 'CricketTeam');
-insert into `people` (gender, first_name, middle_initial, last_name, street_address, city, state, postcode, email, birthday, team_id, team_type) values('male','Callum','C','Miah','89 Dalgarno Street','Bullawa Creek','NSW','2390','Callum.C.Miah@trashymail.com','1973/3/25 00:00:00', 3, 'CricketTeam');
-insert into `people` (gender, first_name, middle_initial, last_name, street_address, city, state, postcode, email, birthday, team_id, team_type) values('male','Finley','L','Buckley','18 Queen Street','Manly Vale','NSW','2093','Finley.L.Buckley@spambob.com','1962/11/20 00:00:00', 3, 'CricketTeam');
-insert into `people` (gender, first_name, middle_initial, last_name, street_address, city, state, postcode, email, birthday, team_id, team_type) values('female','Poppy','A','Hilton','36 Nerrigundah Drive','Nyora','VIC','3987','Poppy.A.Hilton@dodgit.com','1972/10/30 00:00:00', 3, 'CricketTeam');
-insert into `people` (gender, first_name, middle_initial, last_name, street_address, city, state, postcode, email, birthday, team_id, team_type) values('female','Eloise','Z','Kennedy','18 Mt Berryman Road','Lilydale','QLD','4344','Eloise.Z.Kennedy@spambob.com','1973/9/28 00:00:00', 3, 'CricketTeam');
-insert into `people` (gender, first_name, middle_initial, last_name, street_address, city, state, postcode, email, birthday, team_id, team_type) values('female','Shannon','L','Manning','60 Ocean Pde','Greenvale','QLD','4816','Shannon.L.Manning@dodgit.com','1956/6/13 00:00:00', 3, 'FootballTeam');
-insert into `people` (gender, first_name, middle_initial, last_name, street_address, city, state, postcode, email, birthday, team_id, team_type) values('male','Oscar','C','Lawson','43 Feather Street','Battery Hill','QLD','4551','Oscar.C.Lawson@spambob.com','1979/10/17 00:00:00', 3, 'CricketTeam');
-insert into `people` (gender, first_name, middle_initial, last_name, street_address, city, state, postcode, email, birthday, team_id, team_type) values('female','Sofia','K','Bray','26 Clifton Street','Pental Island','VIC','3586','Sofia.K.Bray@mailinator.com','1970/5/10 00:00:00', 3, 'CricketTeam');
-insert into `people` (gender, first_name, middle_initial, last_name, street_address, city, state, postcode, email, birthday, team_id, team_type) values('male','Andrew','N','Byrne','35 Cecil Street','Monash Park','NSW','2111','Andrew.N.Byrne@spambob.com','1983/2/16 00:00:00', 3, 'CricketTeam');
-
-insert into `alphas` (name) values ('one');
-insert into `alphas` (name) values ('two');
-insert into `alphas` (name) values ('three');
-insert into `alphas` (name) values ('four');
-insert into `alphas` (name) values ('five');
-insert into `alphas` (name) values ('six');
-insert into `alphas` (name) values ('seven');
-insert into `alphas` (name) values ('eight');
-insert into `alphas` (name) values ('nine');
-insert into `alphas` (name) values ('ten');
-
-insert into `betas` (name) values ('one');
-insert into `betas` (name) values ('two');
-insert into `betas` (name) values ('three');
-insert into `betas` (name) values ('four');
-insert into `betas` (name) values ('five');
-insert into `betas` (name) values ('six');
-insert into `betas` (name) values ('seven');
-insert into `betas` (name) values ('eight');
-insert into `betas` (name) values ('nine');
-insert into `betas` (name) values ('ten');