Connection: $connected replaced with $driver

src/Dibi/Connection.php

@@ -34,9 +34,6 @@ class Connection implements IConnection
 	/** @var Translator|null */
 	private $translator;
 
-	/** @var bool  Is connected? */
-	private $connected = false;
-
 	/** @var HashMap Substitutes for identifiers */
 	private $substitutes;
 
@@ -126,7 +123,6 @@ final public function connect(): void
 		$event = $this->onEvent ? new Event($this, Event::CONNECT) : null;
 		try {
 			$this->driver = new $class($this->config);
-			$this->connected = true;
 			if ($event) {
 				$this->onEvent($event->done());
 			}
@@ -145,8 +141,8 @@ final public function connect(): void
 	 */
 	final public function disconnect(): void
 	{
-		if ($this->connected) {
-			$this->connected = false;
+		if ($this->driver) {
+			$this->driver = null;
 		}
 	}
 
@@ -156,7 +152,7 @@ final public function disconnect(): void
 	 */
 	final public function isConnected(): bool
 	{
-		return $this->connected;
+		return (bool) $this->driver;
 	}
 
 
@@ -178,7 +174,7 @@ final public function getConfig(string $key = null, $default = null)
 	 */
 	final public function getDriver(): Driver
 	{
-		if (!$this->connected) {
+		if (!$this->driver) {
 			$this->connect();
 		}
 		return $this->driver;
@@ -245,7 +241,7 @@ final public function dataSource(...$args): DataSource
 	 */
 	protected function translateArgs(array $args): string
 	{
-		if (!$this->connected) {
+		if (!$this->driver) {
 			$this->connect();
 		}
 		if (!$this->translator) {
@@ -263,7 +259,7 @@ protected function translateArgs(array $args): string
 	 */
 	final public function nativeQuery(string $sql)
 	{
-		if (!$this->connected) {
+		if (!$this->driver) {
 			$this->connect();
 		}
 
@@ -298,7 +294,7 @@ final public function nativeQuery(string $sql)
 	 */
 	public function getAffectedRows(): int
 	{
-		if (!$this->connected) {
+		if (!$this->driver) {
 			$this->connect();
 		}
 		$rows = $this->driver->getAffectedRows();
@@ -325,7 +321,7 @@ public function affectedRows(): int
 	 */
 	public function getInsertId(string $sequence = null): int
 	{
-		if (!$this->connected) {
+		if (!$this->driver) {
 			$this->connect();
 		}
 		$id = $this->driver->getInsertId($sequence);
@@ -351,7 +347,7 @@ public function insertId(string $sequence = null): int
 	 */
 	public function begin(string $savepoint = null): void
 	{
-		if (!$this->connected) {
+		if (!$this->driver) {
 			$this->connect();
 		}
 		$event = $this->onEvent ? new Event($this, Event::BEGIN, $savepoint) : null;
@@ -375,7 +371,7 @@ public function begin(string $savepoint = null): void
 	 */
 	public function commit(string $savepoint = null): void
 	{
-		if (!$this->connected) {
+		if (!$this->driver) {
 			$this->connect();
 		}
 		$event = $this->onEvent ? new Event($this, Event::COMMIT, $savepoint) : null;
@@ -399,7 +395,7 @@ public function commit(string $savepoint = null): void
 	 */
 	public function rollback(string $savepoint = null): void
 	{
-		if (!$this->connected) {
+		if (!$this->driver) {
 			$this->connect();
 		}
 		$event = $this->onEvent ? new Event($this, Event::ROLLBACK, $savepoint) : null;
@@ -569,7 +565,7 @@ public function loadFile(string $file, callable $onProgress = null): int
 	 */
 	public function getDatabaseInfo(): Reflection\Database
 	{
-		if (!$this->connected) {
+		if (!$this->driver) {
 			$this->connect();
 		}
 		return new Reflection\Database($this->driver->getReflector(), $this->config['database'] ?? null);