diff --git a/database.inc b/database.inc
index 0627bca..fcc74ae 100644
--- a/database.inc
+++ b/database.inc
@@ -392,17 +392,15 @@ class DatabaseConnection_oracle extends DatabaseConnection
             if (!$oquery)
             {	       
         	      $oquery= $query;
-                  
-                  if ($this->external)
-                      $oquery= $this->prefixTables($oquery,true);
-                  else
+								$oquery= $this->prefixTables($oquery,true);
+								$oquery= $this->escapeCompatibility($oquery);
+
+                  if (!$this->external)
                   {
                       $oquery= $this->escapeEmptyLiterals($oquery);
                       $oquery= $this->escapeAnsi($oquery);
                       $oquery= $this->lih->escapeLongIdentifiers($oquery);
                       $oquery= $this->escapeReserved($oquery);
-                      $oquery= $this->escapeCompatibility($oquery);
-                      $oquery= $this->prefixTables($oquery,true);
                       $oquery= $this->escapeIfFunction($oquery);
                   }