Literalize Date objects properly even if to_s is overridden

jeremyevans · Feb 13, 2010 · 34035d8 · 34035d8
1 parent ea19b7f
commit 34035d8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/lib/sequel/dataset/sql.rb b/lib/sequel/dataset/sql.rb
@@ -791,7 +791,7 @@ def literal_dataset(v)
 
     # SQL fragment for Date, using the ISO8601 format.
     def literal_date(v)
-      requires_sql_standard_datetimes? ? v.strftime("DATE '%Y-%m-%d'") : "'#{v}'"
+      v.strftime("#{'DATE ' if requires_sql_standard_datetimes?}'%Y-%m-%d'")
     end
 
     # SQL fragment for DateTime

diff --git a/spec/core/dataset_spec.rb b/spec/core/dataset_spec.rb
@@ -832,6 +832,13 @@ def @dataset.blah
     @dataset.literal(d).should == s
   end
 
+  specify "should literalize Date properly, even if to_s is overridden" do
+    d = Date.today
+    def d.to_s; "adsf" end
+    s = d.strftime("'%Y-%m-%d'")
+    @dataset.literal(d).should == s
+  end
+
   specify "should literalize Time, DateTime, Date properly if SQL standard format is required" do
     @dataset.meta_def(:requires_sql_standard_datetimes?){true}