lib/riddle/query/insert.rb in riddle-1.5.8 vs lib/riddle/query/insert.rb in riddle-1.5.9

@@ -12,21 +12,24 @@
     @replace = true
     self
   end
 
   def to_sql
-    "#{command} INTO #{@index} (`#{columns_to_s}`) VALUES (#{values_to_s})"
+    "#{command} INTO #{@index} (#{columns_to_s}) VALUES (#{values_to_s})"
   end
 
   private
 
   def command
     @replace ? 'REPLACE' : 'INSERT'
   end
 
   def columns_to_s
-    columns.join('`, `')
+    columns.collect { |column|
+      column.to_s == 'id' ? 'id' : "`#{column}`"
+    }.join(', ')
+
   end
 
   def values_to_s
     values.collect { |value_set|
       value_set.collect { |value|
@@ -41,9 +44,11 @@
       "'#{value.gsub(/['\\]/, '').gsub(/\s+/, ' ')}'"
     when TrueClass, FalseClass
       value ? 1 : 0
     when Time
       value.to_i
+    when Date
+      value.to_time.to_i
     when Array
       "(#{value.join(',')})"
     else
       value
     end