adding exec_insert for postgresql

3 files changed, 43 insertions, 1 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index 08329b33ed..a0be143c8e 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -554,6 +554,10 @@ module ActiveRecord
         end
       end
 
+      def exec_insert(sql, name, binds)
+        exec_query(sql, name, binds)
+      end
+
       # Executes an UPDATE query and returns the number of affected tuples.
       def update_sql(sql, name = nil)
         super.cmd_tuples
diff --git a/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb b/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
index b0a4a4e39d..861e3344b2 100644
--- a/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "cases/helper"
 
 module ActiveRecord
@@ -6,7 +7,27 @@ module ActiveRecord
       def setup
         @connection = ActiveRecord::Base.connection
         @connection.exec_query('drop table if exists ex')
-        @connection.exec_query('create table ex(id serial primary key, data character varying(255))')
+        @connection.exec_query('create table ex(id serial primary key, number integer, data character varying(255))')
+      end
+
+      def test_exec_insert_number
+        insert(@connection, 'number' => 10)
+
+        result = @connection.exec_query('SELECT number FROM ex WHERE number = 10')
+
+        assert_equal 1, result.rows.length
+        assert_equal "10", result.rows.last.last
+      end
+
+      def test_exec_insert_string
+        str = 'いただきます！'
+        insert(@connection, 'number' => 10, 'data' => str)
+
+        result = @connection.exec_query('SELECT number, data FROM ex WHERE number = 10')
+
+        value = result.rows.last.last
+
+        assert_equal str, value
       end
 
       def test_table_alias_length
@@ -63,6 +84,21 @@ module ActiveRecord
         bind = @connection.substitute_for(nil, [nil])
         assert_equal Arel.sql('$2'), bind
       end
+
+      private
+      def insert(ctx, data)
+        binds   = data.map { |name, value|
+          [ctx.columns('ex').find { |x| x.name == name }, value]
+        }
+        columns = binds.map(&:first).map(&:name)
+
+        bind_subs = columns.length.times.map { |x| "$#{x + 1}" }
+
+        sql = "INSERT INTO ex (#{columns.join(", ")})
+               VALUES (#{bind_subs.join(', ')})"
+
+        ctx.exec_insert(sql, 'SQL', binds)
+      end
     end
   end
 end
diff --git a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
index 600dc581f2..0e2f468908 100644
--- a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
+++ b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
@@ -126,6 +126,8 @@ module ActiveRecord
       end
 
       def test_quote_binary_column_escapes_it
+        return unless "<3".respond_to?(:encode)
+
         DualEncoding.connection.execute(<<-eosql)
           CREATE TABLE dual_encodings (
             id integer PRIMARY KEY AUTOINCREMENT,