Browse Source

Added fox for #1815

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5042 3807eeeb-6ff5-0310-8944-8be069107fe0
phpnut 19 years ago
parent
commit
94cbbe560f

+ 3 - 1
cake/libs/model/datasources/dbo/dbo_db2.php

@@ -130,7 +130,9 @@ class DboDb2 extends DboSource {
  * @return boolean True if the database could be disconnected, else false
  */
 	function disconnect() {
-		return db2_close($this->connection);
+		@db2_free_result($this->results);
+		$this->connected = !@db2_close($this->connection);
+		return !$this->connected;
 	}
 /**
  * Executes given SQL statement.  We should use prepare / execute to allow the

+ 4 - 3
cake/libs/model/datasources/dbo/dbo_postgres.php

@@ -100,6 +100,7 @@ class DboPostgres extends DboSource {
  * @return boolean True if the database could be disconnected, else false
  */
 	function disconnect() {
+		@pg_free_result($this->results);
 		$this->connected = !@pg_close($this->connection);
 		return !$this->connected;
 	}
@@ -539,7 +540,7 @@ class DboPostgres extends DboSource {
  */
 	function boolean($data, $quote = true) {
 		$result = null;
-		
+
 		if ($data === true || $data === false) {
 			$result = $data;
 		} elseif (is_string($data) && !is_numeric($data)) {
@@ -551,11 +552,11 @@ class DboPostgres extends DboSource {
 		} else {
 			$result = (bool)$data;
 		}
-		
+
 		if ($quote) {
 			$result = "'" . $result . "'";
 		}
-		
+
 		return $result;
 	}
 /**

+ 3 - 2
cake/libs/model/datasources/dbo/dbo_sqlite.php

@@ -101,8 +101,9 @@ class DboSqlite extends DboSource {
  * @return boolean True if the database could be disconnected, else false
  */
 	function disconnect() {
-		$this->connected = !@sqlite_close($this->connection);
-		return !$this->connected;
+		@sqlite_close($this->connection);
+		$this->connected = false;
+		return $this->connected;
 	}
 /**
  * Executes given SQL statement.