Commit eb1a96b0 authored by zYne's avatar zYne

Changed the PDO::query calls to Doctrine_Connection::execute calls for portable errors

parent d9d4e877
...@@ -43,7 +43,7 @@ class Doctrine_Transaction_Firebird extends Doctrine_Transaction ...@@ -43,7 +43,7 @@ class Doctrine_Transaction_Firebird extends Doctrine_Transaction
{ {
$query = 'SAVEPOINT '.$savepoint; $query = 'SAVEPOINT '.$savepoint;
return $this->conn->getDbh()->query($query); return $this->conn->execute($query);
} }
/** /**
* releaseSavePoint * releaseSavePoint
...@@ -56,7 +56,7 @@ class Doctrine_Transaction_Firebird extends Doctrine_Transaction ...@@ -56,7 +56,7 @@ class Doctrine_Transaction_Firebird extends Doctrine_Transaction
{ {
$query = 'RELEASE SAVEPOINT '.$savepoint; $query = 'RELEASE SAVEPOINT '.$savepoint;
return $this->conn->getDbh()->query($query); return $this->conn->execute($query);
} }
/** /**
* rollbackSavePoint * rollbackSavePoint
...@@ -69,7 +69,7 @@ class Doctrine_Transaction_Firebird extends Doctrine_Transaction ...@@ -69,7 +69,7 @@ class Doctrine_Transaction_Firebird extends Doctrine_Transaction
{ {
$query = 'ROLLBACK TO SAVEPOINT '.$savepoint; $query = 'ROLLBACK TO SAVEPOINT '.$savepoint;
return $this->conn->getDbh()->query($query); return $this->conn->execute($query);
} }
/** /**
* Set the transacton isolation level. * Set the transacton isolation level.
...@@ -132,6 +132,6 @@ class Doctrine_Transaction_Firebird extends Doctrine_Transaction ...@@ -132,6 +132,6 @@ class Doctrine_Transaction_Firebird extends Doctrine_Transaction
$query = 'SET TRANSACTION' . $rw . $wait .' ISOLATION LEVEL ' . $nativeIsolation; $query = 'SET TRANSACTION' . $rw . $wait .' ISOLATION LEVEL ' . $nativeIsolation;
$this->conn->getDbh()->query($query); $this->conn->execute($query);
} }
} }
...@@ -63,6 +63,6 @@ class Doctrine_Transaction_Mssql extends Doctrine_Transaction ...@@ -63,6 +63,6 @@ class Doctrine_Transaction_Mssql extends Doctrine_Transaction
$query = 'SET TRANSACTION ISOLATION LEVEL ' . $isolation; $query = 'SET TRANSACTION ISOLATION LEVEL ' . $isolation;
$this->conn->getDbh()->query($query); $this->conn->execute($query);
} }
} }
...@@ -43,7 +43,7 @@ class Doctrine_Transaction_Mysql extends Doctrine_Transaction ...@@ -43,7 +43,7 @@ class Doctrine_Transaction_Mysql extends Doctrine_Transaction
{ {
$query = 'SAVEPOINT '.$savepoint; $query = 'SAVEPOINT '.$savepoint;
return $this->conn->getDbh()->query($query); return $this->conn->execute($query);
} }
/** /**
* releaseSavePoint * releaseSavePoint
...@@ -56,7 +56,7 @@ class Doctrine_Transaction_Mysql extends Doctrine_Transaction ...@@ -56,7 +56,7 @@ class Doctrine_Transaction_Mysql extends Doctrine_Transaction
{ {
$query = 'RELEASE SAVEPOINT '.$savepoint; $query = 'RELEASE SAVEPOINT '.$savepoint;
return $this->conn->getDbh()->query($query); return $this->conn->execute($query);
} }
/** /**
* rollbackSavePoint * rollbackSavePoint
...@@ -69,7 +69,7 @@ class Doctrine_Transaction_Mysql extends Doctrine_Transaction ...@@ -69,7 +69,7 @@ class Doctrine_Transaction_Mysql extends Doctrine_Transaction
{ {
$query = 'ROLLBACK TO SAVEPOINT '.$savepoint; $query = 'ROLLBACK TO SAVEPOINT '.$savepoint;
return $this->conn->getDbh()->query($query); return $this->conn->execute($query);
} }
/** /**
* Set the transacton isolation level. * Set the transacton isolation level.
...@@ -98,7 +98,7 @@ class Doctrine_Transaction_Mysql extends Doctrine_Transaction ...@@ -98,7 +98,7 @@ class Doctrine_Transaction_Mysql extends Doctrine_Transaction
$query = 'SET SESSION TRANSACTION ISOLATION LEVEL ' . $isolation; $query = 'SET SESSION TRANSACTION ISOLATION LEVEL ' . $isolation;
return $this->conn->getDbh()->query($query); return $this->conn->execute($query);
} }
/** /**
* getTransactionIsolation * getTransactionIsolation
...@@ -107,7 +107,7 @@ class Doctrine_Transaction_Mysql extends Doctrine_Transaction ...@@ -107,7 +107,7 @@ class Doctrine_Transaction_Mysql extends Doctrine_Transaction
*/ */
public function getIsolation() public function getIsolation()
{ {
$ret = $this->conn->getDbh()->query('SELECT @@tx_isolation')->fetch(PDO::FETCH_NUM); $ret = $this->conn->execute('SELECT @@tx_isolation')->fetch(PDO::FETCH_NUM);
return current($ret); return current($ret);
} }
} }
...@@ -43,7 +43,7 @@ class Doctrine_Transaction_Oracle extends Doctrine_Transaction ...@@ -43,7 +43,7 @@ class Doctrine_Transaction_Oracle extends Doctrine_Transaction
{ {
$query = 'SAVEPOINT '.$savepoint; $query = 'SAVEPOINT '.$savepoint;
return $this->conn->getDbh()->query($query); return $this->conn->execute($query);
} }
/** /**
* releaseSavePoint * releaseSavePoint
...@@ -68,7 +68,7 @@ class Doctrine_Transaction_Oracle extends Doctrine_Transaction ...@@ -68,7 +68,7 @@ class Doctrine_Transaction_Oracle extends Doctrine_Transaction
{ {
$query = 'ROLLBACK TO SAVEPOINT '.$savepoint; $query = 'ROLLBACK TO SAVEPOINT '.$savepoint;
return $this->conn->getDbh()->query($query); return $this->conn->execute($query);
} }
/** /**
* Set the transacton isolation level. * Set the transacton isolation level.
...@@ -98,6 +98,6 @@ class Doctrine_Transaction_Oracle extends Doctrine_Transaction ...@@ -98,6 +98,6 @@ class Doctrine_Transaction_Oracle extends Doctrine_Transaction
} }
$query = 'ALTER SESSION ISOLATION LEVEL ' . $isolation; $query = 'ALTER SESSION ISOLATION LEVEL ' . $isolation;
return $this->conn->getDbh()->query($query); return $this->conn->execute($query);
} }
} }
...@@ -44,7 +44,7 @@ class Doctrine_Transaction_Pgsql extends Doctrine_Transaction ...@@ -44,7 +44,7 @@ class Doctrine_Transaction_Pgsql extends Doctrine_Transaction
{ {
$query = 'SAVEPOINT '.$savepoint; $query = 'SAVEPOINT '.$savepoint;
return $this->conn->getDbh()->query($query); return $this->conn->execute($query);
} }
/** /**
* releaseSavePoint * releaseSavePoint
...@@ -57,7 +57,7 @@ class Doctrine_Transaction_Pgsql extends Doctrine_Transaction ...@@ -57,7 +57,7 @@ class Doctrine_Transaction_Pgsql extends Doctrine_Transaction
{ {
$query = 'RELEASE SAVEPOINT '.$savepoint; $query = 'RELEASE SAVEPOINT '.$savepoint;
return $this->conn->getDbh()->query($query); return $this->conn->execute($query);
} }
/** /**
* rollbackSavePoint * rollbackSavePoint
...@@ -70,7 +70,7 @@ class Doctrine_Transaction_Pgsql extends Doctrine_Transaction ...@@ -70,7 +70,7 @@ class Doctrine_Transaction_Pgsql extends Doctrine_Transaction
{ {
$query = 'ROLLBACK TO SAVEPOINT '.$savepoint; $query = 'ROLLBACK TO SAVEPOINT '.$savepoint;
return $this->conn->getDbh()->query($query); return $this->conn->execute($query);
} }
/** /**
* Set the transacton isolation level. * Set the transacton isolation level.
...@@ -97,6 +97,6 @@ class Doctrine_Transaction_Pgsql extends Doctrine_Transaction ...@@ -97,6 +97,6 @@ class Doctrine_Transaction_Pgsql extends Doctrine_Transaction
} }
$query = 'SET SESSION CHARACTERISTICS AS TRANSACTION ISOLATION LEVEL ' . $isolation; $query = 'SET SESSION CHARACTERISTICS AS TRANSACTION ISOLATION LEVEL ' . $isolation;
return $this->conn->getDbh()->query($query); return $this->conn->execute($query);
} }
} }
...@@ -61,6 +61,6 @@ class Doctrine_Transaction_Sqlite extends Doctrine_Transaction ...@@ -61,6 +61,6 @@ class Doctrine_Transaction_Sqlite extends Doctrine_Transaction
$query = 'PRAGMA read_uncommitted = '.$isolation; $query = 'PRAGMA read_uncommitted = '.$isolation;
return $this->conn->getDbh()->query($query); return $this->conn->execute($query);
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment