Merge pull request #12506 from bancer/dbosource-missing-methods

Add missing method definitions

lib/Cake/Model/Datasource/Database/Postgres.php

@@ -765,10 +765,10 @@ class Postgres extends DboSource {
 /**
  * resultSet method
  *
- * @param array &$results The results
+ * @param PDOStatement $results The results
  * @return void
  */
-	public function resultSet(&$results) {
+	public function resultSet($results) {
 		$this->map = array();
 		$numFields = $results->columnCount();
 		$index = 0;

lib/Cake/Model/Datasource/Database/Sqlite.php

@@ -299,7 +299,7 @@ class Sqlite extends DboSource {
 /**
  * Generate ResultSet
  *
- * @param mixed $results The results to modify.
+ * @param PDOStatement $results The results to modify.
  * @return void
  */
 	public function resultSet($results) {

lib/Cake/Model/Datasource/DboSource.php

@@ -272,6 +272,16 @@ class DboSource extends DataSource {
 		}
 	}
 
+/**
+ * Connects to the database.
+ *
+ * @return bool
+ */
+	public function connect() {
+		// This method is implemented in subclasses
+		return $this->connected;
+	}
+
 /**
  * Reconnects to database server with optional new settings
  *
@@ -619,6 +629,16 @@ class DboSource extends DataSource {
 		}
 	}
 
+/**
+ * Builds a map of the columns contained in a result
+ *
+ * @param PDOStatement $results The results to format.
+ * @return void
+ */
+	public function resultSet($results) {
+		// This method is implemented in subclasses
+	}
+
 /**
  * Returns a row from current resultset as an array
  *

lib/Cake/Test/Case/TestSuite/CakeTestFixtureTest.php

@@ -231,7 +231,6 @@ class CakeTestFixtureTest extends CakeTestCase {
 	public function setUp() {
 		parent::setUp();
 		$methods = array_diff(get_class_methods('DboSource'), array('enabled'));
-		$methods[] = 'connect';
 
 		$this->criticDb = $this->getMock('DboSource', $methods);
 		$this->criticDb->fullDebug = true;