ambition 0.1.4 → 0.1.5

data/README

@@ -49,11 +49,11 @@ would.
 
 See, +to_sql+:
   >> User.select { |m| m.name == 'jon' }.to_sql
-  => "SELECT * FROM users WHERE users.`name` = 'jon'"
+  => "SELECT * FROM users WHERE users.name = 'jon'"
 
 See, +to_hash+:
   >> User.select { |m| m.name == 'jon' }.to_hash
-  => {:conditions=>"users.`name` = 'jon'"} 
+  => {:conditions=>"users.name = 'jon'"} 
 
 == Limitations
 
@@ -72,22 +72,22 @@ Instance variables and globals work, too.  Same with method calls.
 == Equality -- select { |u| u.field == 'bob' }
 
   User.select { |m| m.name == 'jon' }
-  "SELECT * FROM users WHERE users.`name` = 'jon'"
+  "SELECT * FROM users WHERE users.name = 'jon'"
 
   User.select { |m| m.name != 'jon' }
-  "SELECT * FROM users WHERE users.`name` <> 'jon'"
+  "SELECT * FROM users WHERE users.name <> 'jon'"
 
   User.select { |m| m.name == 'jon' && m.age == 21 }
-  "SELECT * FROM users WHERE (users.`name` = 'jon' AND users.`age` = 21)"
+  "SELECT * FROM users WHERE (users.name = 'jon' AND users.age = 21)"
 
   User.select { |m| m.name == 'jon' || m.age == 21 }
-  "SELECT * FROM users WHERE (users.`name` = 'jon' OR users.`age` = 21)"
+  "SELECT * FROM users WHERE (users.name = 'jon' OR users.age = 21)"
     
   User.select { |m| m.name == 'jon' || m.age == 21 && m.password == 'pass' }
-  "SELECT * FROM users WHERE (users.`name` = 'jon' OR (users.`age` = 21 AND users.`password` = 'pass'))"
+  "SELECT * FROM users WHERE (users.name = 'jon' OR (users.age = 21 AND users.password = 'pass'))"
 
   User.select { |m| (m.name == 'jon' || m.name == 'rick') && m.age == 21 }
-  "SELECT * FROM users WHERE ((users.`name` = 'jon' OR users.`name` = 'rick') AND users.`age` = 21)"
+  "SELECT * FROM users WHERE ((users.name = 'jon' OR users.name = 'rick') AND users.age = 21)"
 
 == Associations -- select { |u| u.field == 'bob' && u.association.field == 'bob@bob.com' }
 
@@ -95,83 +95,83 @@ The +to_sql+ method doesn't work on associations yet, but that's okay: they can
 still query through ActiveRecord just fine.
 
   User.select { |u| u.email == 'chris@ozmm.org' && u.profile.name == 'chris wanstrath' }.map(&:title)
-  SELECT users.`id` AS t0_r0, ... FROM users LEFT OUTER JOIN profiles ON profiles.user_id = users.id WHERE ((users.`email` = 'chris@ozmm.org' AND profiles.name = 'chris wanstrath')) 
+  SELECT users.id AS t0_r0, ... FROM users LEFT OUTER JOIN profiles ON profiles.user_id = users.id WHERE ((users.email = 'chris@ozmm.org' AND profiles.name = 'chris wanstrath')) 
 
 == Comparisons -- select { |u| u.age > 21 }
 
   User.select { |m| m.age > 21 }
-  "SELECT * FROM users WHERE users.`age` > 21"
+  "SELECT * FROM users WHERE users.age > 21"
 
   User.select { |m| m.age < 21 }.to_sql
-  "SELECT * FROM users WHERE users.`age` < 21"
+  "SELECT * FROM users WHERE users.age < 21"
 
   User.select { |m| [1, 2, 3, 4].include? m.id }
-  "SELECT * FROM users WHERE users.`id` IN (1, 2, 3, 4)"
+  "SELECT * FROM users WHERE users.id IN (1, 2, 3, 4)"
 
 == LIKE and REGEXP (RLIKE) -- select { |m| m.name =~ 'chris' }
 
   User.select { |m| m.name =~ 'chris' }
-  "SELECT * FROM users WHERE users.`name` LIKE 'chris'"
+  "SELECT * FROM users WHERE users.name LIKE 'chris'"
 
   User.select { |m| m.name =~ 'chri%' }
-  "SELECT * FROM users WHERE users.`name` LIKE 'chri%'"
+  "SELECT * FROM users WHERE users.name LIKE 'chri%'"
 
   User.select { |m| m.name !~ 'chris' }
-  "SELECT * FROM users WHERE users.`name` NOT LIKE 'chris'"
+  "SELECT * FROM users WHERE users.name NOT LIKE 'chris'"
 
   User.select { |m| !(m.name =~ 'chris') }
-  "SELECT * FROM users WHERE users.`name` NOT LIKE 'chris'"
+  "SELECT * FROM users WHERE users.name NOT LIKE 'chris'"
 
   User.select { |m| m.name =~ /chris/ }
-  "SELECT * FROM users WHERE users.`name` REGEXP 'chris'"
+  "SELECT * FROM users WHERE users.name REGEXP 'chris'"
 
 == #detect
 
   User.detect { |m| m.name == 'chris' }
-  "SELECT * FROM users WHERE users.`name` = 'chris' LIMIT 1"
+  "SELECT * FROM users WHERE users.name = 'chris' LIMIT 1"
 
 == LIMITs -- first, first(x), [offset, limit], [range], slice
 
   User.select { |m| m.name == 'jon' }.first
-  "SELECT * FROM users WHERE users.`name` = 'jon' LIMIT 1"
+  "SELECT * FROM users WHERE users.name = 'jon' LIMIT 1"
 
   User.select { |m| m.name == 'jon' }.first(5)
-  "SELECT * FROM users WHERE users.`name` = 'jon' LIMIT 5"
+  "SELECT * FROM users WHERE users.name = 'jon' LIMIT 5"
 
   User.select { |m| m.name == 'jon' }[10, 20]
-  "SELECT * FROM users WHERE users.`name` = 'jon' LIMIT 10, 20"
+  "SELECT * FROM users WHERE users.name = 'jon' LIMIT 10, 20"
 
   User.select { |m| m.name == 'jon' }[10..20]
-  "SELECT * FROM users WHERE users.`name` = 'jon' LIMIT 10, 10"
+  "SELECT * FROM users WHERE users.name = 'jon' LIMIT 10, 10"
 
 == ORDER -- sort_by { |u| u.field }
 
   User.select { |m| m.name == 'jon' }.sort_by { |m| m.name }
-  "SELECT * FROM users WHERE users.`name` = 'jon' ORDER BY users.name"
+  "SELECT * FROM users WHERE users.name = 'jon' ORDER BY users.name"
 
   User.select { |m| m.name == 'jon' }.sort_by { |m| [ m.name,  m.age ] }
-  "SELECT * FROM users WHERE users.`name` = 'jon' ORDER BY users.name, users.age"
+  "SELECT * FROM users WHERE users.name = 'jon' ORDER BY users.name, users.age"
 
   User.select { |m| m.name == 'jon' }.sort_by { |m| [ m.name,  -m.age ] }
-  "SELECT * FROM users WHERE users.`name` = 'jon' ORDER BY users.name, users.age DESC"
+  "SELECT * FROM users WHERE users.name = 'jon' ORDER BY users.name, users.age DESC"
 
   User.select { |m| m.name == 'jon' }.sort_by { |m| [ -m.name,  -m.age ] }
-  "SELECT * FROM users WHERE users.`name` = 'jon' ORDER BY users.name DESC, users.age DESC"
+  "SELECT * FROM users WHERE users.name = 'jon' ORDER BY users.name DESC, users.age DESC"
 
   User.select { |m| m.name == 'jon' }.sort_by { |m| -m.age }
-  "SELECT * FROM users WHERE users.`name` = 'jon' ORDER BY users.age DESC"
+  "SELECT * FROM users WHERE users.name = 'jon' ORDER BY users.age DESC"
 
   User.select { |m| m.name == 'jon' }.sort_by { |m| -m.profiles.title }
-  "SELECT users.`id` AS t0_r0, ... FROM users LEFT OUTER JOIN profiles ON profiles.user_id = users.id 
-   WHERE (users.`name` = 'jon') ORDER BY profiles.title DESC"
+  "SELECT users.id AS t0_r0, ... FROM users LEFT OUTER JOIN profiles ON profiles.user_id = users.id 
+   WHERE (users.name = 'jon') ORDER BY profiles.title DESC"
 
   User.select { |m| m.name == 'jon' }.sort_by { rand }
-  "SELECT * FROM users WHERE users.`name` = 'jon' ORDER BY RAND()"
+  "SELECT * FROM users WHERE users.name = 'jon' ORDER BY RAND()"
 
 == COUNT -- select { |u| u.name == 'jon' }.size
 
   User.select { |m| m.name == 'jon' }.size
-  SELECT count(*) AS count_all FROM users WHERE (users.`name` = 'jon') 
+  SELECT count(*) AS count_all FROM users WHERE (users.name = 'jon') 
 
   >> User.select { |m| m.name == 'jon' }.size
   => 21
@@ -190,8 +190,12 @@ kickers.
 The +downcase+ and +upcase+ methods will map to LOWER() and UPPER(), respectively.
 
   >> User.select { |m| m.name.downcase =~ 'jon%' }.to_sql
-  => "SELECT * FROM users WHERE LOWER(users.`name`) LIKE 'jon%'"
-  
+  => "SELECT * FROM users WHERE LOWER(users.name) LIKE 'jon%'"
+
+== Quoting
+
+Columns and values will be quoted using ActiveRecord's quote_column_name and quote methods, if
+possible.
 
 == SELECT * FROM bugs 
 

data/Rakefile

@@ -2,7 +2,7 @@ require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
 
-Version = '0.1.4'
+Version = '0.1.5'
 
 module Rake::TaskManager
   def redefine_task(task_class, args, &block)

data/lib/ambition/processor.rb

@@ -6,7 +6,6 @@ module Ambition
 
     attr_reader :key, :join_string, :prefix, :includes
 
-
     def initialize
       super()
       @strict          = false
@@ -52,6 +51,10 @@ module Ambition
       else ActiveRecord::Base.connection.quote(value) rescue quote(value)
       end
     end
+    
+    def quote_column_name(value)
+      ActiveRecord::Base.connection.quote_column_name(value) rescue value.to_s
+    end
 
     def extract_includes(receiver, method)
       return unless receiver.first == :call && receiver[1].last == @receiver

data/lib/ambition/where.rb

@@ -131,7 +131,7 @@ module Ambition
         else
           "#{process(receiver)} = #{other_value}"
         end
-      when '<>', '>', '<'
+      when '<>', '>', '<', '>=', '<='
         "#{process(receiver)} #{method} #{process(other)}"
       when 'include?'
         "#{process(other)} IN (#{process(receiver)})"
@@ -144,7 +144,7 @@ module Ambition
       when 'downcase'
         "LOWER(#{process(receiver)})"
       else
-        extract_includes(receiver, method) || "#{process(receiver)}.`#{method}`"
+        extract_includes(receiver, method) || "#{process(receiver)}.#{quote_column_name(method)}"
       end
     end
   end

data/test/chaining_test.rb

@@ -4,14 +4,14 @@ context "Chaining" do
   specify "should join selects with AND" do
     sql = User.select { |m| m.name == 'jon' }
     sql = sql.select { |m| m.age == 22 }
-    sql.to_sql.should == "SELECT * FROM users WHERE users.`name` = 'jon' AND users.`age` = 22"
+    sql.to_sql.should == "SELECT * FROM users WHERE users.name = 'jon' AND users.age = 22"
   end
 
   specify "should join sort_bys with a comma" do
     sql = User.select { |m| m.name == 'jon' }
     sql = sql.sort_by { |m| m.name }
     sql = sql.sort_by { |m| m.age }
-    sql.to_sql.should == "SELECT * FROM users WHERE users.`name` = 'jon' ORDER BY users.name, users.age"
+    sql.to_sql.should == "SELECT * FROM users WHERE users.name = 'jon' ORDER BY users.name, users.age"
   end
 
   specify "should join selects and sorts intelligently" do
@@ -19,7 +19,7 @@ context "Chaining" do
     sql = sql.select { |m| m.age == 22 }
     sql = sql.sort_by { |m| -m.name }
     sql = sql.sort_by { |m| m.age }
-    sql.to_sql.should == "SELECT * FROM users WHERE users.`name` = 'jon' AND users.`age` = 22 ORDER BY users.name DESC, users.age"
+    sql.to_sql.should == "SELECT * FROM users WHERE users.name = 'jon' AND users.age = 22 ORDER BY users.name DESC, users.age"
   end
 
   specify "should join lots of selects and sorts intelligently" do
@@ -29,6 +29,6 @@ context "Chaining" do
     sql = sql.select { |m| m.power == true }
     sql = sql.sort_by { |m| m.email }
     sql = sql.select { |m| m.admin == true && m.email == 'chris@ozmm.org' }
-    sql.to_sql.should == "SELECT * FROM users WHERE users.`name` = 'jon' AND users.`age` = 22 AND users.`power` = 1 AND (users.`admin` = 1 AND users.`email` = 'chris@ozmm.org') ORDER BY users.name, users.email"
+    sql.to_sql.should == "SELECT * FROM users WHERE users.name = 'jon' AND users.age = 22 AND users.power = 1 AND (users.admin = 1 AND users.email = 'chris@ozmm.org') ORDER BY users.name, users.email"
   end
 end

data/test/count_test.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/helper'
 
 context "Count" do
   setup do
-    hash = { :conditions => "users.`name` = 'jon'" }
+    hash = { :conditions => "users.name = 'jon'" }
     User.expects(:count).with(hash)
     @sql = User.select { |m| m.name == 'jon' }
   end

data/test/enumerable_test.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/helper'
 
 context "Each" do
   specify "simple ==" do
-    hash = { :conditions => "users.`age` = 21" }
+    hash = { :conditions => "users.age = 21" }
     User.expects(:find).with(:all, hash).returns([])
     User.select { |m| m.age == 21 }.each do |user|
       puts user.name
@@ -10,7 +10,7 @@ context "Each" do
   end
 
   specify "limit and conditions" do
-    hash = { :limit => '5', :conditions => "users.`age` = 21" }
+    hash = { :limit => '5', :conditions => "users.age = 21" }
     User.expects(:find).with(:all, hash).returns([])
     User.select { |m| m.age == 21 }.first(5).each do |user|
       puts user.name
@@ -18,7 +18,7 @@ context "Each" do
   end
 
   specify "limit and conditions and order" do
-    hash = { :limit => '5', :conditions => "users.`age` = 21", :order => 'users.name' }
+    hash = { :limit => '5', :conditions => "users.age = 21", :order => 'users.name' }
     User.expects(:find).with(:all, hash).returns([])
     User.select { |m| m.age == 21 }.sort_by { |m| m.name }.first(5).each do |user|
       puts user.name
@@ -36,13 +36,13 @@ end
 
 context "Enumerable Methods" do
   specify "map" do
-    hash = { :conditions => "users.`age` = 21" }
+    hash = { :conditions => "users.age = 21" }
     User.expects(:find).with(:all, hash).returns([])
     User.select { |m| m.age == 21 }.map { |u| u.name }
   end
 
   specify "each_with_index" do
-    hash = { :conditions => "users.`age` = 21" }
+    hash = { :conditions => "users.age = 21" }
     User.expects(:find).with(:all, hash).returns([])
     User.select { |m| m.age == 21 }.each_with_index do |user, i|
       puts "#{i}: #{user.name}"
@@ -50,7 +50,7 @@ context "Enumerable Methods" do
   end
 
   specify "any?" do
-    User.expects(:count).with(:conditions => "users.`age` > 21").returns(1)
+    User.expects(:count).with(:conditions => "users.age > 21").returns(1)
     User.any? { |u| u.age > 21 }.should == true
   end
 
@@ -63,10 +63,10 @@ context "Enumerable Methods" do
   end
 
   specify "empty?" do
-    User.expects(:count).with(:conditions => "users.`age` > 21").returns(1)
+    User.expects(:count).with(:conditions => "users.age > 21").returns(1)
     User.select { |u| u.age > 21 }.empty?.should.equal false
 
-    User.expects(:count).with(:conditions => "users.`age` > 21").returns(0)
+    User.expects(:count).with(:conditions => "users.age > 21").returns(0)
     User.select { |u| u.age > 21 }.empty?.should.equal true
   end
 
@@ -74,7 +74,7 @@ context "Enumerable Methods" do
     User.expects(:find).with(:all, {})
     User.entries
 
-    hash = { :conditions => "users.`age` = 21" }
+    hash = { :conditions => "users.age = 21" }
     User.expects(:find).with(:all, hash).returns([])
     User.select { |m| m.age == 21 }.entries
   end

data/test/join_test.rb

@@ -12,7 +12,7 @@ context "Joins" do
   specify "simple mixed == on an association" do
     sql = User.select { |m| m.name == 'chris' && m.account.email == 'chris@ozmm.org' }
     sql.to_hash.should ==  { 
-      :conditions => "(users.`name` = 'chris' AND accounts.email = 'chris@ozmm.org')", 
+      :conditions => "(users.name = 'chris' AND accounts.email = 'chris@ozmm.org')", 
       :include => [:account] 
     }
   end

data/test/limit_test.rb

@@ -6,37 +6,37 @@ context "Limit" do
   end
 
   specify "first" do
-    conditions = { :conditions => "users.`name` = 'jon'", :limit => '1' }
+    conditions = { :conditions => "users.name = 'jon'", :limit => '1' }
     User.expects(:find).with(:first, conditions)
     @sql.first
   end
 
   specify "first with argument" do
-    conditions = { :conditions => "users.`name` = 'jon'", :limit => '5' }
+    conditions = { :conditions => "users.name = 'jon'", :limit => '5' }
     User.expects(:find).with(:all, conditions)
     @sql.first(5)
   end
 
   specify "[] with one element" do
-    conditions = { :conditions => "users.`name` = 'jon'", :limit => '10, 1' }
+    conditions = { :conditions => "users.name = 'jon'", :limit => '10, 1' }
     User.expects(:find).with(:all, conditions)
     @sql[10]
   end
   
   specify "[] with two elements" do
-    conditions = { :conditions => "users.`name` = 'jon'", :limit => '10, 20' }
+    conditions = { :conditions => "users.name = 'jon'", :limit => '10, 20' }
     User.expects(:find).with(:all, conditions)
     @sql[10, 20]
   end
   
   specify "slice is an alias of []" do
-    conditions = { :conditions => "users.`name` = 'jon'", :limit => '10, 20' }
+    conditions = { :conditions => "users.name = 'jon'", :limit => '10, 20' }
     User.expects(:find).with(:all, conditions)
     @sql.slice(10, 20)
   end
   
   specify "[] with range" do
-    conditions = { :conditions => "users.`name` = 'jon'", :limit => '10, 10' }
+    conditions = { :conditions => "users.name = 'jon'", :limit => '10, 10' }
     User.expects(:find).with(:all, conditions)
     @sql[10..20]
   end

data/test/order_test.rb

@@ -7,38 +7,38 @@ context "Order" do
 
   specify "simple order" do
     string = @sql.sort_by { |m| m.name }.to_sql
-    string.should == "SELECT * FROM users WHERE users.`name` = 'jon' ORDER BY users.name"
+    string.should == "SELECT * FROM users WHERE users.name = 'jon' ORDER BY users.name"
   end
 
   specify "simple combined order" do
     string = @sql.sort_by { |m| [ m.name,  m.age ] }.to_sql
-    string.should == "SELECT * FROM users WHERE users.`name` = 'jon' ORDER BY users.name, users.age"
+    string.should == "SELECT * FROM users WHERE users.name = 'jon' ORDER BY users.name, users.age"
   end
 
   specify "simple combined order with single reverse" do
     string = @sql.sort_by { |m| [ m.name,  -m.age ] }.to_sql
-    string.should == "SELECT * FROM users WHERE users.`name` = 'jon' ORDER BY users.name, users.age DESC"
+    string.should == "SELECT * FROM users WHERE users.name = 'jon' ORDER BY users.name, users.age DESC"
   end
 
   specify "simple combined order with two reverses" do
     string = @sql.sort_by { |m| [ -m.name,  -m.age ] }.to_sql
-    string.should == "SELECT * FROM users WHERE users.`name` = 'jon' ORDER BY users.name DESC, users.age DESC"
+    string.should == "SELECT * FROM users WHERE users.name = 'jon' ORDER BY users.name DESC, users.age DESC"
   end
 
   specify "reverse order with -" do
     string = @sql.sort_by { |m| -m.age }.to_sql
-    string.should == "SELECT * FROM users WHERE users.`name` = 'jon' ORDER BY users.age DESC"
+    string.should == "SELECT * FROM users WHERE users.name = 'jon' ORDER BY users.age DESC"
   end
 
   xspecify "reverse order with #reverse" do
     # TODO: not implemented
     string = @sql.sort_by { |m| m.age }.reverse.to_sql
-    string.should == "SELECT * FROM users WHERE users.`name` = 'jon' ORDER BY users.age DESC"
+    string.should == "SELECT * FROM users WHERE users.name = 'jon' ORDER BY users.age DESC"
   end
 
   specify "random order" do
     string = @sql.sort_by { rand }.to_sql
-    string.should == "SELECT * FROM users WHERE users.`name` = 'jon' ORDER BY RAND()"
+    string.should == "SELECT * FROM users WHERE users.name = 'jon' ORDER BY RAND()"
   end
   
   specify "non-existent method to sort by" do

data/test/types_test.rb

@@ -18,38 +18,38 @@ context "Different types" do
   types_hash.each do |type, translation|
     specify "simple using #{type}" do
       sql = User.select { |m| m.name == type }.to_sql
-      sql.should == "SELECT * FROM users WHERE users.`name` = #{translation}"
+      sql.should == "SELECT * FROM users WHERE users.name = #{translation}"
     end
   end
 
   specify "float" do
     sql = User.select { |m| m.name == 1.2 }.to_sql
-    sql.should == "SELECT * FROM users WHERE users.`name` = 1.2"
+    sql.should == "SELECT * FROM users WHERE users.name = 1.2"
   end
   
   specify "integer" do
     sql = User.select { |m| m.name == 1 }.to_sql
-    sql.should == "SELECT * FROM users WHERE users.`name` = 1"
+    sql.should == "SELECT * FROM users WHERE users.name = 1"
   end
   
   specify "true" do
     sql = User.select { |m| m.name == true }.to_sql
-    sql.should == "SELECT * FROM users WHERE users.`name` = 1"
+    sql.should == "SELECT * FROM users WHERE users.name = 1"
   end
   
   specify "false" do
     sql = User.select { |m| m.name == false }.to_sql
-    sql.should == "SELECT * FROM users WHERE users.`name` = 0"
+    sql.should == "SELECT * FROM users WHERE users.name = 0"
   end
 
   specify "nil" do
     sql = User.select { |m| m.name == nil }.to_sql
-    sql.should == "SELECT * FROM users WHERE users.`name` is NULL"
+    sql.should == "SELECT * FROM users WHERE users.name is NULL"
   end
 
   xspecify "Time" do
     # TODO: nothing but variables inside blocks for now
     sql = User.select { |m| m.name == Time.now }.to_sql
-    sql.should == "SELECT * FROM users WHERE users.`name` = NULL"
+    sql.should == "SELECT * FROM users WHERE users.name = NULL"
   end
 end

data/test/where_test.rb

@@ -3,57 +3,60 @@ require File.dirname(__FILE__) + '/helper'
 context "Where (using select)" do
   specify "simple ==" do
     sql = User.select { |m| m.name == 'jon' }.to_sql
-    sql.should == "SELECT * FROM users WHERE users.`name` = 'jon'"
+    sql.should == "SELECT * FROM users WHERE users.name = 'jon'"
   end
 
   specify "simple !=" do
     sql = User.select { |m| m.name != 'jon' }.to_sql
-    sql.should == "SELECT * FROM users WHERE users.`name` <> 'jon'"
+    sql.should == "SELECT * FROM users WHERE users.name <> 'jon'"
   end
 
   specify "simple == && ==" do
     sql = User.select { |m| m.name == 'jon' && m.age == 21 }.to_sql
-    sql.should == "SELECT * FROM users WHERE (users.`name` = 'jon' AND users.`age` = 21)"
+    sql.should == "SELECT * FROM users WHERE (users.name = 'jon' AND users.age = 21)"
   end
 
   specify "simple == || ==" do
     sql = User.select { |m| m.name == 'jon' || m.age == 21 }.to_sql
-    sql.should == "SELECT * FROM users WHERE (users.`name` = 'jon' OR users.`age` = 21)"
+    sql.should == "SELECT * FROM users WHERE (users.name = 'jon' OR users.age = 21)"
   end
 
   specify "mixed && and ||" do
     sql = User.select { |m| m.name == 'jon' || m.age == 21 && m.password == 'pass' }.to_sql
-    sql.should == "SELECT * FROM users WHERE (users.`name` = 'jon' OR (users.`age` = 21 AND users.`password` = 'pass'))"
+    sql.should == "SELECT * FROM users WHERE (users.name = 'jon' OR (users.age = 21 AND users.password = 'pass'))"
   end
 
   specify "grouped && and ||" do
     sql = User.select { |m| (m.name == 'jon' || m.name == 'rick') && m.age == 21 }.to_sql
-    sql.should == "SELECT * FROM users WHERE ((users.`name` = 'jon' OR users.`name` = 'rick') AND users.`age` = 21)"
+    sql.should == "SELECT * FROM users WHERE ((users.name = 'jon' OR users.name = 'rick') AND users.age = 21)"
   end
 
   specify "simple >/<" do
     sql = User.select { |m| m.age > 21 }.to_sql
-    sql.should == "SELECT * FROM users WHERE users.`age` > 21"
+    sql.should == "SELECT * FROM users WHERE users.age > 21"
+
+    sql = User.select { |m| m.age >= 21 }.to_sql
+    sql.should == "SELECT * FROM users WHERE users.age >= 21"
 
     sql = User.select { |m| m.age < 21 }.to_sql
-    sql.should == "SELECT * FROM users WHERE users.`age` < 21"
+    sql.should == "SELECT * FROM users WHERE users.age < 21"
   end
 
   specify "array.include? item" do
     sql = User.select { |m| [1, 2, 3, 4].include? m.id }.to_sql
-    sql.should == "SELECT * FROM users WHERE users.`id` IN (1, 2, 3, 4)"
+    sql.should == "SELECT * FROM users WHERE users.id IN (1, 2, 3, 4)"
   end
 
   specify "simple == with variables" do
     me = 'chris'
     sql = User.select { |m| m.name == me }.to_sql
-    sql.should == "SELECT * FROM users WHERE users.`name` = '#{me}'"
+    sql.should == "SELECT * FROM users WHERE users.name = '#{me}'"
   end
 
   specify "simple == with method arguments" do
     def test_it(name)
       sql = User.select { |m| m.name == name }.to_sql
-      sql.should == "SELECT * FROM users WHERE users.`name` = '#{name}'"
+      sql.should == "SELECT * FROM users WHERE users.name = '#{name}'"
     end
 
     test_it('chris')
@@ -62,7 +65,7 @@ context "Where (using select)" do
   specify "simple == with instance variables" do
     @me = 'chris'
     sql = User.select { |m| m.name == @me }.to_sql
-    sql.should == "SELECT * FROM users WHERE users.`name` = '#{@me}'"
+    sql.should == "SELECT * FROM users WHERE users.name = '#{@me}'"
   end
 
   xspecify "simple == with instance variable method call" do
@@ -70,13 +73,13 @@ context "Where (using select)" do
     @person = OpenStruct.new(:name => 'chris')
 
     sql = User.select { |m| m.name == @person.name }.to_sql
-    sql.should == "SELECT * FROM users WHERE users.`name` = '#{@person.name}'"
+    sql.should == "SELECT * FROM users WHERE users.name = '#{@person.name}'"
   end
 
   specify "simple == with global variables" do
     $my_name = 'boston'
     sql = User.select { |m| m.name == $my_name }.to_sql
-    sql.should == "SELECT * FROM users WHERE users.`name` = '#{$my_name}'"
+    sql.should == "SELECT * FROM users WHERE users.name = '#{$my_name}'"
   end
 
   specify "simple == with method call" do
@@ -85,43 +88,43 @@ context "Where (using select)" do
     end
 
     sql = User.select { |m| m.name == band }.to_sql
-    sql.should == "SELECT * FROM users WHERE users.`name` = '#{band}'"
+    sql.should == "SELECT * FROM users WHERE users.name = '#{band}'"
   end
 
   specify "simple =~ with string" do
     sql = User.select { |m| m.name =~ 'chris' }.to_sql
-    sql.should == "SELECT * FROM users WHERE users.`name` LIKE 'chris'"
+    sql.should == "SELECT * FROM users WHERE users.name LIKE 'chris'"
 
     sql = User.select { |m| m.name =~ 'chri%' }.to_sql
-    sql.should == "SELECT * FROM users WHERE users.`name` LIKE 'chri%'"
+    sql.should == "SELECT * FROM users WHERE users.name LIKE 'chri%'"
   end
 
   specify "simple !~ with string" do
     sql = User.select { |m| m.name !~ 'chris' }.to_sql
-    sql.should == "SELECT * FROM users WHERE users.`name` NOT LIKE 'chris'"
+    sql.should == "SELECT * FROM users WHERE users.name NOT LIKE 'chris'"
 
     sql = User.select { |m| !(m.name =~ 'chris') }.to_sql
-    sql.should == "SELECT * FROM users WHERE users.`name` NOT LIKE 'chris'"
+    sql.should == "SELECT * FROM users WHERE users.name NOT LIKE 'chris'"
   end
 
   specify "simple =~ with regexp" do
     sql = User.select { |m| m.name =~ /chris/ }.to_sql
-    sql.should == "SELECT * FROM users WHERE users.`name` REGEXP 'chris'"
+    sql.should == "SELECT * FROM users WHERE users.name REGEXP 'chris'"
   end
 
   specify "simple =~ with regexp flags" do
     sql = User.select { |m| m.name =~ /chris/i }.to_sql
-    sql.should == "SELECT * FROM users WHERE users.`name` REGEXP 'chris'"
+    sql.should == "SELECT * FROM users WHERE users.name REGEXP 'chris'"
   end
 
   specify "simple LOWER()" do
     sql = User.select { |m| m.name.downcase =~ 'chris%' }.to_sql
-    sql.should == "SELECT * FROM users WHERE LOWER(users.`name`) LIKE 'chris%'"
+    sql.should == "SELECT * FROM users WHERE LOWER(users.name) LIKE 'chris%'"
   end
 
   specify "simple UPPER()" do
     sql = User.select { |m| m.name.upcase =~ 'chris%' }.to_sql
-    sql.should == "SELECT * FROM users WHERE UPPER(users.`name`) LIKE 'chris%'"
+    sql.should == "SELECT * FROM users WHERE UPPER(users.name) LIKE 'chris%'"
   end
 
   specify "undefined equality symbol" do
@@ -131,7 +134,7 @@ context "Where (using select)" do
   xspecify "simple == with inline ruby" do
     # TODO: implement this
     sql = User.select { |m| m.created_at == 2.days.ago.to_s(:db) }.to_sql
-    sql.should == "SELECT * FROM users WHERE users.`created_at` = #{2.days.ago.to_s(:db)}"
+    sql.should == "SELECT * FROM users WHERE users.created_at = #{2.days.ago.to_s(:db)}"
   end
 
   specify "inspect" do
@@ -141,13 +144,13 @@ end
 
 context "Where (using detect)" do
   specify "simple ==" do
-    conditions = { :conditions => "users.`name` = 'chris'", :limit => '1' }
+    conditions = { :conditions => "users.name = 'chris'", :limit => '1' }
     User.expects(:find).with(:first, conditions)
     User.detect { |m| m.name == 'chris' }
   end
 
   specify "nothing found" do
-    conditions = { :conditions => "users.`name` = 'chris'", :limit => '1' }
+    conditions = { :conditions => "users.name = 'chris'", :limit => '1' }
     User.expects(:find).with(:first, conditions).returns(nil)
     User.detect { |m| m.name == 'chris' }.should.be.nil
   end

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: ambition
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 date: 2007-08-30 00:00:00 -07:00
 summary: Ambition builds SQL from plain jane Ruby.
 require_paths: