case_insensitive_arel 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/case_insensitive_arel.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{case_insensitive_arel}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steve Lamotte"]
-  s.date = %q{2011-03-19}
+  s.date = %q{2011-05-18}
   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 = [

data/lib/case_insensitive_arel.rb

@@ -6,11 +6,11 @@ module Arel #:nodoc:
     class ToSql
       # 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 |o|
-          value = send("visit_#{arel_type_name}_without_case_insensitive", o)
+        define_method "visit_#{arel_type_name}_with_case_insensitive" do |obj|
+          value = send("visit_#{arel_type_name}_without_case_insensitive", obj)
 
-          # If the object has been tagged with
-          o.respond_to?(:do_not_make_case_insensitive?) ? value : Arel::CaseInsensitive.convert_value(value)
+          # Return either the original case-sensitive value or a converted version
+          Arel::CaseInsensitive.leave_case_sensitive?(obj) ? value : Arel::CaseInsensitive.convert_value(value)
         end
         alias_method_chain "visit_#{arel_type_name}", :case_insensitive
       end
@@ -27,6 +27,14 @@ module Arel #:nodoc:
     #  Arel::CaseInsensitive.conversion_proc = Proc.new { |val| "UPPER(#{val})" }
     cattr_accessor :conversion_proc
 
+    protected
+
+    # 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?) ||
+       false#(obj.respond_to?(:name) && obj.name.eql?('*'))
+    end
+
     private
 
     # Return the converted value or the value itself depending on the current state of +case_insensitive+

data/test/test_projects.rb

@@ -5,6 +5,7 @@ class TestProjects < Test::Unit::TestCase
     Arel::CaseInsensitive.case_insensitive = true
     should_be_like @users.project(Arel.sql('*')).to_sql, "SELECT * FROM \"users\""
     should_be_like @users.project('*').to_sql, "SELECT * FROM \"users\""
+    should_be_like @users.project('"users".*').to_sql, "SELECT \"users\".* FROM \"users\""
     should_be_like @users.project(@users[:name]).to_sql, "SELECT \"users\".\"name\" FROM \"users\""
     should_be_like @users.project(@users[:name]).where(@users[:name].eq(@users[:name])).to_sql, "SELECT \"users\".\"name\" FROM \"users\" WHERE UPPER(\"users\".\"name\") = UPPER(\"users\".\"name\")"
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: case_insensitive_arel
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Steve Lamotte
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-19 00:00:00 -05:00
+date: 2011-05-18 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency