Correctly handle column names that need escaping in INSERT and UPDATE…

… statements (#164)

Examples:

INSERT INTO "x" ("user") VALUES ('abc')
UPDATE "x" SET "user" = 'MEK'

lib/pg_query/deparse.rb

@@ -393,7 +393,7 @@ def deparse_restarget(node, context)
  if context == :select
  [deparse_item(node['val']), deparse_identifier(node['name'])].compact.join(' AS ')
  elsif context == :update
- [node['name'], deparse_item(node['val'])].compact.join(' = ')
+ [deparse_identifier(node['name']), deparse_item(node['val'])].compact.join(' = ')
  elsif node['val'].nil?
  node['name']
  else
@@ -1202,7 +1202,7 @@ def deparse_insert_into(node)
 
  if node['cols']
  output << '(' + node['cols'].map do |column|
- deparse_item(column)
+ deparse_item(column, :select)
  end.join(', ') + ')'
  end
 

spec/lib/pg_query/deparse_spec.rb

@@ -599,6 +599,12 @@
  it { is_expected.to eq query }
  end
 
+ context 'special column name' do
+ let(:query) { 'INSERT INTO "x" ("user") VALUES (\'abc\')' }
+
+ it { is_expected.to eq query }
+ end
+
  context 'with RETURNING' do
  let(:query) { 'INSERT INTO "x" (y, z) VALUES (1, \'abc\') RETURNING "id"' }
 
@@ -770,6 +776,12 @@
 
  it { is_expected.to eq oneline_query }
  end
+
+ context 'special column name' do
+ let(:query) { "UPDATE \"x\" SET \"user\" = 'emin'" }
+
+ it { is_expected.to eq query }
+ end
  end
 
  context 'DELETE' do