Merge branch 'master' into adequaterecord

* master:
  fix exception translation
  translate exceptions on prepared statement failure
  test to ensure bad prepared statements raise a StatementInvalid exception

1 files changed, 6 insertions, 0 deletions

diff --git a/activerecord/test/cases/adapters/postgresql/schema_test.rb b/activerecord/test/cases/adapters/postgresql/schema_test.rb
index e8dd188ec8..1e59bca6a7 100644
--- a/activerecord/test/cases/adapters/postgresql/schema_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/schema_test.rb
@@ -115,6 +115,12 @@ class SchemaTest < ActiveRecord::TestCase
     end
   end
 
+  def test_raise_wraped_exception_on_bad_prepare
+    assert_raises(ActiveRecord::StatementInvalid) do
+      @connection.exec_query "select * from developers where id = ?", 'sql', [[nil, 1]]
+    end
+  end
+
   def test_schema_change_with_prepared_stmt
     altered = false
     @connection.exec_query "select * from developers where id = $1", 'sql', [[nil, 1]]