Helping PDO figure out what statements are not used anymore, this

prevents SQlite tests from failing

Cake/Database/Query.php

@@ -1639,12 +1639,21 @@ protected function _transformQuery() {
 		if (!empty($this->_transformedQuery) && !$this->_dirty) {
 			return $this->_transformedQuery;
 		}
+
 		if ($this->_transformedQuery === false) {
 			return $this;
 		}
+
 		$translator = $this->connection()->driver()->queryTranslator($this->_type);
-		$transformed = $this->_transformedQuery = $translator($this);
-		$transformed->_transformedQuery = $transformed->_dirty = false;
+		$transformed = $translator($this);
+		$transformed->_dirty = false;
+		$transformed->_transformedQuery = false;
+
+		if ($transformed !== $this) {
+			$this->_transformedQuery = $transformed;
+
+		}
+
 		return $transformed;
 	}
 

Cake/Database/Schema/Collection.php

@@ -64,6 +64,7 @@ public function listTables() {
 		while ($row = $statement->fetch()) {
 			$result[] = $row[0];
 		}
+		$statement->closeCursor();
 		return $result;
 	}
 
@@ -82,23 +83,27 @@ public function describe($name) {
 		if (count($statement) === 0) {
 			throw new Exception(__d('cake_dev', 'Cannot describe %s. It has 0 columns.', $name));
 		}
+		$statement->closeCursor();
 
 		$table = new Table($name);
 		foreach ($statement->fetchAll('assoc') as $row) {
 			$this->_dialect->convertFieldDescription($table, $row);
 		}
+		$statement->closeCursor();
 
 		list($sql, $params) = $this->_dialect->describeIndexSql($name, $config);
 		$statement = $this->_executeSql($sql, $params);
 		foreach ($statement->fetchAll('assoc') as $row) {
 			$this->_dialect->convertIndexDescription($table, $row);
 		}
+		$statement->closeCursor();
 
 		list($sql, $params) = $this->_dialect->describeForeignKeySql($name, $config);
 		$statement = $this->_executeSql($sql, $params);
 		foreach ($statement->fetchAll('assoc') as $row) {
 			$this->_dialect->convertForeignKeyDescription($table, $row);
 		}
+		$statement->closeCursor();
 		return $table;
 	}
 

Cake/Database/Schema/SqliteSchema.php

@@ -150,6 +150,7 @@ public function convertIndexDescription(Table $table, $row) {
 		foreach ($statement->fetchAll('assoc') as $column) {
 			$columns[] = $column['name'];
 		}
+		$statement->closeCursor();
 		if ($row['unique']) {
 			$table->addConstraint($row['name'], [
 				'type' => Table::CONSTRAINT_UNIQUE,

Cake/Database/Statement/BufferedStatement.php

@@ -55,6 +55,7 @@ public function fetch($type = 'num') {
 		if ($record === false) {
 			$this->_allFetched = true;
 			$this->_counter = $this->_count + 1;
+			$this->_statement->closeCursor();
 			return false;
 		}
 
@@ -70,6 +71,7 @@ public function fetchAll($type = 'num') {
 		$this->_records = parent::fetchAll($type);
 		$this->_count = count($this->_records);
 		$this->_allFetched = true;
+		$this->_statement->closeCursor();
 		return $this->_records;
 	}
 

Cake/Database/Statement/SqliteStatement.php

@@ -31,7 +31,9 @@ public function rowCount() {
 		if (preg_match('/^(?:DELETE|UPDATE|INSERT)/i', $this->_statement->queryString)) {
 			$changes = $this->_driver->prepare('SELECT CHANGES()');
 			$changes->execute();
-			return $changes->fetch()[0];
+			$count = $changes->fetch()[0];
+			$changes->closeCursor();
+			return $count;
 		}
 		return parent::rowCount();
 	}

Cake/ORM/Query.php

@@ -613,11 +613,8 @@ public function first() {
 		}
 		$this->bufferResults();
 		$this->_results = $this->execute();
-		// Calls foreach so we cursor is rewound automatically
-		foreach ($this->_results as $row) {
-			// Just get the first result from the iterator
-			return $row;
-		}
+		return $this->_results->one();
+
 	}
 
 	public function hydrate($enable = null) {

Cake/ORM/ResultSet.php

@@ -181,7 +181,29 @@ public function rewind() {
  */
 	public function valid() {
 		$this->_current = $this->_fetchResult();
-		return $this->_current !== false;
+		$valid = $this->_current !== false;
+
+		if (!$valid && $this->_statement) {
+			$this->_statement->closeCursor();
+		}
+
+		return $valid;
+	}
+
+/**
+ * Returns the first result in this set and blocks the set so that no other
+ * results can be fetched
+ *
+ * @return array|object
+ */
+	public function one() {
+		if ($this->valid()) {
+			if ($this->_statement) {
+				$this->_statement->closeCursor();
+			}
+			return $this->_current;
+		}
+		return null;
 	}
 
 /**

Cake/ORM/Table.php

@@ -697,7 +697,9 @@ public function updateAll($fields, $conditions) {
 			->set($fields)
 			->where($conditions);
 		$statement = $query->executeStatement();
-		return $statement->rowCount() > 0;
+		$success = $statement->rowCount() > 0;
+		$statement->closeCursor();
+		return $success;
 	}
 
 /**
@@ -720,7 +722,9 @@ public function deleteAll($conditions) {
 		$query->delete($this->table())
 			->where($conditions);
 		$statement = $query->executeStatement();
-		return $statement->rowCount() > 0;
+		$success = $statement->rowCount() > 0;
+		$statement->closeCursor();
+		return $success;
 	}
 
 /**
@@ -785,7 +789,7 @@ public function save(Entity $entity, array $options = []) {
 				return $this->_processSave($entity, $options);
 			});
 		} else {
-			$success = $this->_processSave($entity, $data, $options);
+			$success = $this->_processSave($entity, $options);
 		}
 
 		return $success;
@@ -855,6 +859,7 @@ protected function _insert($entity, $data) {
 			$entity->clean();
 			$success = $entity;
 		}
+		$statement->closeCursor();
 		return $success;
 	}
 
@@ -890,6 +895,7 @@ protected function _update($entity, $data) {
 			$entity->clean();
 			$success = $entity;
 		}
+		$statement->closeCursor();
 		return $success;
 	}
 

Cake/Test/TestCase/ORM/QueryTest.php

@@ -829,6 +829,7 @@ public function testBufferResults() {
 		$this->assertSame($query, $result, 'Query should be the same');
 		$result = $query->execute();
 		$this->assertInstanceOf('Cake\ORM\BufferedResultSet', $result);
+		$result->toArray();
 	}
 
 /**
@@ -992,7 +993,7 @@ public function testResultsAreWrappedInMapReduce() {
 		$params = [$this->connection, $this->table];
 		$query = $this->getMock('\Cake\ORM\Query', ['executeStatement'], $params);
 
-		$statement = $this->getMock('\Database\StatementInterface', ['fetch']);
+		$statement = $this->getMock('\Database\StatementInterface', ['fetch', 'closeCursor']);
 		$statement->expects($this->exactly(3))
 			->method('fetch')
 			->will($this->onConsecutiveCalls(['a' => 1], ['a' => 2], false));

Cake/Test/TestCase/ORM/TableTest.php

@@ -1017,6 +1017,7 @@ public function testCallBehaviorFinder() {
 /**
  * Tests that it is possible to insert a new row using the save method
  *
+ * @group save
  * @return void
  */
 	public function testSaveNewEntity() {
@@ -1038,6 +1039,7 @@ public function testSaveNewEntity() {
  * Tests that saving an entity will filter out properties that
  * are not present in the table schema when saving
  *
+ * @group save
  * @return void
  */
 	public function testSaveEntityOnlySchemaFields() {
@@ -1061,6 +1063,7 @@ public function testSaveEntityOnlySchemaFields() {
  * Tests saving only a few fields in an entity when an fieldList
  * is passed to save
  *
+ * @group save
  * @return void
  */
 	public function testSaveWithFieldList() {
@@ -1083,6 +1086,7 @@ public function testSaveWithFieldList() {
 /**
  * Tests that it is possible to modify data from the beforeSave callback
  *
+ * @group save
  * @return void
  */
 	public function testBeforeSaveModifyData() {
@@ -1106,6 +1110,7 @@ public function testBeforeSaveModifyData() {
 /**
  * Tests that it is possible to modify the options array in beforeSave
  *
+ * @group save
  * @return void
  */
 	public function testBeforeSaveModifyOptions() {
@@ -1137,6 +1142,7 @@ public function testBeforeSaveModifyOptions() {
  * Tests that it is possible to stop the saving altogether, without implying
  * the save operation failed
  *
+ * @group save
  * @return void
  */
 	public function testBeforeSaveStopEvent() {
@@ -1160,6 +1166,7 @@ public function testBeforeSaveStopEvent() {
 /**
  * Asserts that afterSave callback is called on successful save
  *
+ * @group save
  * @return void
  */
 	public function testAfterSave() {
@@ -1184,10 +1191,10 @@ public function testAfterSave() {
 /**
  * Asserts that afterSave callback not is called on unsuccessful save
  *
+ * @group save
  * @return void
  */
 	public function testAfterSaveNotCalled() {
-		$this->markTestIncomplete('This test causes errors with Sqlite');
 		$table = $this->getMock(
 			'\Cake\ORM\Table',
 			['_buildQuery', 'exists'],
@@ -1213,7 +1220,8 @@ public function testAfterSaveNotCalled() {
 		$query->expects($this->once())->method('executeStatement')
 			->will($this->returnValue($statement));
 
-		$statement->expects($this->once())->method('rowCount')->will($this->returnValue(0));
+		$statement->expects($this->once())->method('rowCount')
+			->will($this->returnValue(0));
 
 		$called = false;
 		$listener = function($e, $entity, $options) use ($data, &$called) {
@@ -1227,6 +1235,7 @@ public function testAfterSaveNotCalled() {
 /**
  * Tests that save is wrapped around a transaction
  *
+ * @group save
  * @return void
  */
 	public function testAtomicSave() {
@@ -1256,6 +1265,7 @@ public function testAtomicSave() {
 /**
  * Tests that save will rollback the transaction in the case of an exception
  *
+ * @group save
  * @expectedException \PDOException
  * @return void
  */
@@ -1302,6 +1312,7 @@ public function testAtomicSaveRollback() {
 /**
  * Tests that save will rollback the transaction in the case of an exception
  *
+ * @group save
  * @return void
  */
 	public function testAtomicSaveRollbackOnFailure() {
@@ -1351,6 +1362,7 @@ public function testAtomicSaveRollbackOnFailure() {
  * Tests that only the properties marked as dirty are actually saved
  * to the database
  *
+ * @group save
  * @return void
  */
 	public function testSaveOnlyDirtyProperties() {
@@ -1377,6 +1389,7 @@ public function testSaveOnlyDirtyProperties() {
 /**
  * Tests that a recently saved entity is marked as clean
  *
+ * @group save
  * @return void
  */
 	public function testsASavedEntityIsClean() {
@@ -1397,6 +1410,7 @@ public function testsASavedEntityIsClean() {
 /**
  * Tests that a recently saved entity is marked as not new
  *
+ * @group save
  * @return void
  */
 	public function testsASavedEntityIsNotNew() {
@@ -1415,6 +1429,7 @@ public function testsASavedEntityIsNotNew() {
  * Tests that save can detect automatically if it needs to insert
  * or update a row
  *
+ * @group save
  * @return void
  */
 	public function testSaveUpdateAuto() {
@@ -1440,6 +1455,7 @@ public function testSaveUpdateAuto() {
  * Tests that marking an entity as already persisted will prevent the save
  * method from trying to infer the entity's actual status.
  *
+ * @group save
  * @return void
  */
 	public function testSaveUpdateWithHint() {
@@ -1461,6 +1477,7 @@ public function testSaveUpdateWithHint() {
  * Tests that when updating the primary key is not passed to the list of
  * attributes to change
  *
+ * @group save
  * @return void
  */
 	public function testSaveUpdatePrimaryKeyNotModified() {
@@ -1501,6 +1518,7 @@ public function testSaveUpdatePrimaryKeyNotModified() {
  * Tests that passing only the primary key to save will not execute any queries
  * but still return success
  *
+ * @group save
  * @return void
  */
 	public function testUpdateNoChange() {
@@ -1519,11 +1537,11 @@ public function testUpdateNoChange() {
 /**
  * Tests that failing to pass a primary key to save will result in exception
  *
+ * @group save
  * @expectedException \InvalidArgumentException
  * @return void
  */
 	public function testUpdateNoPrimaryButOtherKeys() {
-		$this->markTestIncomplete('This test causes errors with Sqlite');
 		$table = $this->getMock(
 			'\Cake\ORM\Table',
 			['_buildQuery'],