X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/ajouter.php?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Flibs%2Frdbms%2Fdatabase%2FDatabaseSQLTest.php;h=cf10801c495f6fbd749bc3544b3a182238ce25fe;hb=12db6432b8aaa0c192f5275b94f4c404a9d9ec66;hp=5a06cc769fb61a72c95e71f52934ee099ffbe457;hpb=5211d2ab6839b47df5ac5278844c6d068e4640d9;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php b/tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php
index 5a06cc769f..cf10801c49 100644
--- a/tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php
+++ b/tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php
@@ -4,7 +4,9 @@ use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\LikeMatch;
 use Wikimedia\Rdbms\Database;
 use Wikimedia\TestingAccessWrapper;
+use Wikimedia\Rdbms\DBTransactionStateError;
 use Wikimedia\Rdbms\DBUnexpectedError;
+use Wikimedia\Rdbms\DBTransactionError;
 
 /**
  * Test the parts of the Database abstract class that deal
@@ -13,6 +15,7 @@ use Wikimedia\Rdbms\DBUnexpectedError;
 class DatabaseSQLTest extends PHPUnit\Framework\TestCase {
 
 	use MediaWikiCoversValidator;
+	use PHPUnit4And6Compat;
 
 	/** @var DatabaseTestHelper|Database */
 	private $database;
@@ -1400,22 +1403,167 @@ class DatabaseSQLTest extends PHPUnit\Framework\TestCase {
 		// phpcs:ignore Generic.Files.LineLength
 		$this->assertLastSql( 'BEGIN; SAVEPOINT wikimedia_rdbms_atomic1; ROLLBACK TO SAVEPOINT wikimedia_rdbms_atomic1; COMMIT' );
 
-		$this->database->doAtomicSection( __METHOD__, function () {
-		} );
+		$noOpCallack = function () {
+		};
+
+		$this->database->doAtomicSection( __METHOD__, $noOpCallack, IDatabase::ATOMIC_CANCELABLE );
+		$this->assertLastSql( 'BEGIN; COMMIT' );
+
+		$this->database->doAtomicSection( __METHOD__, $noOpCallack );
 		$this->assertLastSql( 'BEGIN; COMMIT' );
 
 		$this->database->begin( __METHOD__ );
-		$this->database->doAtomicSection( __METHOD__, function () {
-		} );
+		$this->database->doAtomicSection( __METHOD__, $noOpCallack, IDatabase::ATOMIC_CANCELABLE );
 		$this->database->rollback( __METHOD__ );
 		// phpcs:ignore Generic.Files.LineLength
 		$this->assertLastSql( 'BEGIN; SAVEPOINT wikimedia_rdbms_atomic1; RELEASE SAVEPOINT wikimedia_rdbms_atomic1; ROLLBACK' );
 
+		$fname = __METHOD__;
+		$triggerMap = [
+			'-' => '-',
+			IDatabase::TRIGGER_COMMIT => 'tCommit',
+			IDatabase::TRIGGER_ROLLBACK => 'tRollback'
+		];
+		$callback1 = function ( $trigger = '-' ) use ( $fname, $triggerMap ) {
+			$this->database->query( "SELECT 1, {$triggerMap[$trigger]} AS t", $fname );
+		};
+		$callback2 = function ( $trigger = '-' ) use ( $fname, $triggerMap ) {
+			$this->database->query( "SELECT 2, {$triggerMap[$trigger]} AS t", $fname );
+		};
+		$callback3 = function ( $trigger = '-' ) use ( $fname, $triggerMap ) {
+			$this->database->query( "SELECT 3, {$triggerMap[$trigger]} AS t", $fname );
+		};
+
+		$this->database->startAtomic( __METHOD__, IDatabase::ATOMIC_CANCELABLE );
+		$this->database->onTransactionPreCommitOrIdle( $callback1, __METHOD__ );
+		$this->database->cancelAtomic( __METHOD__ );
+		$this->assertLastSql( 'BEGIN; ROLLBACK' );
+
+		$this->database->startAtomic( __METHOD__, IDatabase::ATOMIC_CANCELABLE );
+		$this->database->onTransactionIdle( $callback1, __METHOD__ );
+		$this->database->cancelAtomic( __METHOD__ );
+		$this->assertLastSql( 'BEGIN; ROLLBACK' );
+
+		$this->database->startAtomic( __METHOD__, IDatabase::ATOMIC_CANCELABLE );
+		$this->database->onTransactionResolution( $callback1, __METHOD__ );
+		$this->database->cancelAtomic( __METHOD__ );
+		$this->assertLastSql( 'BEGIN; ROLLBACK; SELECT 1, tRollback AS t' );
+
+		$this->database->startAtomic( __METHOD__ . '_outer' );
+		$this->database->onTransactionPreCommitOrIdle( $callback1, __METHOD__ );
+		$this->database->startAtomic( __METHOD__, IDatabase::ATOMIC_CANCELABLE );
+		$this->database->onTransactionPreCommitOrIdle( $callback2, __METHOD__ );
+		$this->database->cancelAtomic( __METHOD__ );
+		$this->database->onTransactionPreCommitOrIdle( $callback3, __METHOD__ );
+		$this->database->endAtomic( __METHOD__ . '_outer' );
+		$this->assertLastSql( implode( "; ", [
+			'BEGIN',
+			'SAVEPOINT wikimedia_rdbms_atomic1',
+			'ROLLBACK TO SAVEPOINT wikimedia_rdbms_atomic1',
+			'SELECT 1, - AS t',
+			'SELECT 3, - AS t',
+			'COMMIT'
+		] ) );
+
+		$this->database->startAtomic( __METHOD__ . '_outer' );
+		$this->database->onTransactionIdle( $callback1, __METHOD__ );
+		$this->database->startAtomic( __METHOD__, IDatabase::ATOMIC_CANCELABLE );
+		$this->database->onTransactionIdle( $callback2, __METHOD__ );
+		$this->database->cancelAtomic( __METHOD__ );
+		$this->database->onTransactionIdle( $callback3, __METHOD__ );
+		$this->database->endAtomic( __METHOD__ . '_outer' );
+		$this->assertLastSql( implode( "; ", [
+			'BEGIN',
+			'SAVEPOINT wikimedia_rdbms_atomic1',
+			'ROLLBACK TO SAVEPOINT wikimedia_rdbms_atomic1',
+			'COMMIT',
+			'SELECT 1, tCommit AS t',
+			'SELECT 3, tCommit AS t'
+		] ) );
+
+		$this->database->startAtomic( __METHOD__ . '_outer' );
+		$this->database->onTransactionResolution( $callback1, __METHOD__ );
+		$this->database->startAtomic( __METHOD__, IDatabase::ATOMIC_CANCELABLE );
+		$this->database->onTransactionResolution( $callback2, __METHOD__ );
+		$this->database->cancelAtomic( __METHOD__ );
+		$this->database->onTransactionResolution( $callback3, __METHOD__ );
+		$this->database->endAtomic( __METHOD__ . '_outer' );
+		$this->assertLastSql( implode( "; ", [
+			'BEGIN',
+			'SAVEPOINT wikimedia_rdbms_atomic1',
+			'ROLLBACK TO SAVEPOINT wikimedia_rdbms_atomic1',
+			'COMMIT',
+			'SELECT 1, tCommit AS t',
+			'SELECT 2, tRollback AS t',
+			'SELECT 3, tCommit AS t'
+		] ) );
+
+		$makeCallback = function ( $id ) use ( $fname, $triggerMap ) {
+			return function ( $trigger = '-' ) use ( $id, $fname, $triggerMap ) {
+				$this->database->query( "SELECT $id, {$triggerMap[$trigger]} AS t", $fname );
+			};
+		};
+
+		$this->database->startAtomic( __METHOD__ . '_outer' );
+		$this->database->startAtomic( __METHOD__, IDatabase::ATOMIC_CANCELABLE );
+		$this->database->onTransactionResolution( $makeCallback( 1 ), __METHOD__ );
+		$this->database->cancelAtomic( __METHOD__ );
+		$this->database->endAtomic( __METHOD__ . '_outer' );
+		$this->assertLastSql( implode( "; ", [
+			'BEGIN',
+			'SAVEPOINT wikimedia_rdbms_atomic1',
+			'ROLLBACK TO SAVEPOINT wikimedia_rdbms_atomic1',
+			'COMMIT',
+			'SELECT 1, tRollback AS t'
+		] ) );
+
+		$this->database->startAtomic( __METHOD__ . '_level1', IDatabase::ATOMIC_CANCELABLE );
+		$this->database->onTransactionResolution( $makeCallback( 1 ), __METHOD__ );
+		$this->database->startAtomic( __METHOD__ . '_level2' );
+		$this->database->startAtomic( __METHOD__ . '_level3', IDatabase::ATOMIC_CANCELABLE );
+		$this->database->startAtomic( __METHOD__, IDatabase::ATOMIC_CANCELABLE );
+		$this->database->onTransactionResolution( $makeCallback( 2 ), __METHOD__ );
+		$this->database->endAtomic( __METHOD__ );
+		$this->database->onTransactionResolution( $makeCallback( 3 ), __METHOD__ );
+		$this->database->cancelAtomic( __METHOD__ . '_level3' );
+		$this->database->endAtomic( __METHOD__ . '_level2' );
+		$this->database->onTransactionResolution( $makeCallback( 4 ), __METHOD__ );
+		$this->database->endAtomic( __METHOD__ . '_level1' );
+		$this->assertLastSql( implode( "; ", [
+			'BEGIN',
+			'SAVEPOINT wikimedia_rdbms_atomic1',
+			'SAVEPOINT wikimedia_rdbms_atomic2',
+			'RELEASE SAVEPOINT wikimedia_rdbms_atomic2',
+			'ROLLBACK TO SAVEPOINT wikimedia_rdbms_atomic1',
+			'COMMIT; SELECT 1, tCommit AS t',
+			'SELECT 2, tRollback AS t',
+			'SELECT 3, tRollback AS t',
+			'SELECT 4, tCommit AS t'
+		] ) );
+	}
+
+	/**
+	 * @covers \Wikimedia\Rdbms\Database::doSavepoint
+	 * @covers \Wikimedia\Rdbms\Database::doReleaseSavepoint
+	 * @covers \Wikimedia\Rdbms\Database::doRollbackToSavepoint
+	 * @covers \Wikimedia\Rdbms\Database::startAtomic
+	 * @covers \Wikimedia\Rdbms\Database::endAtomic
+	 * @covers \Wikimedia\Rdbms\Database::cancelAtomic
+	 * @covers \Wikimedia\Rdbms\Database::doAtomicSection
+	 */
+	public function testAtomicSectionsRecovery() {
 		$this->database->begin( __METHOD__ );
 		try {
-			$this->database->doAtomicSection( __METHOD__, function () {
-				throw new RuntimeException( 'Test exception' );
-			} );
+			$this->database->doAtomicSection(
+				__METHOD__,
+				function () {
+					$this->database->startAtomic( 'inner_func1' );
+					$this->database->startAtomic( 'inner_func2' );
+
+					throw new RuntimeException( 'Test exception' );
+				},
+				IDatabase::ATOMIC_CANCELABLE
+			);
 			$this->fail( 'Expected exception not thrown' );
 		} catch ( RuntimeException $ex ) {
 			$this->assertSame( 'Test exception', $ex->getMessage() );
@@ -1423,6 +1571,180 @@ class DatabaseSQLTest extends PHPUnit\Framework\TestCase {
 		$this->database->commit( __METHOD__ );
 		// phpcs:ignore Generic.Files.LineLength
 		$this->assertLastSql( 'BEGIN; SAVEPOINT wikimedia_rdbms_atomic1; ROLLBACK TO SAVEPOINT wikimedia_rdbms_atomic1; COMMIT' );
+
+		$this->database->begin( __METHOD__ );
+		try {
+			$this->database->doAtomicSection(
+				__METHOD__,
+				function () {
+					throw new RuntimeException( 'Test exception' );
+				}
+			);
+			$this->fail( 'Test exception not thrown' );
+		} catch ( RuntimeException $ex ) {
+			$this->assertSame( 'Test exception', $ex->getMessage() );
+		}
+		try {
+			$this->database->commit( __METHOD__ );
+			$this->fail( 'Test exception not thrown' );
+		} catch ( DBTransactionError $ex ) {
+			$this->assertSame(
+				'Cannot execute query from ' . __METHOD__ . ' while transaction status is ERROR.',
+				$ex->getMessage()
+			);
+		}
+		$this->database->rollback( __METHOD__ );
+		$this->assertLastSql( 'BEGIN; ROLLBACK' );
+	}
+
+	/**
+	 * @covers \Wikimedia\Rdbms\Database::doSavepoint
+	 * @covers \Wikimedia\Rdbms\Database::doReleaseSavepoint
+	 * @covers \Wikimedia\Rdbms\Database::doRollbackToSavepoint
+	 * @covers \Wikimedia\Rdbms\Database::startAtomic
+	 * @covers \Wikimedia\Rdbms\Database::endAtomic
+	 * @covers \Wikimedia\Rdbms\Database::cancelAtomic
+	 * @covers \Wikimedia\Rdbms\Database::doAtomicSection
+	 */
+	public function testAtomicSectionsCallbackCancellation() {
+		$fname = __METHOD__;
+		$callback1Called = null;
+		$callback1 = function ( $trigger = '-' ) use ( $fname, &$callback1Called ) {
+			$callback1Called = $trigger;
+			$this->database->query( "SELECT 1", $fname );
+		};
+		$callback2Called = null;
+		$callback2 = function ( $trigger = '-' ) use ( $fname, &$callback2Called ) {
+			$callback2Called = $trigger;
+			$this->database->query( "SELECT 2", $fname );
+		};
+		$callback3Called = null;
+		$callback3 = function ( $trigger = '-' ) use ( $fname, &$callback3Called ) {
+			$callback3Called = $trigger;
+			$this->database->query( "SELECT 3", $fname );
+		};
+
+		$this->database->startAtomic( __METHOD__ . '_outer' );
+		$this->database->startAtomic( __METHOD__, IDatabase::ATOMIC_CANCELABLE );
+		$this->database->startAtomic( __METHOD__ . '_inner' );
+		$this->database->onTransactionIdle( $callback1, __METHOD__ );
+		$this->database->onTransactionPreCommitOrIdle( $callback2, __METHOD__ );
+		$this->database->onTransactionResolution( $callback3, __METHOD__ );
+		$this->database->endAtomic( __METHOD__ . '_inner' );
+		$this->database->cancelAtomic( __METHOD__ );
+		$this->database->endAtomic( __METHOD__ . '_outer' );
+		$this->assertNull( $callback1Called );
+		$this->assertNull( $callback2Called );
+		$this->assertEquals( IDatabase::TRIGGER_ROLLBACK, $callback3Called );
+		// phpcs:ignore Generic.Files.LineLength
+		$this->assertLastSql( 'BEGIN; SAVEPOINT wikimedia_rdbms_atomic1; ROLLBACK TO SAVEPOINT wikimedia_rdbms_atomic1; COMMIT; SELECT 3' );
+
+		$callback1Called = null;
+		$callback2Called = null;
+		$callback3Called = null;
+		$this->database->startAtomic( __METHOD__ . '_outer' );
+		$this->database->startAtomic( __METHOD__, IDatabase::ATOMIC_CANCELABLE );
+		$this->database->startAtomic( __METHOD__ . '_inner', IDatabase::ATOMIC_CANCELABLE );
+		$this->database->onTransactionIdle( $callback1, __METHOD__ );
+		$this->database->onTransactionPreCommitOrIdle( $callback2, __METHOD__ );
+		$this->database->onTransactionResolution( $callback3, __METHOD__ );
+		$this->database->endAtomic( __METHOD__ . '_inner' );
+		$this->database->cancelAtomic( __METHOD__ );
+		$this->database->endAtomic( __METHOD__ . '_outer' );
+		$this->assertNull( $callback1Called );
+		$this->assertNull( $callback2Called );
+		$this->assertEquals( IDatabase::TRIGGER_ROLLBACK, $callback3Called );
+		// phpcs:ignore Generic.Files.LineLength
+		$this->assertLastSql( 'BEGIN; SAVEPOINT wikimedia_rdbms_atomic1; SAVEPOINT wikimedia_rdbms_atomic2; RELEASE SAVEPOINT wikimedia_rdbms_atomic2; ROLLBACK TO SAVEPOINT wikimedia_rdbms_atomic1; COMMIT; SELECT 3' );
+
+		$callback1Called = null;
+		$callback2Called = null;
+		$callback3Called = null;
+		$this->database->startAtomic( __METHOD__ . '_outer' );
+		$atomicId = $this->database->startAtomic( __METHOD__, IDatabase::ATOMIC_CANCELABLE );
+		$this->database->startAtomic( __METHOD__ . '_inner' );
+		$this->database->onTransactionIdle( $callback1, __METHOD__ );
+		$this->database->onTransactionPreCommitOrIdle( $callback2, __METHOD__ );
+		$this->database->onTransactionResolution( $callback3, __METHOD__ );
+		$this->database->cancelAtomic( __METHOD__, $atomicId );
+		$this->database->endAtomic( __METHOD__ . '_outer' );
+		$this->assertNull( $callback1Called );
+		$this->assertNull( $callback2Called );
+		$this->assertEquals( IDatabase::TRIGGER_ROLLBACK, $callback3Called );
+
+		$callback1Called = null;
+		$callback2Called = null;
+		$callback3Called = null;
+		$this->database->startAtomic( __METHOD__ . '_outer' );
+		$atomicId = $this->database->startAtomic( __METHOD__, IDatabase::ATOMIC_CANCELABLE );
+		$this->database->startAtomic( __METHOD__ . '_inner' );
+		$this->database->onTransactionIdle( $callback1, __METHOD__ );
+		$this->database->onTransactionPreCommitOrIdle( $callback2, __METHOD__ );
+		$this->database->onTransactionResolution( $callback3, __METHOD__ );
+		try {
+			$this->database->cancelAtomic( __METHOD__ . '_X', $atomicId );
+		} catch ( DBUnexpectedError $e ) {
+			$m = __METHOD__;
+			$this->assertSame(
+				"Invalid atomic section ended (got {$m}_X but expected {$m}).",
+				$e->getMessage()
+			);
+		}
+		$this->database->cancelAtomic( __METHOD__ );
+		$this->database->endAtomic( __METHOD__ . '_outer' );
+		$this->assertNull( $callback1Called );
+		$this->assertNull( $callback2Called );
+		$this->assertEquals( IDatabase::TRIGGER_ROLLBACK, $callback3Called );
+
+		$this->database->startAtomic( __METHOD__ . '_outer' );
+		$this->database->startAtomic( __METHOD__, IDatabase::ATOMIC_CANCELABLE );
+		$this->database->startAtomic( __METHOD__ . '_inner' );
+		$this->database->onTransactionIdle( $callback1, __METHOD__ );
+		$this->database->onTransactionPreCommitOrIdle( $callback2, __METHOD__ );
+		$this->database->onTransactionResolution( $callback3, __METHOD__ );
+		$this->database->cancelAtomic( __METHOD__ . '_inner' );
+		$this->database->cancelAtomic( __METHOD__ );
+		$this->database->endAtomic( __METHOD__ . '_outer' );
+		$this->assertNull( $callback1Called );
+		$this->assertNull( $callback2Called );
+		$this->assertEquals( IDatabase::TRIGGER_ROLLBACK, $callback3Called );
+
+		$wrapper = TestingAccessWrapper::newFromObject( $this->database );
+		$callback1Called = null;
+		$callback2Called = null;
+		$callback3Called = null;
+		$this->database->startAtomic( __METHOD__ . '_outer' );
+		$this->database->startAtomic( __METHOD__, IDatabase::ATOMIC_CANCELABLE );
+		$this->database->startAtomic( __METHOD__ . '_inner' );
+		$this->database->onTransactionIdle( $callback1, __METHOD__ );
+		$this->database->onTransactionPreCommitOrIdle( $callback2, __METHOD__ );
+		$this->database->onTransactionResolution( $callback3, __METHOD__ );
+		$wrapper->trxStatus = Database::STATUS_TRX_ERROR;
+		$this->database->cancelAtomic( __METHOD__ . '_inner' );
+		$this->database->cancelAtomic( __METHOD__ );
+		$this->database->endAtomic( __METHOD__ . '_outer' );
+		$this->assertNull( $callback1Called );
+		$this->assertNull( $callback2Called );
+		$this->assertEquals( IDatabase::TRIGGER_ROLLBACK, $callback3Called );
+	}
+
+	/**
+	 * @covers \Wikimedia\Rdbms\Database::doSavepoint
+	 * @covers \Wikimedia\Rdbms\Database::doReleaseSavepoint
+	 * @covers \Wikimedia\Rdbms\Database::doRollbackToSavepoint
+	 * @covers \Wikimedia\Rdbms\Database::startAtomic
+	 * @covers \Wikimedia\Rdbms\Database::endAtomic
+	 * @covers \Wikimedia\Rdbms\Database::cancelAtomic
+	 * @covers \Wikimedia\Rdbms\Database::doAtomicSection
+	 */
+	public function testAtomicSectionsTrxRound() {
+		$this->database->setFlag( IDatabase::DBO_TRX );
+		$this->database->startAtomic( __METHOD__, IDatabase::ATOMIC_CANCELABLE );
+		$this->database->query( 'SELECT 1', __METHOD__ );
+		$this->database->endAtomic( __METHOD__ );
+		$this->database->commit( __METHOD__, IDatabase::FLUSHING_ALL_PEERS );
+		// phpcs:ignore Generic.Files.LineLength
+		$this->assertLastSql( 'BEGIN; SAVEPOINT wikimedia_rdbms_atomic1; SELECT 1; RELEASE SAVEPOINT wikimedia_rdbms_atomic1; COMMIT' );
 	}
 
 	public static function provideAtomicSectionMethodsForErrors() {
@@ -1443,7 +1765,7 @@ class DatabaseSQLTest extends PHPUnit\Framework\TestCase {
 			$this->fail( 'Expected exception not thrown' );
 		} catch ( DBUnexpectedError $ex ) {
 			$this->assertSame(
-				'No atomic transaction is open (got ' . __METHOD__ . ').',
+				'No atomic section is open (got ' . __METHOD__ . ').',
 				$ex->getMessage()
 			);
 		}
@@ -1461,7 +1783,8 @@ class DatabaseSQLTest extends PHPUnit\Framework\TestCase {
 			$this->fail( 'Expected exception not thrown' );
 		} catch ( DBUnexpectedError $ex ) {
 			$this->assertSame(
-				'Invalid atomic section ended (got ' . __METHOD__ . ').',
+				'Invalid atomic section ended (got ' . __METHOD__ . ' but expected ' .
+					__METHOD__ . 'X' . ').',
 				$ex->getMessage()
 			);
 		}
@@ -1474,10 +1797,11 @@ class DatabaseSQLTest extends PHPUnit\Framework\TestCase {
 		$this->database->startAtomic( __METHOD__ );
 		try {
 			$this->database->cancelAtomic( __METHOD__ );
+			$this->database->select( 'test', '1', [], __METHOD__ );
 			$this->fail( 'Expected exception not thrown' );
-		} catch ( DBUnexpectedError $ex ) {
+		} catch ( DBTransactionError $ex ) {
 			$this->assertSame(
-				'Uncancelable atomic section canceled (got ' . __METHOD__ . ').',
+				'Cannot execute query from ' . __METHOD__ . ' while transaction status is ERROR.',
 				$ex->getMessage()
 			);
 		}
@@ -1540,6 +1864,109 @@ class DatabaseSQLTest extends PHPUnit\Framework\TestCase {
 		$this->assertEquals( 0, $this->database->trxLevel() );
 	}
 
+	/**
+	 * @covers \Wikimedia\Rdbms\Database::query
+	 */
+	public function testImplicitTransactionRollback() {
+		$doError = function () {
+			$this->database->forceNextQueryError( 666, 'Evilness' );
+			try {
+				$this->database->delete( 'error', '1', __CLASS__ . '::SomeCaller' );
+				$this->fail( 'Expected exception not thrown' );
+			} catch ( DBError $e ) {
+				$this->assertSame( 666, $e->errno );
+			}
+		};
+
+		$this->database->setFlag( Database::DBO_TRX );
+
+		// Implicit transaction gets silently rolled back
+		$this->database->begin( __METHOD__, Database::TRANSACTION_INTERNAL );
+		call_user_func( $doError );
+		$this->database->delete( 'x', [ 'field' => 1 ], __METHOD__ );
+		$this->database->commit( __METHOD__, Database::FLUSHING_INTERNAL );
+		// phpcs:ignore
+		$this->assertLastSql( 'BEGIN; DELETE FROM error WHERE 1; ROLLBACK; BEGIN; DELETE FROM x WHERE field = \'1\'; COMMIT' );
+
+		// ... unless there were prior writes
+		$this->database->begin( __METHOD__, Database::TRANSACTION_INTERNAL );
+		$this->database->delete( 'x', [ 'field' => 1 ], __METHOD__ );
+		call_user_func( $doError );
+		try {
+			$this->database->delete( 'x', [ 'field' => 1 ], __METHOD__ );
+			$this->fail( 'Expected exception not thrown' );
+		} catch ( DBTransactionStateError $e ) {
+		}
+		$this->database->rollback( __METHOD__, Database::FLUSHING_INTERNAL );
+		// phpcs:ignore
+		$this->assertLastSql( 'BEGIN; DELETE FROM x WHERE field = \'1\'; DELETE FROM error WHERE 1; ROLLBACK' );
+	}
+
+	/**
+	 * @covers \Wikimedia\Rdbms\Database::query
+	 */
+	public function testTransactionStatementRollbackIgnoring() {
+		$wrapper = TestingAccessWrapper::newFromObject( $this->database );
+		$warning = [];
+		$wrapper->deprecationLogger = function ( $msg ) use ( &$warning ) {
+			$warning[] = $msg;
+		};
+
+		$doError = function () {
+			$this->database->forceNextQueryError( 666, 'Evilness', [
+				'wasKnownStatementRollbackError' => true,
+			] );
+			try {
+				$this->database->delete( 'error', '1', __CLASS__ . '::SomeCaller' );
+				$this->fail( 'Expected exception not thrown' );
+			} catch ( DBError $e ) {
+				$this->assertSame( 666, $e->errno );
+			}
+		};
+		$expectWarning = 'Caller from ' . __METHOD__ .
+			' ignored an error originally raised from ' . __CLASS__ . '::SomeCaller: [666] Evilness';
+
+		// Rollback doesn't raise a warning
+		$warning = [];
+		$this->database->startAtomic( __METHOD__ );
+		call_user_func( $doError );
+		$this->database->rollback( __METHOD__ );
+		$this->database->delete( 'x', [ 'field' => 1 ], __METHOD__ );
+		$this->assertSame( [], $warning );
+		// phpcs:ignore
+		$this->assertLastSql( 'BEGIN; DELETE FROM error WHERE 1; ROLLBACK; DELETE FROM x WHERE field = \'1\'' );
+
+		// cancelAtomic() doesn't raise a warning
+		$warning = [];
+		$this->database->begin( __METHOD__ );
+		$this->database->startAtomic( __METHOD__, Database::ATOMIC_CANCELABLE );
+		call_user_func( $doError );
+		$this->database->cancelAtomic( __METHOD__ );
+		$this->database->delete( 'x', [ 'field' => 1 ], __METHOD__ );
+		$this->database->commit( __METHOD__ );
+		$this->assertSame( [], $warning );
+		// phpcs:ignore
+		$this->assertLastSql( 'BEGIN; SAVEPOINT wikimedia_rdbms_atomic1; DELETE FROM error WHERE 1; ROLLBACK TO SAVEPOINT wikimedia_rdbms_atomic1; DELETE FROM x WHERE field = \'1\'; COMMIT' );
+
+		// Commit does raise a warning
+		$warning = [];
+		$this->database->begin( __METHOD__ );
+		call_user_func( $doError );
+		$this->database->commit( __METHOD__ );
+		$this->assertSame( [ $expectWarning ], $warning );
+		$this->assertLastSql( 'BEGIN; DELETE FROM error WHERE 1; COMMIT' );
+
+		// Deprecation only gets raised once
+		$warning = [];
+		$this->database->begin( __METHOD__ );
+		call_user_func( $doError );
+		$this->database->delete( 'x', [ 'field' => 1 ], __METHOD__ );
+		$this->database->commit( __METHOD__ );
+		$this->assertSame( [ $expectWarning ], $warning );
+		// phpcs:ignore
+		$this->assertLastSql( 'BEGIN; DELETE FROM error WHERE 1; DELETE FROM x WHERE field = \'1\'; COMMIT' );
+	}
+
 	/**
 	 * @covers \Wikimedia\Rdbms\Database::close
 	 */
@@ -1582,4 +2009,42 @@ class DatabaseSQLTest extends PHPUnit\Framework\TestCase {
 		$this->assertLastSql( 'BEGIN; DELETE FROM x WHERE field = \'3\'; ROLLBACK' );
 		$this->assertEquals( 0, $this->database->trxLevel() );
 	}
+
+	/**
+	 * @covers \Wikimedia\Rdbms\Database::close
+	 */
+	public function testPrematureClose3() {
+		try {
+			$this->database->setFlag( IDatabase::DBO_TRX );
+			$this->database->delete( 'x', [ 'field' => 3 ], __METHOD__ );
+			$this->assertEquals( 1, $this->database->trxLevel() );
+			$this->database->close();
+			$this->fail( 'Expected exception not thrown' );
+		} catch ( DBUnexpectedError $ex ) {
+			$this->assertSame(
+				'Wikimedia\Rdbms\Database::close: ' .
+				'mass commit/rollback of peer transaction required (DBO_TRX set).',
+				$ex->getMessage()
+			);
+		}
+
+		$this->assertFalse( $this->database->isOpen() );
+		$this->assertLastSql( 'BEGIN; DELETE FROM x WHERE field = \'3\'; ROLLBACK' );
+		$this->assertEquals( 0, $this->database->trxLevel() );
+	}
+
+	/**
+	 * @covers \Wikimedia\Rdbms\Database::close
+	 */
+	public function testPrematureClose4() {
+		$this->database->setFlag( IDatabase::DBO_TRX );
+		$this->database->query( 'SELECT 1', __METHOD__ );
+		$this->assertEquals( 1, $this->database->trxLevel() );
+		$this->database->close();
+		$this->database->clearFlag( IDatabase::DBO_TRX );
+
+		$this->assertFalse( $this->database->isOpen() );
+		$this->assertLastSql( 'BEGIN; SELECT 1; COMMIT' );
+		$this->assertEquals( 0, $this->database->trxLevel() );
+	}
 }