1 files changed, 65 insertions, 4 deletions
diff --git a/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb b/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
index b0a4a4e39d..7c49236854 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,52 @@ 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_serial_sequence
+        assert_equal 'public.accounts_id_seq',
+          @connection.serial_sequence('accounts', 'id')
+
+        assert_raises(ActiveRecord::StatementInvalid) do
+          @connection.serial_sequence('zomg', 'id')
+        end
+      end
+
+      def test_default_sequence_name
+        assert_equal 'accounts_id_seq',
+          @connection.default_sequence_name('accounts', 'id')
+
+        assert_equal 'accounts_id_seq',
+          @connection.default_sequence_name('accounts')
+      end
+
+      def test_default_sequence_name_bad_table
+        assert_equal 'zomg_id_seq',
+          @connection.default_sequence_name('zomg', 'id')
+
+        assert_equal 'zomg_id_seq',
+          @connection.default_sequence_name('zomg')
+      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
@@ -56,13 +102,28 @@ module ActiveRecord
         assert_equal [['1', 'foo']], result.rows
       end
 
-      def test_substitute_for
-        bind = @connection.substitute_for(nil, [])
+      def test_substitute_at
+        bind = @connection.substitute_at(nil, 0)
         assert_equal Arel.sql('$1'), bind
 
-        bind = @connection.substitute_for(nil, [nil])
+        bind = @connection.substitute_at(nil, 1)
         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