case_insensitive_arel 0.1.2 → 0.2.0

data/Gemfile

@@ -1,11 +1,12 @@
 source "http://rubygems.org"
 
-gem "arel", ">= 2.0.9"
-gem 'activesupport', '>= 3.0.0'
+gem "arel", "~> 2.2.1"
+gem 'activesupport', '~> 3.1.0'
 
 group :development do
   gem "shoulda", ">= 0"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.5.2"
   gem "rcov", ">= 0"
+  gem "pry"
 end

data/Gemfile.lock

@@ -1,24 +1,39 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.0.5)
-    arel (2.0.9)
+    activesupport (3.1.0)
+      multi_json (~> 1.0)
+    arel (2.2.1)
+    coderay (0.9.8)
     git (1.2.5)
     jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
+    method_source (0.6.5)
+      ruby_parser (>= 2.0.5)
+    multi_json (1.0.3)
+    pry (0.9.5)
+      coderay (>= 0.9.8)
+      method_source (>= 0.6.5)
+      ruby_parser (>= 2.0.5)
+      slop (~> 2.1.0)
     rake (0.8.7)
     rcov (0.9.9)
+    ruby_parser (2.3.0)
+      sexp_processor (~> 3.0)
+    sexp_processor (3.0.6)
     shoulda (2.11.3)
+    slop (2.1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (>= 3.0.0)
-  arel (>= 2.0.9)
+  activesupport (~> 3.1.0)
+  arel (~> 2.2.1)
   bundler (~> 1.0.0)
   jeweler (~> 1.5.2)
+  pry
   rcov
   shoulda

data/README.rdoc

@@ -66,7 +66,7 @@ As an example, you could add this code to your app if you wanted to use lowercas
 
 Due to the wrapping of column names with function calls, certain DBMS' optimizers may ignore indexes on those columns
 that might otherwise be used for a query. If supported by your DBMS, you may be able to create a special index on
-these columns to help out wih your query. As an example, Oracle supports _function-based indexes_.
+these columns to help out wih your query. As an example, Oracle supports function-based indexes.
 
 For more information, please refer to your DBMS's documentation.
 
@@ -80,6 +80,20 @@ database adapters.
 Rather than risk madness, I didn't even bother trying to make this work with custom SQL. Stick with Arel and there
 won't be any issues.
 
+=== Converting Numeric Values?
+
+If Arel encounters a string value, it will convert it using the conversion_proc even if it contains a numeric
+value being compared to a numeric column. In the typical case of looking up Rails' values that originate from the params
+hash (e.g. <tt>params[:id]</tt> ) this could result in SQL like:
+
+  select * from "table" where "table"."id" = UPPER(3)
+
+Since most DBMSes will implicitly convert the result of the function to a numeric, there should be no impact on the
+query optimizer. If you absolutely must inhibit this function call from being generated, convert the string to a numeric
+value before Arel sees it. e.g.:
+
+  Something.find(params[:id].to_i)
+
 == Contributing
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet

data/Rakefile

@@ -21,8 +21,8 @@ Jeweler::Tasks.new do |gem|
   gem.authors = ["Steve Lamotte"]
   # Include your dependencies below. Runtime dependencies are required when using your gem,
   # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
-  gem.add_runtime_dependency 'arel', '>= 2.0.9'
-  gem.add_runtime_dependency 'activesupport', '>= 2.0.0'
+  gem.add_runtime_dependency 'arel', '>= 2.2.1'
+  gem.add_runtime_dependency 'activesupport', '>= 3.1.0'
 end
 Jeweler::RubygemsDotOrgTasks.new
 

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/case_insensitive_arel.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{case_insensitive_arel}
-  s.version = "0.1.2"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steve Lamotte"]
-  s.date = %q{2011-05-19}
+  s.date = %q{2011-09-16}
   s.description = %q{If you're using Oracle or another DBMS that has case-insensitive collation sequences, and you don't want to litter your database access code with case conversions, this gem is for you.}
   s.email = %q{steve@lexor.ca}
   s.extra_rdoc_files = [
@@ -52,33 +52,36 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<arel>, [">= 2.0.9"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0"])
+      s.add_runtime_dependency(%q<arel>, ["~> 2.2.1"])
+      s.add_runtime_dependency(%q<activesupport>, ["~> 3.1.0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_runtime_dependency(%q<arel>, [">= 2.0.9"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 2.0.0"])
+      s.add_development_dependency(%q<pry>, [">= 0"])
+      s.add_runtime_dependency(%q<arel>, [">= 2.2.1"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 3.1.0"])
     else
-      s.add_dependency(%q<arel>, [">= 2.0.9"])
-      s.add_dependency(%q<activesupport>, [">= 3.0.0"])
+      s.add_dependency(%q<arel>, ["~> 2.2.1"])
+      s.add_dependency(%q<activesupport>, ["~> 3.1.0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<arel>, [">= 2.0.9"])
-      s.add_dependency(%q<activesupport>, [">= 2.0.0"])
+      s.add_dependency(%q<pry>, [">= 0"])
+      s.add_dependency(%q<arel>, [">= 2.2.1"])
+      s.add_dependency(%q<activesupport>, [">= 3.1.0"])
     end
   else
-    s.add_dependency(%q<arel>, [">= 2.0.9"])
-    s.add_dependency(%q<activesupport>, [">= 3.0.0"])
+    s.add_dependency(%q<arel>, ["~> 2.2.1"])
+    s.add_dependency(%q<activesupport>, ["~> 3.1.0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<arel>, [">= 2.0.9"])
-    s.add_dependency(%q<activesupport>, [">= 2.0.0"])
+    s.add_dependency(%q<pry>, [">= 0"])
+    s.add_dependency(%q<arel>, [">= 2.2.1"])
+    s.add_dependency(%q<activesupport>, [">= 3.1.0"])
   end
 end
 

data/lib/case_insensitive_arel.rb

@@ -7,6 +7,7 @@ module Arel #:nodoc:
       # List of Arel types that should be converted to make them comparable in a case-insensitive fashion
       %w(Arel_Attributes_Attribute Arel_Attributes_String String).each do |arel_type_name|
         define_method "visit_#{arel_type_name}_with_case_insensitive" do |obj|
+          # Get original value
           value = send("visit_#{arel_type_name}_without_case_insensitive", obj)
 
           # Return either the original case-sensitive value or a converted version
@@ -31,8 +32,23 @@ module Arel #:nodoc:
 
     # Determines whether an object should be converted to case-insensitive form or not
     def self.leave_case_sensitive?(obj)
-       obj.respond_to?(:do_not_make_case_insensitive?) ||
-       (obj.respond_to?(:name) && obj.name.eql?('*'))
+      if obj.is_a?(Arel::Attributes::Attribute) and obj.relation.is_a?(Arel::Table)
+        # Determine the attribute's type
+        cn = obj.relation.engine.connection_pool.connection
+        column = if cn.is_a?(Hash)
+          # This works for FakeRecord
+          cn.columns[obj.relation.name][obj.name.to_s]
+        else
+          # This works for Oracle Enhanced
+          cn.columns(obj.relation.name).find{|col|col.name.eql?(obj.name.to_s)}
+        end
+        column_type = column ? column.type : nil
+        return true unless column_type == :string
+      end
+
+      # Last checks
+      obj.respond_to?(:do_not_make_case_insensitive?) or
+      (obj.respond_to?(:name) && obj.name.eql?('*'))
     end
 
     private

data/test/helper.rb

@@ -23,7 +23,7 @@ class Test::Unit::TestCase
   def setup
     @users = Arel::Table.new(:users)
     @users2 = @users.alias('u2')
-    @photos = Arel::Table.new(:photos)
+    @products = Arel::Table.new(:products)
   end
 
   def should_be_like(a, b)

data/test/support/fake_record.rb

@@ -3,37 +3,36 @@ module FakeRecord
   end
 
   class Connection
-    attr_reader :tables, :columns_hash
+    attr_reader :tables, :columns_hash, :visitor
 
-    def initialize
+    def initialize(visitor)
       @tables = %w{ users photos developers products}
       @columns = {
         'users' => [
-          Column.new('id', :integer),
+          Column.new('id', :number),
           Column.new('name', :string),
           Column.new('bool', :boolean),
           Column.new('created_at', :date)
         ],
-        'photos' => [
-          Column.new('id', :integer),
-          Column.new('user_name', :string),
-          Column.new('price', :decimal)
-        ],
         'products' => [
           Column.new('id', :integer),
+          Column.new('name', :string),
           Column.new('price', :decimal)
         ]
       }
       @columns_hash = {
         'users' => Hash[@columns['users'].map { |x| [x.name, x] }],
-        'photos' => Hash[@columns['photos'].map { |x| [x.name, x] }],
         'products' => Hash[@columns['products'].map { |x| [x.name, x] }]
       }
       @primary_keys = {
         'users' => 'id',
-        'photos' => 'id',
         'products' => 'id'
       }
+      @visitor = visitor
+    end
+
+    def columns(table_name)
+      @columns[table_name]
     end
 
     def primary_key name
@@ -85,7 +84,7 @@ module FakeRecord
 
     def initialize
       @spec = Spec.new(:adapter => 'america')
-      @connection = Connection.new
+      @connection = Connection.new(Arel::Visitors::ToSql.new(self))
     end
 
     def with_connection

data/test/test_comparisons.rb

@@ -12,6 +12,8 @@ class TestComparisons < Test::Unit::TestCase
     should_be_like @users.where(@users[:name].in(%w(Steve Barb))).to_sql, "SELECT FROM \"users\" WHERE UPPER(\"users\".\"name\") IN (UPPER('Steve'), UPPER('Barb'))"
     should_be_like @users.where(@users[:name].not_in(%w(Steve Barb))).to_sql, "SELECT FROM \"users\" WHERE UPPER(\"users\".\"name\") NOT IN (UPPER('Steve'), UPPER('Barb'))"
     should_be_like @users.where(@users[:name].matches_any(%w(Steve Barb))).to_sql, "SELECT FROM \"users\" WHERE (UPPER(\"users\".\"name\") LIKE UPPER('Steve') OR UPPER(\"users\".\"name\") LIKE UPPER('Barb'))"
+    should_be_like @users.where(@users[:id].eq(1)).to_sql, "SELECT FROM \"users\" WHERE \"users\".\"id\" = 1"
+    should_be_like @users.where(@users[:bool].eq(true)).to_sql, "SELECT FROM \"users\" WHERE \"users\".\"bool\" = 't'"
   end
 
   should "work correctly in case-sensitive mode" do
@@ -25,5 +27,8 @@ class TestComparisons < Test::Unit::TestCase
     should_be_like @users.where(@users[:name].in(%w(Steve Barb))).to_sql, "SELECT FROM \"users\" WHERE \"users\".\"name\" IN ('Steve', 'Barb')"
     should_be_like @users.where(@users[:name].not_in(%w(Steve Barb))).to_sql, "SELECT FROM \"users\" WHERE \"users\".\"name\" NOT IN ('Steve', 'Barb')"
     should_be_like @users.where(@users[:name].matches_any(%w(Steve Barb))).to_sql, "SELECT FROM \"users\" WHERE (\"users\".\"name\" LIKE 'Steve' OR \"users\".\"name\" LIKE 'Barb')"
+    should_be_like @users.where(@users[:id].eq(1)).to_sql, "SELECT FROM \"users\" WHERE \"users\".\"id\" = 1"
+    should_be_like @users.where(@users[:id].eq(1)).to_sql, "SELECT FROM \"users\" WHERE \"users\".\"id\" = 1"
+    should_be_like @users.where(@users[:bool].eq(true)).to_sql, "SELECT FROM \"users\" WHERE \"users\".\"bool\" = 't'"
   end
 end

data/test/test_joins.rb

@@ -3,13 +3,13 @@ require "helper"
 class TestJoins < Test::Unit::TestCase
   should "work correctly in case-insensitive mode" do
     Arel::CaseInsensitive.case_insensitive = true
-    should_be_like @users.join(@photos).on(@users[:name].eq(@photos[:user_name])).to_sql, "SELECT FROM \"users\" INNER JOIN \"photos\" ON UPPER(\"users\".\"name\") = UPPER(\"photos\".\"user_name\")"
+    should_be_like @users.join(@products).on(@users[:name].eq(@products[:name])).to_sql, "SELECT FROM \"users\" INNER JOIN \"products\" ON UPPER(\"users\".\"name\") = UPPER(\"products\".\"name\")"
     should_be_like @users.join(@users2).on(@users[:name].eq(@users2[:name])).to_sql, "SELECT FROM \"users\" INNER JOIN \"users\" \"u2\" ON UPPER(\"users\".\"name\") = UPPER(\"u2\".\"name\")"
   end
 
   should "work correctly in case-sensitive mode" do
     Arel::CaseInsensitive.case_insensitive = false
-    should_be_like @users.join(@photos).on(@users[:name].eq(@photos[:user_name])).to_sql, "SELECT FROM \"users\" INNER JOIN \"photos\" ON \"users\".\"name\" = \"photos\".\"user_name\""
+    should_be_like @users.join(@products).on(@users[:name].eq(@products[:name])).to_sql, "SELECT FROM \"users\" INNER JOIN \"products\" ON \"users\".\"name\" = \"products\".\"name\""
     should_be_like @users.join(@users2).on(@users[:name].eq(@users2[:name])).to_sql, "SELECT FROM \"users\" INNER JOIN \"users\" \"u2\" ON \"users\".\"name\" = \"u2\".\"name\""
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: case_insensitive_arel
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
   - 2
-  version: 0.1.2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Steve Lamotte
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-19 00:00:00 -05:00
+date: 2011-09-16 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,14 +24,14 @@ dependencies:
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 5
         segments: 
         - 2
-        - 0
-        - 9
-        version: 2.0.9
+        - 2
+        - 1
+        version: 2.2.1
   requirement: *id001
   type: :runtime
 - !ruby/object:Gem::Dependency 
@@ -40,14 +40,14 @@ dependencies:
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
         - 3
+        - 1
         - 0
-        - 0
-        version: 3.0.0
+        version: 3.1.0
   requirement: *id002
   type: :runtime
 - !ruby/object:Gem::Dependency 
@@ -112,36 +112,50 @@ dependencies:
   type: :development
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: arel
+  name: pry
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 3
         segments: 
-        - 2
         - 0
-        - 9
-        version: 2.0.9
+        version: "0"
   requirement: *id007
-  type: :runtime
+  type: :development
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: activesupport
+  name: arel
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 5
         segments: 
         - 2
-        - 0
-        - 0
-        version: 2.0.0
+        - 2
+        - 1
+        version: 2.2.1
   requirement: *id008
   type: :runtime
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: activesupport
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 3
+        - 1
+        - 0
+        version: 3.1.0
+  requirement: *id009
+  type: :runtime
 description: If you're using Oracle or another DBMS that has case-insensitive collation sequences, and you don't want to litter your database access code with case conversions, this gem is for you.
 email: steve@lexor.ca
 executables: []