activerecord-mysql-index-hint 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6ed09ffc9402615f78570a17a7c6b71dd16ef2c
-  data.tar.gz: beecd68ecbf4d2787669ffb0f1395309954a85e1
+  metadata.gz: f7191260fbe07cc9cb7cfcfb9b83b984e2b28ccd
+  data.tar.gz: 05eaa9aa8ddc2190ce7d408af6a4ee1bf562dd34
 SHA512:
-  metadata.gz: 9e830a2a518533a98dfcd1792c4bed14d2745fdfe64766f6b7387d1fa7057a93790aa832b641e1b019b1783208248fbe6a8026987c10a043fbf09060ddb5f57c
-  data.tar.gz: b6ca8fcd39cc51ce292105933a5a8f071d3628e4b3309bd74d22b20b5d102b509fa6d181a73dcec8e01346810c64688beb3418068f18b8dfc24cc9214718c05c
+  metadata.gz: 576b2f9b945d6fc3f43becf70b69847d6c98f061b0dd00f998567a231bec0f9c0baef7db0613d0113938c99ba1c641a793f7a9f2f21a4f816004d1fba22a80f8
+  data.tar.gz: e139007a6c0c3b32e5617ca3d610297b76aff2db62a7a88e387e8c95a113c33c7a39024af770079cafd4c6489959ad7334434920b5d1bbed8ab7880c8c5a0225

data/.tachikoma.yml

@@ -0,0 +1 @@
+strategy: 'bundler'

data/.travis.yml

@@ -1,8 +1,17 @@
 rvm:
-  - 1.9.3
-  - 2.0.0
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0
+  - ruby-head
 install: bundle install
+before_install: gem install bundler -v 1.11.2
 script: bundle exec rake spec
 gemfile:
-  - gemfiles/3.2.gemfile
-  - gemfiles/4.0.gemfile
+  - gemfiles/4.1.gemfile
+  - gemfiles/4.2.gemfile
+  - gemfiles/5.0.gemfile
+matrix:
+  allow_failures:
+    - gemfile: gemfiles/5.0.gemfile
+    - rvm: ruby-head
+  fast_finish: true

data/Appraisals

@@ -1,9 +1,15 @@
-appraise "3.2" do
-  gem "activerecord", "~> 3.2.15"
-  gem "activerecord-mysql-index-hint", :path => "../"
+appraise "4.1" do
+  gem "mysql2", "~> 0.3.13"
+  gem "activerecord", "~> 4.1.15"
+  gem "activerecord-mysql-index-hint", :path => "."
 end
 
-appraise "4.0" do
-  gem "activerecord", "~> 4.0.0"
-  gem "activerecord-mysql-index-hint", :path => "../"
+appraise "4.2" do
+  gem "activerecord", "~> 4.2.6"
+  gem "activerecord-mysql-index-hint", :path => "."
+end
+
+appraise "5.0" do
+  gem "activerecord", "~> 5.0.0.beta3"
+  gem "activerecord-mysql-index-hint", :path => "."
 end

data/ChangeLog.md

@@ -1,4 +1,7 @@
 # ChangeLog
+## 0.0.3
+- Fix count with eager_load (Thanks @kamipo)
+
 ## 0.0.2
 - Don't directly touch AR::Base, but do it via AS.on_load (Thanks @amatsuda)
 

data/activerecord-mysql-index-hint.gemspec

@@ -22,5 +22,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'appraisal'
   spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'mysql2'
+  spec.add_development_dependency 'mysql2', '>= 0.3.18', '< 0.5'
 end

data/gemfiles/4.1.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "mysql2", "~> 0.3.13"
+gem "activerecord", "~> 4.1.15"
+gem "activerecord-mysql-index-hint", :path => "../"
+
+gemspec :path => "../"

data/gemfiles/4.2.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 4.2.6"
+gem "activerecord-mysql-index-hint", :path => "../"
+
+gemspec :path => "../"

data/gemfiles/5.0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 5.0.0.beta3"
+gem "activerecord-mysql-index-hint", :path => "../"
+
+gemspec :path => "../"

data/lib/activerecord-mysql-index-hint.rb

@@ -17,7 +17,7 @@ module ActiveRecordMysqlIndexHint
   def from_with_index_hint(hint_type, *args)
     return self if args.blank?
     indexes = args.map {|index| connection.quote_column_name index }
-    self.from("#{quoted_table_name} #{hint_type} INDEX(#{indexes.join(', ')})")
+    self.from([Arel.sql("#{quoted_table_name} #{hint_type} INDEX(#{indexes.join(', ')})")])
   end
 end
 

data/lib/activerecord-mysql-index-hint/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordMysqlIndexHint
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/activerecord-mysql-index-hint_spec.rb

@@ -1,21 +1,30 @@
 require 'active_record'
-require 'mysql2'
 require 'active_record/connection_adapters/mysql2_adapter'
 require 'activerecord-mysql-index-hint'
 
-module Mysql2
-  class Client
-    def initialize(opts={})
-      @query_options = @@default_query_options.dup.merge opts
-    end
+module ActiveRecord
+  module ConnectionHandling
+    prepend Module.new {
+      def mysql2_connection(config)
+        ConnectionAdapters::Mysql2Adapter.new(nil, logger, nil, config)
+      end
+    }
   end
-end
 
-ActiveRecord::ConnectionAdapters::Mysql2Adapter.class_eval do
-  def quote_string(string)
-    string
-  end
-  def configure_connection
+  module ConnectionAdapters
+    class Mysql2Adapter
+      prepend Module.new {
+        def quote_string(string)
+          string
+        end
+
+        def reconnect!
+        end
+
+        def configure_connection
+        end
+      }
+    end
   end
 end
 
@@ -29,40 +38,44 @@ class Product < ActiveRecord::Base
   establish_connection 'mysql2://user@host/db'
 end
 
+def normalize_spaces(sql)
+  sql.gsub(/ {2,}/, ' ')
+end
+
 describe 'ActiveRecord Index Hint' do
   context 'with AR::Relation' do
     it do
       expect(
-        Product.limit(1).use_index(:idx1).to_sql
-      ).to eq('SELECT  `products`.* FROM `products` USE INDEX(`idx1`)  LIMIT 1')
+        normalize_spaces Product.limit(1).use_index(:idx1).to_sql
+      ).to eq('SELECT `products`.* FROM `products` USE INDEX(`idx1`) LIMIT 1')
     end
 
     it do
       expect(
-        Product.limit(1).force_index(:idx1).to_sql
-      ).to eq('SELECT  `products`.* FROM `products` FORCE INDEX(`idx1`)  LIMIT 1')
+        normalize_spaces Product.limit(1).force_index(:idx1).to_sql
+      ).to eq('SELECT `products`.* FROM `products` FORCE INDEX(`idx1`) LIMIT 1')
     end
 
     it do
       expect(
-        Product.limit(1).ignore_index(:idx1).to_sql
-      ).to eq('SELECT  `products`.* FROM `products` IGNORE INDEX(`idx1`)  LIMIT 1')
+        normalize_spaces Product.limit(1).ignore_index(:idx1).to_sql
+      ).to eq('SELECT `products`.* FROM `products` IGNORE INDEX(`idx1`) LIMIT 1')
     end
   end
 
   context 'with AR::Base' do
     it do
       expect(
-        Product.use_index(:idx1).limit(1).to_sql
-      ).to eq('SELECT  `products`.* FROM `products` USE INDEX(`idx1`)  LIMIT 1')
+        normalize_spaces Product.use_index(:idx1).limit(1).to_sql
+      ).to eq('SELECT `products`.* FROM `products` USE INDEX(`idx1`) LIMIT 1')
     end
   end
 
   context 'with multiple indexes' do
     it do
       expect(
-        Product.limit(1).use_index(:idx1, :idx2).to_sql
-      ).to eq('SELECT  `products`.* FROM `products` USE INDEX(`idx1`, `idx2`)  LIMIT 1')
+        normalize_spaces Product.limit(1).use_index(:idx1, :idx2).to_sql
+      ).to eq('SELECT `products`.* FROM `products` USE INDEX(`idx1`, `idx2`) LIMIT 1')
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-mysql-index-hint
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Issei Naruta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-28 00:00:00.000000000 Z
+date: 2016-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -86,14 +86,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.18
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.18
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.5'
 description: MySQL index hint support for ActiveRecord
 email:
 - naruta@cookpad.com
@@ -103,6 +109,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".tachikoma.yml"
 - ".travis.yml"
 - Appraisals
 - ChangeLog.md
@@ -111,8 +118,9 @@ files:
 - README.md
 - Rakefile
 - activerecord-mysql-index-hint.gemspec
-- gemfiles/3.2.gemfile
-- gemfiles/4.0.gemfile
+- gemfiles/4.1.gemfile
+- gemfiles/4.2.gemfile
+- gemfiles/5.0.gemfile
 - lib/activerecord-mysql-index-hint.rb
 - lib/activerecord-mysql-index-hint/version.rb
 - spec/activerecord-mysql-index-hint_spec.rb
@@ -137,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: MySQL index hint support for ActiveRecord

data/gemfiles/3.2.gemfile

@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 3.2.15"
-gem "activerecord-mysql-index-hint", :path=>"../"
-
-gemspec :path=>"../"

data/gemfiles/4.0.gemfile

@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 4.0.0"
-gem "activerecord-mysql-index-hint", :path=>"../"
-
-gemspec :path=>"../"