- Patch #331213 by chx and Damien Tournoud: welcome weird database drivers.

1 files changed, 3 insertions, 7 deletions

diff --git a/includes/database/pgsql/database.inc b/includes/database/pgsql/database.inc
index c66956e3e..6a65c2cfb 100644
--- a/includes/database/pgsql/database.inc
+++ b/includes/database/pgsql/database.inc
@@ -38,7 +38,7 @@ class DatabaseConnection_pgsql extends DatabaseConnection {
     $options += $this->defaultOptions();
 
     try {
-      if ($query instanceof DatabaseStatement) {
+      if ($query instanceof DatabaseStatementInterface) {
         $stmt = $query;
         $stmt->execute(NULL, $options);
       }
@@ -63,8 +63,8 @@ class DatabaseConnection_pgsql extends DatabaseConnection {
     catch (PDOException $e) {
       _db_check_install_needed();
       if ($options['throw_exception']) {
-        if ($query instanceof DatabaseStatement) {
-          $query_string = $stmt->queryString;
+        if ($query instanceof DatabaseStatementInterface) {
+          $query_string = $stmt->getQueryString();
         }
         else {
           $query_string = $query;
@@ -98,10 +98,6 @@ class DatabaseConnection_pgsql extends DatabaseConnection {
     return $this->transactionSupport;
   }
 
-  public function escapeTable($table) {
-    return preg_replace('/[^A-Za-z0-9_]+/', '', $table);
-  }
-
   public function mapConditionOperator($operator) {
     static $specials = array(
       // In PostgreSQL, 'LIKE' is case-sensitive.  For case-insensitive LIKE