aboutsummaryrefslogtreecommitdiffstats
path: root/lib/arel
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2010-08-13 18:55:15 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2010-08-13 18:55:15 -0700
commit74a27a0d83ecd7ed4975851ea92ee517a1581faf (patch)
treeb120548f12566bd6a9c32a142c6191ae17eadf38 /lib/arel
parent9fc70e22f9bf7df8485b90b3d7e4a5c58cb0ebbb (diff)
downloadrails-74a27a0d83ecd7ed4975851ea92ee517a1581faf.tar.gz
rails-74a27a0d83ecd7ed4975851ea92ee517a1581faf.tar.bz2
rails-74a27a0d83ecd7ed4975851ea92ee517a1581faf.zip
inserts have the correct syntax
Diffstat (limited to 'lib/arel')
-rw-r--r--lib/arel/select_manager.rb2
-rw-r--r--lib/arel/visitors/to_sql.rb18
2 files changed, 15 insertions, 5 deletions
diff --git a/lib/arel/select_manager.rb b/lib/arel/select_manager.rb
index 1728311d59..444ca8f716 100644
--- a/lib/arel/select_manager.rb
+++ b/lib/arel/select_manager.rb
@@ -30,7 +30,7 @@ module Arel
def insert values
im = InsertManager.new @engine
im.insert values
- raise
+ @engine.connection.execute im.to_sql
end
end
end
diff --git a/lib/arel/visitors/to_sql.rb b/lib/arel/visitors/to_sql.rb
index 74b7dd9385..d47c621f6a 100644
--- a/lib/arel/visitors/to_sql.rb
+++ b/lib/arel/visitors/to_sql.rb
@@ -15,8 +15,15 @@ module Arel
def visit_Arel_Nodes_InsertStatement o
[
"INSERT INTO #{visit o.relation}",
- ("(#{o.columns.map { |x| visit x }.join ', '})" unless o.columns.empty?),
- ("VALUES (#{o.values.map { |x| quote visit x }.join ', '})" unless o.values.empty?),
+
+ ("(#{o.columns.map { |x|
+ quote_column_name x.name
+ }.join ', '})" unless o.columns.empty?),
+
+ ("VALUES (#{o.values.map { |value|
+ value ? quote(visit(value)) : 'NULL'
+ }.join ', '})" unless o.values.empty?),
+
].compact.join ' '
end
@@ -43,12 +50,15 @@ module Arel
"#{visit o.left} = #{visit o.right}"
end
- def visit_Arel_Attributes_Integer o
+ def visit_Arel_Attributes_Attribute o
"#{quote_table_name o.relation.name}.#{quote_column_name o.name}"
end
- alias :visit_Arel_Attributes_String :visit_Arel_Attributes_Integer
+ alias :visit_Arel_Attributes_Integer :visit_Arel_Attributes_Attribute
+ alias :visit_Arel_Attributes_String :visit_Arel_Attributes_Attribute
+ alias :visit_Arel_Attributes_Time :visit_Arel_Attributes_Attribute
def visit_Fixnum o; o end
+ alias :visit_Time :visit_Fixnum
alias :visit_String :visit_Fixnum
alias :visit_Arel_Nodes_SqlLiteral :visit_Fixnum
alias :visit_Arel_SqlLiteral :visit_Fixnum # This is deprecated