Skip to content

Commit 140d805

Browse files
dgdg
committed
database connection moved to PdoDriver::connect()
1 parent 16184e7 commit 140d805

10 files changed

Lines changed: 47 additions & 59 deletions

File tree

‎src/Database/Connection.php‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,8 @@ class Connection
3030

3131
private array $params;
3232
private array $options;
33-
private Driver $driver;
33+
private ?Driver $driver = null;
3434
private SqlPreprocessor $preprocessor;
35-
private ?PDO $pdo = null;
3635

3736
/** @var callable(array, ResultSet): array */
3837
private $rowNormalizer = [Helpers::class, 'normalizeRow'];
@@ -53,23 +52,20 @@ public function __construct(string $dsn, string $user = null, string $password =
5352

5453
public function connect(): void
5554
{
56-
if ($this->pdo) {
55+
if ($this->driver) {
5756
return;
5857
}
59-
60-
try {
61-
$this->pdo = new PDO($this->params[0], $this->params[1], $this->params[2], $this->options);
62-
$this->pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
63-
} catch (PDOException $e) {
64-
throw ConnectionException::from($e);
65-
}
66-
58+
$dsn = explode(':', $this->params[0])[0];
6759
$class = empty($this->options['driverClass'])
68-
? 'Nette\Database\Drivers\\' . ucfirst(str_replace('sql', 'Sql', $this->pdo->getAttribute(PDO::ATTR_DRIVER_NAME))) . 'Driver'
60+
? 'Nette\Database\Drivers\\' . ucfirst(str_replace('sql', 'Sql', $dsn)) . 'Driver'
6961
: $this->options['driverClass'];
62+
if (!class_exists($class)) {
63+
throw new ConnectionException("Invalid data source '$dsn'.");
64+
}
65+
7066
$this->driver = new $class;
67+
$this->driver->connect($this->params[0], $this->params[1], $this->params[2], $this->options);
7168
$this->preprocessor = new SqlPreprocessor($this);
72-
$this->driver->initialize($this, $this->options);
7369
Arrays::invoke($this->onConnect, $this);
7470
}
7571

@@ -83,7 +79,7 @@ public function reconnect(): void
8379

8480
public function disconnect(): void
8581
{
86-
$this->pdo = null;
82+
$this->driver = null;
8783
}
8884

8985

@@ -93,10 +89,11 @@ public function getDsn(): string
9389
}
9490

9591

92+
/** deprecated use getDriver()->getPdo() */
9693
public function getPdo(): PDO
9794
{
9895
$this->connect();
99-
return $this->pdo;
96+
return $this->driver->getPdo();
10097
}
10198

10299

‎src/Database/Driver.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@ interface Driver
2525

2626
/**
2727
* Initializes connection.
28+
* @throws ConnectionException
2829
*/
29-
function initialize(Connection $connection, array $options): void;
30+
function connect(string $dsn, string $user = null, string $password = null, array $options = null): void;
3031

3132
/**
3233
* Converts PDOException to DriverException or its descendant.

‎src/Database/Drivers/MsSqlDriver.php‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,6 @@
1717
*/
1818
class MsSqlDriver extends PdoDriver
1919
{
20-
private Nette\Database\Connection $connection;
21-
22-
23-
public function initialize(Nette\Database\Connection $connection, array $options): void
24-
{
25-
$this->connection = $connection;
26-
}
27-
28-
2920
public function convertException(\PDOException $e): Nette\Database\DriverException
3021
{
3122
return Nette\Database\DriverException::from($e);

‎src/Database/Drivers/MySqlDriver.php‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,22 @@ class MySqlDriver extends PdoDriver
2222
ERROR_DUPLICATE_ENTRY = 1062,
2323
ERROR_DATA_TRUNCATED = 1265;
2424

25-
private Nette\Database\Connection $connection;
26-
2725

2826
/**
2927
* Driver options:
3028
* - charset => character encoding to set (default is utf8 or utf8mb4 since MySQL 5.5.3)
3129
* - sqlmode => see http://dev.mysql.com/doc/refman/5.0/en/server-sql-mode.html
3230
*/
33-
public function initialize(Nette\Database\Connection $connection, array $options): void
31+
public function connect(string $dsn, string $user = null, string $password = null, array $options = null): void
3432
{
35-
$this->connection = $connection;
33+
parent::connect($dsn, $user, $password, $options);
3634
$charset = $options['charset']
37-
?? (version_compare($connection->getPdo()->getAttribute(\PDO::ATTR_SERVER_VERSION), '5.5.3', '>=') ? 'utf8mb4' : 'utf8');
35+
?? (version_compare($this->pdo->getAttribute(\PDO::ATTR_SERVER_VERSION), '5.5.3', '>=') ? 'utf8mb4' : 'utf8');
3836
if ($charset) {
39-
$connection->query('SET NAMES ?', $charset);
37+
$this->pdo->query('SET NAMES ' . $this->pdo->quote($charset));
4038
}
4139
if (isset($options['sqlmode'])) {
42-
$connection->query('SET sql_mode=?', $options['sqlmode']);
40+
$this->pdo->query('SET sql_mode=' . $this->pdo->quote($options['sqlmode']));
4341
}
4442
}
4543

‎src/Database/Drivers/OciDriver.php‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,13 @@
1717
*/
1818
class OciDriver extends PdoDriver
1919
{
20-
private Nette\Database\Connection $connection;
21-
2220
/** Datetime format */
2321
private string $fmtDateTime;
2422

2523

26-
public function initialize(Nette\Database\Connection $connection, array $options): void
24+
public function connect(string $dsn, string $user = null, string $password = null, array $options = null): void
2725
{
28-
$this->connection = $connection;
26+
parent::connect($dsn, $user, $password, $options);
2927
$this->fmtDateTime = $options['formatDateTime'] ?? 'U';
3028
}
3129

‎src/Database/Drivers/OdbcDriver.php‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@
1717
*/
1818
class OdbcDriver extends PdoDriver
1919
{
20-
public function initialize(Nette\Database\Connection $connection, array $options): void
21-
{
22-
}
23-
24-
2520
public function convertException(\PDOException $e): Nette\Database\DriverException
2621
{
2722
return Nette\Database\DriverException::from($e);

‎src/Database/Drivers/PdoDriver.php‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
namespace Nette\Database\Drivers;
1111

1212
use Nette;
13+
use PDO;
14+
use PDOException;
1315

1416

1517
/**
@@ -18,4 +20,23 @@
1820
abstract class PdoDriver implements Nette\Database\Driver
1921
{
2022
use Nette\SmartObject;
23+
24+
protected ?PDO $pdo = null;
25+
26+
27+
public function connect(string $dsn, string $user = null, string $password = null, array $options = null): void
28+
{
29+
try {
30+
$this->pdo = new PDO($dsn, $user, $password, $options);
31+
$this->pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
32+
} catch (PDOException $e) {
33+
throw Nette\Database\ConnectionException::from($e);
34+
}
35+
}
36+
37+
38+
public function getPdo(): ?PDO
39+
{
40+
return $this->pdo;
41+
}
2142
}

‎src/Database/Drivers/PgSqlDriver.php‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,6 @@
1717
*/
1818
class PgSqlDriver extends PdoDriver
1919
{
20-
private Nette\Database\Connection $connection;
21-
22-
23-
public function initialize(Nette\Database\Connection $connection, array $options): void
24-
{
25-
$this->connection = $connection;
26-
}
27-
28-
2920
public function convertException(\PDOException $e): Nette\Database\DriverException
3021
{
3122
$code = $e->errorInfo[0] ?? null;

‎src/Database/Drivers/SqliteDriver.php‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,13 @@
1717
*/
1818
class SqliteDriver extends PdoDriver
1919
{
20-
private Nette\Database\Connection $connection;
21-
2220
/** Datetime format */
2321
private string $fmtDateTime;
2422

2523

26-
public function initialize(Nette\Database\Connection $connection, array $options): void
24+
public function connect(string $dsn, string $user = null, string $password = null, array $options = null): void
2725
{
28-
$this->connection = $connection;
26+
parent::connect($dsn, $user, $password, $options);
2927
$this->fmtDateTime = $options['formatDateTime'] ?? 'U';
3028
}
3129

‎src/Database/Drivers/SqlsrvDriver.php‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,13 @@
1717
*/
1818
class SqlsrvDriver extends PdoDriver
1919
{
20-
private Nette\Database\Connection $connection;
21-
2220
private string $version;
2321

2422

25-
public function initialize(Nette\Database\Connection $connection, array $options): void
23+
public function connect(string $dsn, string $user = null, string $password = null, array $options = null): void
2624
{
27-
$this->connection = $connection;
28-
$this->version = $connection->getPdo()->getAttribute(\PDO::ATTR_SERVER_VERSION);
25+
parent::connect($dsn, $user, $password, $options);
26+
$this->version = $this->pdo->getAttribute(\PDO::ATTR_SERVER_VERSION);
2927
}
3028

3129

0 commit comments

Comments
 (0)