Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: alexchee/thinking-sphinx
base: 495ddcc838
...
head fork: alexchee/thinking-sphinx
compare: a6977e6774
  • 6 commits
  • 7 files changed
  • 0 commit comments
  • 2 contributors
View
5 HISTORY
@@ -1,4 +1,9 @@
Edge:
+* Adding Sphinx 2.0.3 support (identical to 2.1.0).
+* Dropping Rails 1.2 and 2.0.x support.
+* Association keys now are the association stacks as arrays - more reliable in Rubinius.
+* Can now determine PostgreSQL versions with JRuby.
+* Many testing tweaks.
* Allow for rank_expr option being passed through to Riddle.
2.0.11 - January 2nd 2011
View
4 lib/thinking_sphinx/auto_version.rb
@@ -7,9 +7,9 @@ def self.detect
require "riddle/#{version}"
when /1.10/
require 'riddle/1.10'
- when /2.0.\d/
+ when /2.0.[12]/
require 'riddle/2.0.1'
- when /2.1.\d/
+ when /2.0.3/, /2.1.\d/
require 'riddle/2.1.0'
else
documentation_link = %Q{
View
8 spec/thinking_sphinx/auto_version_spec.rb
@@ -54,6 +54,14 @@
ThinkingSphinx::AutoVersion.detect
end
+ it "should require 2.1.0 if using Sphinx 2.0.3" do
+ ThinkingSphinx::AutoVersion.should_receive(:require).
+ with('riddle/2.1.0')
+
+ @config.stub!(:version => '2.0.3-release')
+ ThinkingSphinx::AutoVersion.detect
+ end
+
it "should require 2.1.0 if using Sphinx 2.1.0 dev" do
ThinkingSphinx::AutoVersion.should_receive(:require).
with('riddle/2.1.0')
View
4 vendor/riddle/lib/riddle/auto_version.rb
@@ -8,9 +8,9 @@ def self.configure
require "riddle/#{version}"
when /1.10/
require 'riddle/1.10'
- when /2.0.\d/
+ when /2.0.[12]/
require 'riddle/2.0.1'
- when /2.1.\d/
+ when /2.0.3/, /2.1.\d/
require 'riddle/2.1.0'
end
end
View
6 vendor/riddle/lib/riddle/client.rb
@@ -567,10 +567,12 @@ def initialise_socket
self.connection.call(self)
elsif self.class.connection
self.class.connection.call(self)
- elsif server.index('/') == 0
+ elsif server && server.index('/') == 0
UNIXSocket.new server
- else
+ elsif server
TCPSocket.new server, @port
+ else
+ raise "Server not set."
end
rescue Errno::ETIMEDOUT, Errno::ECONNRESET, Errno::ECONNREFUSED => e
retry if (tries += 1) < 5
View
5 vendor/riddle/lib/riddle/query.rb
@@ -59,7 +59,10 @@ def self.set(variable, values, global = true)
def self.snippets(data, index, query, options = nil)
options = ', ' + options.keys.collect { |key|
- "#{options[key]} AS #{key}"
+ value = options[key]
+ value = "'#{value}'" if value.is_a?(String)
+
+ "#{value} AS #{key}"
}.join(', ') unless options.nil?
"CALL SNIPPETS('#{data}', '#{index}', '#{query}'#{options})"
View
2  vendor/riddle/lib/riddle/version.rb
@@ -1,3 +1,3 @@
module Riddle
- Version = '1.5.0'
+ Version = '1.5.1'
end

No commit comments for this range

Something went wrong with that request. Please try again.