Moved last exception thing to BaseDatabaseFrontend so it will become available for...

diff --git a/inc/classes/main/database/class_BaseDatabaseFrontend.php b/inc/classes/main/database/class_BaseDatabaseFrontend.php
index ffdd69cf57482ca89b35abb001a26386768977a2..820e4c3ab9b6d5a47f27ca88bd309a02b2781e0a 100644 (file)
--- a/inc/classes/main/database/class_BaseDatabaseFrontend.php
+++ b/inc/classes/main/database/class_BaseDatabaseFrontend.php
@@ -31,6 +31,11 @@ abstract class BaseDatabaseFrontend extends BaseFrameworkSystem implements Datab
        const RESULT_INDEX_STATUS    = 'status';
        const RESULT_INDEX_EXCEPTION = 'exception';
 
+       /**
+        * Last thrown exception or NULL if all is fine
+        */
+       private $lastException = NULL;
+
        /**
         * Protected constructor
         *
@@ -41,6 +46,35 @@ abstract class BaseDatabaseFrontend extends BaseFrameworkSystem implements Datab
                // Call parent constructor
                parent::__construct($className);
        }
+
+       /**
+        * Getter for last exception
+        *
+        * @return      $lastException  Last thrown exception
+        */
+       public final function getLastException () {
+               return $this->lastException;
+       }
+
+       /**
+        * Setter for last exception
+        *
+        * @param       $lastException  Last thrown exception
+        * @return      void
+        */
+       public final function setLastException (FrameworkException $exceptionInstance) {
+               $this->lastException = $exceptionInstance;
+       }
+
+       /**
+        * Reset the last exception instance. This should be done after a "query"
+        * was completed without any errors.
+        *
+        * @return      void
+        */
+       protected final function resetLastException () {
+               $this->lastException = NULL;
+       }
 }
 
 // [EOF]

diff --git a/inc/classes/main/database/databases/class_LocalFileDatabase.php b/inc/classes/main/database/databases/class_LocalFileDatabase.php
index d104151d0cda7ba443872d20b8b913e75dd5dfe7..b093a9d846034353125bc0819b1e1feda7eccec2 100644 (file)
--- 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 exception
-        */
-       private $lastException = NULL;
-
        /**
         * Table information array
         */
@@ -101,15 +96,6 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend
                return $databaseInstance;
        }
 
-       /**
-        * Getter for last exception
-        *
-        * @return      $lastException  Last thrown exception
-        */
-       public final function getLastException () {
-               return $this->lastException;
-       }
-
        /**
         * Setter for the last read file
         *
@@ -121,16 +107,6 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend
                $this->lastFile = (string) $fqfn;
        }
 
-       /**
-        * Reset the last exception instance. This should be done after a "query"
-        * was completed without any errors.
-        *
-        * @return      void
-        */
-       private final function resetLastException () {
-               $this->lastException = NULL;
-       }
-
        /**
         * Getter for last read file
         *
@@ -412,13 +388,13 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend
                        $this->resetLastException();
                } catch (PathIsNoDirectoryException $e) {
                        // Path not found means "table not found" for real databases...
-                       $this->lastException = $e;
+                       $this->setLastException($e);
 
                        // 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->setLastException($e);
                }
 
                // Return the gathered result
@@ -448,7 +424,7 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend
                        $this->resetLastException();
                } catch (FrameworkException $e) {
                        // Catch all exceptions and store them in last error
-                       $this->lastException = $e;
+                       $this->setLastException($e);
 
                        // 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);
@@ -538,7 +514,7 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend
                        $this->resetLastException();
                } catch (FrameworkException $e) {
                        // Catch all exceptions and store them in last error
-                       $this->lastException = $e;
+                       $this->setLastException($e);
 
                        // 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);