X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fdatabase%2Fdatabases%2Fclass_LocalFileDatabase.php;h=d104151d0cda7ba443872d20b8b913e75dd5dfe7;hp=2792f3d314ebabcc98dead7aaf70d20c2d450acf;hb=3cfc834fbd3fae00c5edc65033c0f043fc4186a2;hpb=1f5f8021cedb431b687a30e4b19186339c00e0b9 diff --git a/inc/classes/main/database/databases/class_LocalFileDatabase.php b/inc/classes/main/database/databases/class_LocalFileDatabase.php index 2792f3d3..d104151d 100644 --- a/inc/classes/main/database/databases/class_LocalFileDatabase.php +++ b/inc/classes/main/database/databases/class_LocalFileDatabase.php @@ -52,11 +52,6 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend */ private $alreadyConnected = false; - /** - * Last error message - */ - private $lastError = ''; - /** * Last exception */ @@ -106,15 +101,6 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend return $databaseInstance; } - /** - * Getter for last error message - * - * @return $lastError Last error message - */ - public final function getLastError () { - return $this->lastError; - } - /** * Getter for last exception * @@ -136,13 +122,12 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend } /** - * Reset the last error and exception instance. This should be done after - * a successfull "query" + * Reset the last exception instance. This should be done after a "query" + * was completed without any errors. * * @return void */ - private final function resetLastError () { - $this->lastError = ''; + private final function resetLastException () { $this->lastException = NULL; } @@ -423,19 +408,17 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend $directoryInstance->closeDirectory(); unset($directoryInstance); - // Reset last error message and exception - $this->resetLastError(); + // Reset last exception + $this->resetLastException(); } catch (PathIsNoDirectoryException $e) { // Path not found means "table not found" for real databases... $this->lastException = $e; - $this->lastError = $e->getMessage(); // So throw an SqlException here with faked error message throw new SqlException (array($this, sprintf("Table '%s' not found", $tableName), self::DB_CODE_TABLE_MISSING), self::EXCEPTION_SQL_QUERY); } catch (FrameworkException $e) { // Catch all exceptions and store them in last error $this->lastException = $e; - $this->lastError = $e->getMessage(); } // Return the gathered result @@ -461,12 +444,11 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend // Update the primary key $this->updatePrimaryKey($dataSetInstance); - // Reset last error message and exception - $this->resetLastError(); + // Reset last exception + $this->resetLastException(); } catch (FrameworkException $e) { // Catch all exceptions and store them in last error $this->lastException = $e; - $this->lastError = $e->getMessage(); // Throw an SQL exception throw new SqlException(array($this, sprintf("Cannot write data to table '%s', is the table created?", $dataSetInstance->getTableName()), self::DB_CODE_TABLE_UNWRITEABLE), self::EXCEPTION_SQL_QUERY); @@ -552,12 +534,11 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend // Update the primary key $this->updatePrimaryKey($dataSetInstance); - // Reset last error message and exception - $this->resetLastError(); + // Reset last exception + $this->resetLastException(); } catch (FrameworkException $e) { // Catch all exceptions and store them in last error $this->lastException = $e; - $this->lastError = $e->getMessage(); // Throw an SQL exception throw new SqlException(array($this, sprintf("Cannot write data to table '%s', is the table created?", $dataSetInstance->getTableName()), self::DB_CODE_TABLE_UNWRITEABLE), self::EXCEPTION_SQL_QUERY);