source.rb in ebeigarts-thinking-sphinx-1.2.10

- old
+ new

@@ -6,11 +6,11 @@
     include ThinkingSphinx::Source::InternalProperties
     include ThinkingSphinx::Source::SQL
     
     attr_accessor :model, :fields, :attributes, :conditions, :groupings,
       :options
-    attr_reader :base
+    attr_reader :base, :index
     
     def initialize(index, options = {})
       @index        = index
       @model        = index.model
       @fields       = []
@@ -69,11 +69,11 @@
         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, offset
+        set_source_attributes         source, offset, true
         set_source_sql                source, offset, true
         source
       end
     end
     
@@ -96,19 +96,19 @@
     def set_source_database_settings(source)
       config = @model.connection.instance_variable_get(:@config)
       return unless config
       
       source.sql_host = config[:host]           || "localhost"
-      source.sql_user = config[:username]       || config[:user] || ""
+      source.sql_user = config[:username]       || config[:user] || 'root'
       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, 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
     
     def set_source_sql(source, offset, delta = false)
       source.sql_query        = to_sql(:offset => offset, :delta => delta).gsub(/\n/, ' ')