getLastError() is now fully obsolete, you can get the same message by calling getLast...

diff --git a/inc/classes/main/database/class_BaseDatabaseWrapper.php b/inc/classes/main/database/class_BaseDatabaseWrapper.php
index 4cdbafc019de11f7c3a4e4e9659c1bd0b6933b32..e925f38607e4ca88e9d0bd64d433420ecd7502dc 100644 (file)
--- a/inc/classes/main/database/class_BaseDatabaseWrapper.php
+++ b/inc/classes/main/database/class_BaseDatabaseWrapper.php
@@ -127,6 +127,15 @@ class BaseDatabaseWrapper extends BaseFrameworkSystem {
                return $this->getDatabaseInstance()->getIndexKey();
        }
 
+       /**
+        * Getter for last exception
+        *
+        * @return      $lastException  Last exception or NULL if none occured
+        */
+       public final function getLastException () {
+               return $this->getDatabaseInstance()->getLastException();
+       }
+
        /**
         * Do a "select" query on the current table with the given search criteria and
         * store it in cache for later usage

diff --git a/inc/classes/main/database/databases/class_LocalFileDatabase.php b/inc/classes/main/database/databases/class_LocalFileDatabase.php
index 2792f3d314ebabcc98dead7aaf70d20c2d450acf..d104151d0cda7ba443872d20b8b913e75dd5dfe7 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 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);