Connection::getPdo() deprecated

Author: dg

src/Database/Connection.php

@@ -92,8 +92,10 @@ public function getDsn(): string
 	}
 
 
+	/** @deprecated use getConnectionDriver()->getNativeConnection() */
 	public function getPdo(): \PDO
 	{
+		trigger_error(__METHOD__ . '() is deprecated, use getConnectionDriver()->getNativeConnection()', E_USER_DEPRECATED);
 		return $this->getConnectionDriver()->getNativeConnection();
 	}
 

src/Database/Helpers.php

@@ -265,15 +265,15 @@ public static function loadFromFile(Connection $connection, string $file, ?calla
 		$count = $size = 0;
 		$delimiter = ';';
 		$sql = '';
-		$pdo = $connection->getPdo(); // native query without logging
+		$driver = $connection->getConnectionDriver(); // native query without logging
 		while (($s = fgets($handle)) !== false) {
 			$size += strlen($s);
 			if (!strncasecmp($s, 'DELIMITER ', 10)) {
 				$delimiter = trim(substr($s, 10));
 
 			} elseif (str_ends_with($ts = rtrim($s), $delimiter)) {
 				$sql .= substr($ts, 0, -strlen($delimiter));
-				$pdo->exec($sql);
+				$driver->query($sql);
 				$sql = '';
 				$count++;
 				if ($onProgress) {
@@ -285,7 +285,7 @@ public static function loadFromFile(Connection $connection, string $file, ?calla
 		}
 
 		if (rtrim($sql) !== '') {
-			$pdo->exec($sql);
+			$driver->query($sql);
 			$count++;
 			if ($onProgress) {
 				$onProgress($count, isset($stat['size']) ? 100 : null);

tests/Database/Result.fetch().phpt

@@ -38,7 +38,7 @@ test('', function () use ($connection, $driverName) {
 test('tests closeCursor()', function () use ($connection, $driverName) {
 	if ($driverName === 'mysql') {
 		$connection->query('CREATE DEFINER = CURRENT_USER PROCEDURE `testProc`(IN param int(10) unsigned) BEGIN SELECT * FROM book WHERE id != param; END;;');
-		$connection->getPdo()->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, false);
+		$connection->getConnectionDriver()->getNativeConnection()->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, false);
 
 		$res = $connection->query('CALL testProc(1)');
 		foreach ($res as $row) {

tests/Database/ResultSet.normalizeRow.mysql.phpt

@@ -151,7 +151,7 @@ Assert::same(
 );
 
 
-$connection->getPdo()->setAttribute(PDO::ATTR_EMULATE_PREPARES, false);
+$connection->getConnectionDriver()->getNativeConnection()->setAttribute(PDO::ATTR_EMULATE_PREPARES, false);
 $res = $connection->query('SELECT `int`, `decimal`, `decimal2`, `float`, `double` FROM types');
 Assert::equal([
 	'int' => 1,

tests/Database/connection.option.lazy.phpt

@@ -57,28 +57,28 @@ test('connect & disconnect', function () {
 	};
 
 	// first connection
-	$pdo = $connection->getPdo();
-	$driver = $connection->getDatabaseEngine();
+	$native = $connection->getConnectionDriver()->getNativeConnection();
+	$driver = $connection->getConnectionDriver();
 	Assert::same(1, $connections);
 
 	// still first connection
 	$connection->connect();
-	Assert::same($pdo, $connection->getPdo());
-	Assert::same($driver, $connection->getDatabaseEngine());
+	Assert::same($native, $connection->getConnectionDriver()->getNativeConnection());
+	Assert::same($driver, $connection->getConnectionDriver());
 	Assert::same(1, $connections);
 
 	// second connection
 	$connection->reconnect();
-	$pdo2 = $connection->getPdo();
-	$driver2 = $connection->getDatabaseEngine();
+	$native2 = $connection->getConnectionDriver()->getNativeConnection();
+	$driver2 = $connection->getConnectionDriver();
 
-	Assert::notSame($pdo, $pdo2);
+	Assert::notSame($native, $native2);
 	Assert::notSame($driver, $driver2);
 	Assert::same(2, $connections);
 
 	// third connection
 	$connection->disconnect();
-	Assert::notSame($pdo2, $connection->getPdo());
-	Assert::notSame($driver2, $connection->getDatabaseEngine());
+	Assert::notSame($native2, $connection->getConnectionDriver()->getNativeConnection());
+	Assert::notSame($driver2, $connection->getConnectionDriver());
 	Assert::same(3, $connections);
 });

tests/bootstrap.php

@@ -44,7 +44,7 @@ function connectToDB(array $options = []): Nette\Database\Explorer
 		Tester\Environment::skip("Connection to '$args[dsn]' failed. Reason: " . $e->getMessage());
 	}
 
-	$driverName = $connection->getPdo()->getAttribute(PDO::ATTR_DRIVER_NAME);
+	$driverName = $connection->getConnectionDriver()->getNativeConnection()->getAttribute(PDO::ATTR_DRIVER_NAME);
 	$cacheMemoryStorage = new Nette\Caching\Storages\MemoryStorage;
 
 	$structure = new Nette\Database\Structure($connection, $cacheMemoryStorage);