thinking-sphinx 5.0.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f0e9705ca201e4e4aad6aee89116b150a6dbef077ae949eeddc594d8b3c2c50
-  data.tar.gz: 336af45f825119fde255c8bb373094e4d63f2ae6a98d01495410e68165534555
+  metadata.gz: 6245e3b98964aeb5e2540fd59d908458ee5596ed3eb8a1210dee732d95a8e061
+  data.tar.gz: 78e991ec45835c311bba7db38c6c1ba8d2c97fec02c448b6e63a667debeb90d9
 SHA512:
-  metadata.gz: b8d6ec2efdace6c3b214ca488f0b1befdceb61de3b2287d8eb0ce6d6eeb489619bdda92402448b51e7655936b959bfc33d94bc173b171ad542bf02133b6fe394
-  data.tar.gz: ca5e3308d74888ec60cbc0144f7972dfc5602552f6e03396f29f2ab010e7bbfebc0a2f8781d2345eeddc97a3cafcaaba24221e3c560e231a5fb51cd4180f6f57
+  metadata.gz: 043e7a4c5670d5e2371e38c27be22d7dae0c762e16f4f7e9c020c7794200cb9ce5c3f0455e692bfb8dba4fb7a8b4aa47de88a7add179c81f6f4fb294bc4b6d9c
+  data.tar.gz: 6800fe7314fff4316b347f71f216702cb340b7e6ca7df7a609b93b082375b86dba044ea06efcdb56b3f898a1647cedbd486dd833d82ed7ad1a5c8de8625fa81d

data/.circleci/config.yml

@@ -0,0 +1,150 @@
+version: 2.1
+
+orbs:
+  ruby: circleci/ruby@1.0
+
+workflows:
+  test:
+    jobs:
+      - test:
+          name: "Sphinx 2.2.11 with MySQL"
+          database: mysql2
+          sphinx_version: 2.2.11
+          sphinx_engine: sphinx
+          debian: jessie
+          ruby: '2.4.6'
+      - test:
+          name: "Sphinx 2.2.11 with PostgreSQL"
+          database: postgresql
+          sphinx_version: 2.2.11
+          sphinx_engine: sphinx
+          debian: jessie
+          ruby: '2.4.6'
+      - test:
+          name: "Sphinx 3.3.1 with MySQL"
+          database: mysql2
+          sphinx_version: 3.3.1
+          sphinx_engine: sphinx
+          debian: buster
+          matrix:
+            parameters:
+              ruby: [ '2.4.9', '2.5.8', '2.6.6', '2.7.2' ]
+      # - test:
+      #     database: postgresql
+      #     sphinx_version: 3.3.1
+      #     sphinx_engine: sphinx
+      #     matrix:
+      #       parameters:
+      #         ruby: [ '2.4', '2.5', '2.6', '2.7' ]
+      - test:
+          name: "Manticore 2.8.2 with MySQL"
+          database: mysql2
+          sphinx_version: 2.8.2
+          sphinx_engine: manticore
+          debian: stretch
+          matrix:
+            parameters:
+              ruby: [ '2.4.9', '2.5.8', '2.6.6' ]
+      - test:
+          name: "Manticore 2.8.2 with PostgreSQL"
+          database: postgresql
+          sphinx_version: 2.8.2
+          sphinx_engine: manticore
+          debian: stretch
+          matrix:
+            parameters:
+              ruby: [ '2.4.9', '2.5.8', '2.6.6' ]
+      - test:
+          name: "Manticore 3.5.4 with MySQL"
+          database: mysql2
+          sphinx_version: 3.5.4
+          sphinx_engine: manticore
+          debian: buster
+          matrix:
+            parameters:
+              ruby: [ '2.4.9', '2.5.8', '2.6.6', '2.7.2' ]
+      - test:
+          name: "Manticore 3.5.4 with PostgreSQL"
+          database: postgresql
+          sphinx_version: 3.5.4
+          sphinx_engine: manticore
+          debian: buster
+          matrix:
+            parameters:
+              ruby: [ '2.4.9', '2.5.8', '2.6.6', '2.7.2' ]
+
+jobs:
+  test:
+    parameters:
+      ruby:
+        type: string
+      database:
+        type: string
+      sphinx_version:
+        type: string
+      sphinx_engine:
+        type: string
+      debian:
+        type: string
+
+    docker:
+      - image: circleci/ruby:<< parameters.ruby >>-<< parameters.debian >>
+
+      - image: circleci/postgres:10
+        environment:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: thinking_sphinx
+          POSTGRES_DB: thinking_sphinx
+
+      - image: circleci/mysql:5.7
+        environment:
+          MYSQL_ROOT_PASSWORD: thinking_sphinx
+          MYSQL_DATABASE: thinking_sphinx
+
+    working_directory: ~/app
+
+    steps:
+      - checkout
+
+      - restore_cache:
+          keys:
+            - v1-dependencies-<< parameters.ruby >>
+
+      - run:
+          name: install bundler
+          command: |
+            if [ "<< parameters.ruby >>" == "2.7.2" ]; then
+              export BUNDLER_VERSION=2.1.4
+            else
+              export BUNDLER_VERSION=1.17.3
+            fi
+            export BUNDLE_PATH=vendor/bundle
+            gem install bundler:$BUNDLER_VERSION
+
+      - run:
+          name: install dependencies
+          command: |
+            bundle install --jobs=4 --retry=3 --path vendor/bundle
+            bundle update
+
+      - run:
+          name: set up appraisal
+          command: bundle exec appraisal update
+
+      - save_cache:
+          paths:
+            - ./vendor/bundle
+          key: v1-dependencies-<< parameters.ruby >>
+
+      - run:
+          name: set up sphinx
+          command: "./bin/loadsphinx << parameters.sphinx_version >> << parameters.sphinx_engine >>"
+
+      - run:
+          name: tests
+          environment:
+            CI: "true"
+            DATABASE: << parameters.database >>
+            SPHINX_VERSION: << parameters.sphinx_version >>
+            SPHINX_ENGINE: << parameters.sphinx_engine >>
+          command: bundle exec appraisal rspec

data/.travis.yml

@@ -19,12 +19,12 @@ env:
   matrix:
   - DATABASE=mysql2 SPHINX_VERSION=2.2.11 SPHINX_ENGINE=sphinx
   - DATABASE=postgresql SPHINX_VERSION=2.2.11 SPHINX_ENGINE=sphinx
-  - DATABASE=mysql2 SPHINX_VERSION=3.2.1 SPHINX_ENGINE=sphinx
+  - DATABASE=mysql2 SPHINX_VERSION=3.3.1 SPHINX_ENGINE=sphinx
   - DATABASE=mysql2 SPHINX_VERSION=2.8.2 SPHINX_ENGINE=manticore
   - DATABASE=postgresql SPHINX_VERSION=2.8.2 SPHINX_ENGINE=manticore
-  - DATABASE=mysql2 SPHINX_VERSION=3.4.2 SPHINX_ENGINE=manticore
-  - DATABASE=postgresql SPHINX_VERSION=3.4.2 SPHINX_ENGINE=manticore
-  # - DATABASE=postgresql SPHINX_VERSION=3.2.1 SPHINX_ENGINE=sphinx
+  - DATABASE=mysql2 SPHINX_VERSION=3.5.0 SPHINX_ENGINE=manticore
+  - DATABASE=postgresql SPHINX_VERSION=3.5.0 SPHINX_ENGINE=manticore
+  # - DATABASE=postgresql SPHINX_VERSION=3.3.1 SPHINX_ENGINE=sphinx
 sudo: false
 addons:
   postgresql: '9.4'

data/Appraisals

@@ -33,3 +33,9 @@ appraise 'rails_6_0' do
   gem 'mysql2', '~> 0.5.0', :platform => :ruby
   gem 'pg',     '~> 1.0',   :platform => :ruby
 end if RUBY_PLATFORM != 'java' && RUBY_VERSION.to_f >= 2.5
+
+appraise 'rails_6_1' do
+  gem 'rails',  '~> 6.1.0'
+  gem 'mysql2', '~> 0.5.0', :platform => :ruby
+  gem 'pg',     '~> 1.0',   :platform => :ruby
+end if RUBY_PLATFORM != 'java' && RUBY_VERSION.to_f >= 2.5

data/CHANGELOG.markdown

@@ -2,6 +2,26 @@
 
 All notable changes to this project (at least, from v3.0.0 onwards) are documented in this file.
 
+## 5.1.0 - 2020-12-28
+
+[Release Notes](https://github.com/pat/thinking-sphinx/releases/tag/v5.1.0)
+
+### Added
+
+* Support for Sphinx v3.3 and Manticore v3.5.
+* Support for Rails 6.1 (via [joiner](https://rubygems.org/gems/joiner) v0.6.0).
+
+### Changed
+
+* `enable_star` is no longer available as a configuration option, as it's been enabled by default in Sphinx since v2.2.2, and is no longer allowed in Sphinx v3.3.1.
+* All timestamp attributes are now considered plain integer values from Sphinx's perspective. Sphinx was already expecting integers, but since Sphinx v3.3.1 it doesn't recognise timestamps as a data type. There is no functional difference with this change - Thinking Sphinx was always converting times to their UNIX epoch integer values.
+* Allow configuration of the maximum statement length ([@kalsan](https://github.com/kalsan) in [#1179](https://github.com/pat/thinking-sphinx/pull/1179)).
+* Respect `:path` values to navigate associations for Thinking Sphinx callbacks on SQL-backed indices. Discussed in [#1182](https://github.com/pat/thinking-sphinx/issues/1182).
+
+### Fixed
+
+* Don't attempt to update delta flags on frozen model instances.
+
 ## 5.0.0 - 2020-07-20
 
 [Release Notes](https://github.com/pat/thinking-sphinx/releases/tag/v5.0.0)
@@ -20,7 +40,7 @@ All notable changes to this project (at least, from v3.0.0 onwards) are document
 * Remove internal uses of `send`, replaced with `public_send` as that's available in all supported Ruby versions.
 * Deletion statements are simplified by avoiding the need to calculate document keys/offsets (@njakobsen via [#1134](https://github.com/pat/thinking-sphinx/issues/1134)).
 * Real-time data is deleted before replacing it, to avoid duplicate data when offsets change (@njakobsen via [#1134](https://github.com/pat/thinking-sphinx/issues/1134)).
-* Use `reference_name` as per custom `index_set_class` definitions. Previously, the class method was called on `ThinkingSphinx::IndexSet` even if a custom subclass was configured. (As per discussinos with @kalsan in [#1172](https://github.com/pat/thinking-sphinx/issues/1172).)
+* Use `reference_name` as per custom `index_set_class` definitions. Previously, the class method was called on `ThinkingSphinx::IndexSet` even if a custom subclass was configured. (As per discussions with @kalsan in [#1172](https://github.com/pat/thinking-sphinx/issues/1172).)
 
 ## 4.4.1 - 2019-08-23
 

data/README.textile

@@ -1,6 +1,6 @@
 h1. Thinking Sphinx
 
-Thinking Sphinx is a library for connecting ActiveRecord to the Sphinx full-text search tool, and integrates closely with Rails (but also works with other Ruby web frameworks). The current release is v5.0.0.
+Thinking Sphinx is a library for connecting ActiveRecord to the Sphinx full-text search tool, and integrates closely with Rails (but also works with other Ruby web frameworks). The current release is v5.1.0.
 
 h2. Upgrading
 
@@ -14,7 +14,7 @@ It's a gem, so install it like you would any other gem. You will also need to sp
 
 <pre><code>gem 'mysql2',          '~> 0.4',    :platform => :ruby
 gem 'jdbc-mysql',      '~> 5.1.35', :platform => :jruby
-gem 'thinking-sphinx', '~> 5.0'</code></pre>
+gem 'thinking-sphinx', '~> 5.1'</code></pre>
 
 The MySQL gems mentioned are required for connecting to Sphinx, so please include it even when you're using PostgreSQL for your database.
 

data/bin/loadsphinx

@@ -14,7 +14,7 @@ load_sphinx () {
       format="deb"
       distro="trusty";;
     2.2.11)
-      url="http://sphinxsearch.com/files/sphinxsearch_2.2.11-release-1~xenial_amd64.deb"
+      url="http://sphinxsearch.com/files/sphinxsearch_2.2.11-release-1~jessie_amd64.deb"
       format="deb";;
     3.0.3)
       url="http://sphinxsearch.com/files/sphinx-3.0.3-facc3fb-linux-amd64.tar.gz"
@@ -23,7 +23,10 @@ load_sphinx () {
       url="http://sphinxsearch.com/files/sphinx-3.1.1-612d99f-linux-amd64.tar.gz"
       format="gz";;
     3.2.1)
-      url="http://www.sphinxsearch.com/files/sphinx-3.2.1-f152e0b-linux-amd64.tar.gz"
+      url="http://sphinxsearch.com/files/sphinx-3.2.1-f152e0b-linux-amd64.tar.gz"
+      format="gz";;
+    3.3.1)
+      url="http://sphinxsearch.com/files/sphinx-3.3.1-b72d67b-linux-amd64.tar.gz"
       format="gz";;
     *)
       echo "No Sphinx version $version available"
@@ -37,7 +40,9 @@ load_sphinx () {
 
   if [ "$format" == "deb" ]; then
     curl --location $url -o sphinx.deb
-    sudo apt-get install ./sphinx.deb
+    sudo apt-get install libodbc1
+    sudo dpkg -i ./sphinx.deb
+    sudo apt-get install -f
   else
     curl $url -o sphinx.tar.gz
     tar -zxvf sphinx.tar.gz
@@ -54,16 +59,19 @@ load_manticore () {
     2.7.5)
       url="https://github.com/manticoresoftware/manticoresearch/releases/download/2.7.5/manticore_2.7.5-181204-4a31c54-release-stemmer.xenial_amd64-bin.deb";;
     2.8.2)
-      url="https://github.com/manticoresoftware/manticoresearch/releases/download/2.8.2/manticore_2.8.2-190402-4e81114-release-stemmer.xenial_amd64-bin.deb";;
+      url="https://github.com/manticoresoftware/manticoresearch/releases/download/2.8.2/manticore_2.8.2-190402-4e81114d-release-stemmer.stretch_amd64-bin.deb";;
     3.4.2)
       url="https://github.com/manticoresoftware/manticoresearch/releases/download/3.4.2/manticore_3.4.2-200410-6903305-release.xenial_amd64-bin.deb";;
+    3.5.4)
+      url="https://repo.manticoresearch.com/repository/manticoresearch_buster/pool/m/manticore/manticore_3.5.4-201211-13f8d08d_amd64.deb";;
     *)
       echo "No Manticore version $version available"
       exit 1;;
   esac
 
   curl --location $url -o manticore.deb
-  sudo apt-get install ./manticore.deb
+  sudo dpkg -i ./manticore.deb
+  sudo apt-get install -f
 }
 
 if [ "$engine" == "sphinx" ]; then

data/lib/thinking_sphinx.rb

@@ -17,8 +17,6 @@ require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/module/attribute_accessors'
 
 module ThinkingSphinx
-  MAXIMUM_STATEMENT_LENGTH = (2 ** 23) - 5
-
   def self.count(query = '', options = {})
     search_for_ids(query, options).total_entries
   end

data/lib/thinking_sphinx/active_record.rb

@@ -29,6 +29,7 @@ require 'thinking_sphinx/active_record/source_joins'
 require 'thinking_sphinx/active_record/sql_builder'
 require 'thinking_sphinx/active_record/sql_source'
 
+require 'thinking_sphinx/active_record/callbacks/association_delta_callbacks'
 require 'thinking_sphinx/active_record/callbacks/delete_callbacks'
 require 'thinking_sphinx/active_record/callbacks/delta_callbacks'
 require 'thinking_sphinx/active_record/callbacks/update_callbacks'

data/lib/thinking_sphinx/active_record/attribute/sphinx_presenter.rb

@@ -4,7 +4,7 @@ class ThinkingSphinx::ActiveRecord::Attribute::SphinxPresenter
   SPHINX_TYPES = {
     :integer   => :uint,
     :boolean   => :bool,
-    :timestamp => :timestamp,
+    :timestamp => :uint,
     :float     => :float,
     :string    => :string,
     :bigint    => :bigint,

data/lib/thinking_sphinx/active_record/callbacks/association_delta_callbacks.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class ThinkingSphinx::ActiveRecord::Callbacks::AssociationDeltaCallbacks
+  def initialize(path)
+    @path = path
+  end
+
+  def after_commit(instance)
+    Array(objects_for(instance)).each do |object|
+      object.update :delta => true unless object.frozen?
+    end
+  end
+
+  private
+
+  attr_reader :path
+
+  def objects_for(instance)
+    path.inject(instance) { |object, method| object.send method }
+  end
+end

data/lib/thinking_sphinx/callbacks/appender.rb

@@ -13,29 +13,41 @@ class ThinkingSphinx::Callbacks::Appender
   end
 
   def call
+    add_core_callbacks
+    add_delta_callbacks     if behaviours.include?(:deltas)
+    add_real_time_callbacks if behaviours.include?(:real_time)
+    add_update_callbacks    if behaviours.include?(:updates)
+  end
+
+  private
+
+  attr_reader :model, :reference, :options, :block
+
+  def add_core_callbacks
     model.after_destroy ThinkingSphinx::ActiveRecord::Callbacks::DeleteCallbacks
+  end
 
-    if behaviours.include?(:deltas)
+  def add_delta_callbacks
+    if path.empty?
       model.before_save  ThinkingSphinx::ActiveRecord::Callbacks::DeltaCallbacks
       model.after_commit ThinkingSphinx::ActiveRecord::Callbacks::DeltaCallbacks
-    end
-
-    if behaviours.include?(:real_time)
-      model.after_save ThinkingSphinx::RealTime.callback_for(
-        reference, path, &block
-      )
-    end
-
-    if behaviours.include?(:updates)
-      model.after_update(
-        ThinkingSphinx::ActiveRecord::Callbacks::UpdateCallbacks
+    else
+      model.after_commit(
+        ThinkingSphinx::ActiveRecord::Callbacks::AssociationDeltaCallbacks
+          .new(path)
       )
     end
   end
 
-  private
+  def add_real_time_callbacks
+    model.after_save ThinkingSphinx::RealTime.callback_for(
+      reference, path, &block
+    )
+  end
 
-  attr_reader :model, :reference, :options, :block
+  def add_update_callbacks
+    model.after_update ThinkingSphinx::ActiveRecord::Callbacks::UpdateCallbacks
+  end
 
   def behaviours
     options[:behaviours] || []

data/lib/thinking_sphinx/connection.rb

@@ -16,6 +16,10 @@ module ThinkingSphinx::Connection
     connection_class.new options
   end
 
+  def self.clear
+    @pool = nil
+  end
+
   def self.connection_class
     return ThinkingSphinx::Connection::JRuby if RUBY_PLATFORM == 'java'
 

data/lib/thinking_sphinx/connection/client.rb

@@ -39,7 +39,7 @@ class ThinkingSphinx::Connection::Client
   private
 
   def check(statements)
-    if statements.length > ThinkingSphinx::MAXIMUM_STATEMENT_LENGTH
+    if statements.length > maximum_statement_length
       exception           = ThinkingSphinx::QueryLengthError.new
       exception.statement = statements
       raise exception
@@ -56,6 +56,11 @@ class ThinkingSphinx::Connection::Client
     @client = nil
   end
 
+  def maximum_statement_length
+    @maximum_statement_length ||= ThinkingSphinx::Configuration.instance.
+      settings['maximum_statement_length']
+  end
+
   def perform(statements)
     results_for statements
   rescue => error

data/lib/thinking_sphinx/errors.rb

@@ -38,7 +38,7 @@ end
 class ThinkingSphinx::QueryLengthError < ThinkingSphinx::SphinxError
   def message
     <<-MESSAGE
-The supplied SphinxQL statement is #{statement.length} characters long. The maximum allowed length is #{ThinkingSphinx::MAXIMUM_STATEMENT_LENGTH}.
+The supplied SphinxQL statement is #{statement.length} characters long. The maximum allowed length is #{ThinkingSphinx::Configuration.instance.settings['maximum_statement_length']}.
 
 If this error has been raised during real-time index population, it's probably due to overly large batches of records being processed at once. The default is 1000, but you can lower it on a per-environment basis in config/thinking_sphinx.yml:
 

data/lib/thinking_sphinx/real_time/index.rb

@@ -65,12 +65,10 @@ class ThinkingSphinx::RealTime::Index < Riddle::Configuration::RealtimeIndex
 
   def collection_for(attribute)
     case attribute.type
-    when :integer, :boolean
+    when :integer, :boolean, :timestamp
       attribute.multi? ? @rt_attr_multi : @rt_attr_uint
     when :string
       @rt_attr_string
-    when :timestamp
-      @rt_attr_timestamp
     when :float
       @rt_attr_float
     when :bigint

data/lib/thinking_sphinx/settings.rb

@@ -11,14 +11,15 @@ class ThinkingSphinx::Settings
     lemmatizer_base mysql_ssl_cert mysql_ssl_key mysql_ssl_ca
   ].freeze
   DEFAULTS = {
-    "configuration_file" => "config/ENVIRONMENT.sphinx.conf",
-    "indices_location"   => "db/sphinx/ENVIRONMENT",
-    "pid_file"           => "log/ENVIRONMENT.sphinx.pid",
-    "log"                => "log/ENVIRONMENT.searchd.log",
-    "query_log"          => "log/ENVIRONMENT.searchd.query.log",
-    "binlog_path"        => "tmp/binlog/ENVIRONMENT",
-    "workers"            => "threads",
-    "mysql_encoding"     => "utf8"
+    "configuration_file"       => "config/ENVIRONMENT.sphinx.conf",
+    "indices_location"         => "db/sphinx/ENVIRONMENT",
+    "pid_file"                 => "log/ENVIRONMENT.sphinx.pid",
+    "log"                      => "log/ENVIRONMENT.searchd.log",
+    "query_log"                => "log/ENVIRONMENT.searchd.query.log",
+    "binlog_path"              => "tmp/binlog/ENVIRONMENT",
+    "workers"                  => "threads",
+    "mysql_encoding"           => "utf8",
+    "maximum_statement_length" => (2 ** 23) - 5
   }.freeze
 
   def self.call(configuration)
@@ -62,7 +63,9 @@ class ThinkingSphinx::Settings
 
   def defaults
     DEFAULTS.inject({}) do |hash, (key, value)|
-      value = value.gsub("ENVIRONMENT", framework.environment)
+      if value.is_a?(String)
+        value = value.gsub("ENVIRONMENT", framework.environment)
+      end
 
       if FILE_KEYS.include?(key)
         hash[key] = absolute value

data/spec/acceptance/geosearching_spec.rb

@@ -38,10 +38,20 @@ describe 'Searching by latitude and longitude', :live => true do
       expected = {:mysql => 250326.906250, :postgresql => 250331.234375}
     end
 
-    if ActiveRecord::Base.configurations['test']['adapter'][/postgres/]
-      expect(cities.first.geodist).to eq(expected[:postgresql])
+    adapter = nil
+
+    if ActiveRecord::VERSION::STRING.to_f > 6.0
+      adapter = ActiveRecord::Base.configurations.configs_for.first.adapter
+    elsif ActiveRecord::VERSION::STRING.to_f > 5.2
+      adapter = ActiveRecord::Base.configurations.configs_for.first.config["adapter"]
+    else
+      adapter = ActiveRecord::Base.configurations['test']['adapter']
+    end
+
+    if adapter[/postgres/]
+      expect(cities.first.geodist).to be_within(0.01).of(expected[:postgresql])
     else # mysql
-      expect(cities.first.geodist).to eq(expected[:mysql])
+      expect(cities.first.geodist).to be_within(0.01).of(expected[:mysql])
     end
   end
 

data/spec/acceptance/sql_deltas_spec.rb

@@ -63,4 +63,16 @@ describe 'SQL delta indexing', :live => true do
 
     expect(Book.search('Gaiman').to_a).to eq([book])
   end
+
+  it "updates associated models" do
+    colour = Colour.create(:name => 'green')
+    sleep 0.25
+
+    expect(Colour.search('green').to_a).to eq([colour])
+
+    tee = colour.tees.create
+    sleep 0.25
+
+    expect(Colour.search(:with => {:tee_ids => tee.id}).to_a).to eq([colour])
+  end
 end

data/spec/acceptance/support/sphinx_helpers.rb

@@ -6,22 +6,22 @@ module SphinxHelpers
   end
 
   def index(*indices)
-    sleep 0.5 if ENV['TRAVIS']
+    sleep 0.5 if ENV['CI']
 
     yield if block_given?
 
     sphinx.index *indices
     sleep 0.25
-    sleep 0.5 if ENV['TRAVIS']
+    sleep 0.5 if ENV['CI']
   end
 
   def merge
-    sleep 0.5 if ENV['TRAVIS']
+    sleep 0.5 if ENV['CI']
     sleep 0.5
 
     sphinx.merge
     sleep 1.5
-    sleep 0.5 if ENV['TRAVIS']
+    sleep 0.5 if ENV['CI']
   end
 end
 

data/spec/internal/app/indices/article_index.rb

@@ -10,7 +10,6 @@ ThinkingSphinx::Index.define :article, :with => :active_record do
   has taggings.created_at, :as => :taggings_at, :type => :timestamp
 
   set_property :min_infix_len => 4
-  set_property :enable_star   => true
 end
 
 ThinkingSphinx::Index.define :article, :with => :active_record,

data/spec/internal/app/indices/colour_index.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+ThinkingSphinx::Index.define :colour, :with => :active_record, :delta => true do
+  indexes name
+
+  has tees.id, :as => :tee_ids
+end

data/spec/internal/app/models/colour.rb

@@ -2,4 +2,6 @@
 
 class Colour < ActiveRecord::Base
   has_many :tees
+
+  ThinkingSphinx::Callbacks.append(self, behaviours: [:sql, :deltas])
 end

data/spec/internal/app/models/tee.rb

@@ -4,4 +4,7 @@ class Tee < ActiveRecord::Base
   belongs_to :colour
 
   ThinkingSphinx::Callbacks.append(self, :behaviours => [:sql])
+  ThinkingSphinx::Callbacks.append(
+    self, behaviours: [:sql, :deltas], :path => [:colour]
+  )
 end

data/spec/internal/config/database.yml

@@ -1,6 +1,11 @@
 test:
   adapter:      <%= ENV['DATABASE'] || 'mysql2' %>
   database:     thinking_sphinx
-  username:     <%= ENV['DATABASE'] == 'postgresql' ? ENV['USER'] : 'root' %>
+  username:     <%= ENV['DATABASE'] == 'postgresql' ? 'postgres' : 'root' %>
+<% if ENV["CI"] %>
+  password:     thinking_sphinx
+  host:         127.0.0.1
+  port:         <%= ENV['DATABASE'] == 'postgresql' ? 5432 : 3306 %>
+<% end %>
   min_messages: warning
   encoding:     utf8

data/spec/internal/db/schema.rb

@@ -68,6 +68,7 @@ ActiveRecord::Schema.define do
 
   create_table(:colours, :force => true) do |t|
     t.string :name
+    t.boolean :delta, :null => false, :default => true
     t.timestamps null: false
   end
 

data/spec/thinking_sphinx/active_record/sql_source_spec.rb

@@ -325,14 +325,14 @@ describe ThinkingSphinx::ActiveRecord::SQLSource do
       expect(source.sql_attr_string).to include('name')
     end
 
-    it "adds timestamp attributes to sql_attr_timestamp" do
+    it "adds timestamp attributes to sql_attr_uint" do
       source.attributes << double('attribute')
       allow(presenter).to receive_messages :declaration => 'created_at',
-        :collection_type => :timestamp
+        :collection_type => :uint
 
       source.render
 
-      expect(source.sql_attr_timestamp).to include('created_at')
+      expect(source.sql_attr_uint).to include('created_at')
     end
 
     it "adds float attributes to sql_attr_float" do

data/spec/thinking_sphinx/connection/mri_spec.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+RSpec.describe ThinkingSphinx::Connection::MRI do
+  subject { described_class.new :host => "127.0.0.1", :port => 9306 }
+
+  let(:client) { double :client, :query => "result", :next_result => false }
+
+  before :each do
+    allow(Mysql2::Client).to receive(:new).and_return(client)
+  end
+
+  after :each do
+    ThinkingSphinx::Configuration.reset
+  end
+
+  describe "#execute" do
+    it "sends the query to the client" do
+      subject.execute "SELECT QUERY"
+
+      expect(client).to have_received(:query).with("SELECT QUERY")
+    end
+
+    it "returns a result" do
+      expect(subject.execute("SELECT QUERY")).to eq("result")
+    end
+
+    context "with long queries" do
+      let(:maximum)    { (2 ** 23) - 5 }
+      let(:query)      { String.new "SELECT * FROM book_core WHERE MATCH('')" }
+      let(:difference) { maximum - query.length }
+
+      it 'does not allow overly long queries' do
+        expect {
+          subject.execute(query.insert(-3, 'a' * (difference + 5)))
+        }.to raise_error(ThinkingSphinx::QueryLengthError)
+      end
+
+      it 'does not allow queries longer than specified in the settings' do
+        ThinkingSphinx::Configuration.reset
+
+        write_configuration('maximum_statement_length' => maximum - 5)
+
+        expect {
+          subject.execute(query.insert(-3, 'a' * (difference)))
+        }.to raise_error(ThinkingSphinx::QueryLengthError)
+      end
+    end
+  end
+end if RUBY_PLATFORM != 'java'

data/thinking-sphinx.gemspec

@@ -5,7 +5,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'thinking-sphinx'
-  s.version     = '5.0.0'
+  s.version     = '5.1.0'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Pat Allan"]
   s.email       = ["pat@freelancing-gods.com"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thinking-sphinx
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.0
 platform: ruby
 authors:
 - Pat Allan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-20 00:00:00.000000000 Z
+date: 2020-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -174,6 +174,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".travis.yml"
 - Appraisals
@@ -197,6 +198,7 @@ files:
 - lib/thinking_sphinx/active_record/attribute/type.rb
 - lib/thinking_sphinx/active_record/attribute/values.rb
 - lib/thinking_sphinx/active_record/base.rb
+- lib/thinking_sphinx/active_record/callbacks/association_delta_callbacks.rb
 - lib/thinking_sphinx/active_record/callbacks/delete_callbacks.rb
 - lib/thinking_sphinx/active_record/callbacks/delta_callbacks.rb
 - lib/thinking_sphinx/active_record/callbacks/update_callbacks.rb
@@ -356,7 +358,6 @@ files:
 - spec/acceptance/attribute_updates_spec.rb
 - spec/acceptance/batch_searching_spec.rb
 - spec/acceptance/big_integers_spec.rb
-- spec/acceptance/connection_spec.rb
 - spec/acceptance/excerpts_spec.rb
 - spec/acceptance/facets_spec.rb
 - spec/acceptance/geosearching_spec.rb
@@ -393,6 +394,7 @@ files:
 - spec/internal/app/indices/book_index.rb
 - spec/internal/app/indices/car_index.rb
 - spec/internal/app/indices/city_index.rb
+- spec/internal/app/indices/colour_index.rb
 - spec/internal/app/indices/product_index.rb
 - spec/internal/app/indices/tee_index.rb
 - spec/internal/app/indices/user_index.rb
@@ -461,6 +463,7 @@ files:
 - spec/thinking_sphinx/commands/stop_spec.rb
 - spec/thinking_sphinx/configuration/minimum_fields_spec.rb
 - spec/thinking_sphinx/configuration_spec.rb
+- spec/thinking_sphinx/connection/mri_spec.rb
 - spec/thinking_sphinx/connection_spec.rb
 - spec/thinking_sphinx/deletion_spec.rb
 - spec/thinking_sphinx/deltas/default_delta_spec.rb
@@ -508,7 +511,7 @@ homepage: https://pat.github.io/thinking-sphinx/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -524,7 +527,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A smart wrapper over Sphinx for ActiveRecord
 test_files:
@@ -533,7 +536,6 @@ test_files:
 - spec/acceptance/attribute_updates_spec.rb
 - spec/acceptance/batch_searching_spec.rb
 - spec/acceptance/big_integers_spec.rb
-- spec/acceptance/connection_spec.rb
 - spec/acceptance/excerpts_spec.rb
 - spec/acceptance/facets_spec.rb
 - spec/acceptance/geosearching_spec.rb
@@ -570,6 +572,7 @@ test_files:
 - spec/internal/app/indices/book_index.rb
 - spec/internal/app/indices/car_index.rb
 - spec/internal/app/indices/city_index.rb
+- spec/internal/app/indices/colour_index.rb
 - spec/internal/app/indices/product_index.rb
 - spec/internal/app/indices/tee_index.rb
 - spec/internal/app/indices/user_index.rb
@@ -638,6 +641,7 @@ test_files:
 - spec/thinking_sphinx/commands/stop_spec.rb
 - spec/thinking_sphinx/configuration/minimum_fields_spec.rb
 - spec/thinking_sphinx/configuration_spec.rb
+- spec/thinking_sphinx/connection/mri_spec.rb
 - spec/thinking_sphinx/connection_spec.rb
 - spec/thinking_sphinx/deletion_spec.rb
 - spec/thinking_sphinx/deltas/default_delta_spec.rb

data/spec/acceptance/connection_spec.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-require 'acceptance/spec_helper'
-
-RSpec.describe 'Connections', :live => true do
-  let(:maximum)    { (2 ** 23) - 5 }
-  let(:query)      { String.new "SELECT * FROM book_core WHERE MATCH('')" }
-  let(:difference) { maximum - query.length }
-
-  it 'allows normal length queries through' do
-    expect {
-      ThinkingSphinx::Connection.take do |connection|
-        connection.execute query.insert(-3, 'a' * difference)
-      end
-    }.to_not raise_error
-  end
-
-  it 'does not allow overly long queries' do
-    expect {
-      ThinkingSphinx::Connection.take do |connection|
-        connection.execute query.insert(-3, 'a' * (difference + 5))
-      end
-    }.to raise_error(ThinkingSphinx::QueryLengthError)
-  end
-end