Fixing failing tests and issues with Sqlite.

cakephp · Sep 3, 2011 · 2c21fc9 · 2c21fc9
1 parent d24c408
commit 2c21fc9
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/lib/Cake/Model/Datasource/Database/Sqlite.php b/lib/Cake/Model/Datasource/Database/Sqlite.php
@@ -290,6 +290,10 @@ public function resultSet($results) {
 			$selects = array('seqno', 'cid', 'name');
 		}
 		while ($j < $num_fields) {
+			if (!isset($selects[$j])) {
+				$j++;
+				continue;
+			}
 			if (preg_match('/\bAS\s+(.*)/i', $selects[$j], $matches)) {
 				 $columnName = trim($matches[1],'"');
 			} else {

diff --git a/lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php b/lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
@@ -615,6 +615,7 @@ public function testCacheMethod() {
 /**
  * testLog method
  *
+ * @outputBuffering enabled
  * @return void
  */
 	public function testLog() {

diff --git a/lib/Cake/Test/Case/Model/ModelReadTest.php b/lib/Cake/Test/Case/Model/ModelReadTest.php
@@ -345,17 +345,15 @@ public function testParameterMismatch() {
 		$query .= ' WHERE ' . $this->db->fullTableName('articles');
 		$query .= '.published = ? AND ' . $this->db->fullTableName('articles') . '.user_id = ?';
 		$params = array('Y');
-		$this->expectError();
 
-		ob_start();
 		$result = $Article->query($query, $params);
-		ob_end_clean();
-		$this->assertEqual($result, null);
+		$this->assertEmpty($result);
 	}
 
 /**
  * testVeryStrangeUseCase method
  *
+ * @expectedException PDOException
  * @return void
  */
 	public function testVeryStrangeUseCase() {
@@ -368,11 +366,8 @@ public function testVeryStrangeUseCase() {
 			$this->db->fullTableName('articles') . '.user_id', '3',
 			$this->db->fullTableName('articles') . '.published', 'Y'
 		);
-		$this->expectError();
 
-		ob_start();
 		$result = $Article->query($query, $param);
-		ob_end_clean();
 	}
 
 /**

diff --git a/lib/Cake/Test/Case/TestSuite/CakeTestFixtureTest.php b/lib/Cake/Test/Case/TestSuite/CakeTestFixtureTest.php
@@ -181,7 +181,10 @@ class CakeTestFixtureTest extends CakeTestCase {
  * @return void
  */
 	public function setUp() {
-		$this->criticDb = $this->getMock('DboSource');
+		$methods = array_diff(get_class_methods('DboSource'), array('enabled'));
+		$methods[] = 'connect';
+
+		$this->criticDb = $this->getMock('DboSource', $methods);
 		$this->criticDb->fullDebug = true;
 		$this->db = ConnectionManager::getDataSource('test');
 		$this->_backupConfig = $this->db->config;