1 files changed, 15 insertions, 7 deletions
diff --git a/activerecord/test/cases/adapters/postgresql/connection_test.rb b/activerecord/test/cases/adapters/postgresql/connection_test.rb
index d26cda46fa..55ad76c8c0 100644
--- a/activerecord/test/cases/adapters/postgresql/connection_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/connection_test.rb
@@ -8,6 +8,8 @@ module ActiveRecord
     class NonExistentTable < ActiveRecord::Base
     end
 
+    fixtures :comments
+
     def setup
       super
       @subscriber = SQLSubscriber.new
@@ -20,6 +22,14 @@ module ActiveRecord
       super
     end
 
+    def test_truncate
+      count = ActiveRecord::Base.connection.execute("select count(*) from comments").first['count'].to_i
+      assert_operator count, :>, 0
+      ActiveRecord::Base.connection.truncate("comments")
+      count = ActiveRecord::Base.connection.execute("select count(*) from comments").first['count'].to_i
+      assert_equal 0, count
+    end
+
     def test_encoding
       assert_not_nil @connection.encoding
     end
@@ -116,12 +126,12 @@ module ActiveRecord
     end
 
     def test_statement_key_is_logged
-      bindval = 1
-      @connection.exec_query('SELECT $1::integer', 'SQL', [[nil, bindval]])
+      bind = Relation::QueryAttribute.new(nil, 1, Type::Value.new)
+      @connection.exec_query('SELECT $1::integer', 'SQL', [bind])
       name = @subscriber.payloads.last[:statement_name]
       assert name
-      res = @connection.exec_query("EXPLAIN (FORMAT JSON) EXECUTE #{name}(#{bindval})")
-      plan = res.column_types['QUERY PLAN'].type_cast_from_database res.rows.first.first
+      res = @connection.exec_query("EXPLAIN (FORMAT JSON) EXECUTE #{name}(1)")
+      plan = res.column_types['QUERY PLAN'].deserialize res.rows.first.first
       assert_operator plan.length, :>, 0
     end
 
@@ -167,9 +177,7 @@ module ActiveRecord
         "successfully querying with the same connection pid."
 
       # Repair all fixture connections so other tests won't break.
-      @fixture_connections.each do |c|
-        c.verify!
-      end
+      @fixture_connections.each(&:verify!)
     end
 
     def test_set_session_variable_true