Show lack of database connection when none is desired.

config/Windows/navigation.xml

@@ -286,72 +286,87 @@
 			query.exec("CREATE OR REPLACE FUNCTION log_use() RETURNS trigger AS $$ DECLARE i integer := array_lower(NEW.unroasted_id, 1); u integer := array_upper(NEW.unroasted_id, 1); BEGIN IF NEW.transaction_type = 'ROAST' THEN WHILE i <= u LOOP INSERT INTO use (time, item, quantity) VALUES(NEW.time, NEW.unroasted_id[i], NEW.unroasted_quantity[i]); i := i + 1; END LOOP; END IF; RETURN NEW; END; $$ LANGUAGE plpgsql");
 			query.exec("UPDATE TypicaFeatures SET version = 4 WHERE feature = 'base-features'");
 		};
-                var DBUpdateReminders = function() {
-                    var query = new QSqlQuery;
-                    query.exec("CREATE TABLE IF NOT EXISTS reminders (id bigserial PRIMARY KEY NOT NULL, reminder text NOT NULL)");
-                    query.exec("UPDATE TypicaFeatures SET version = 5 WHERE feature = 'base-features'");
-                    query = query.invalidate();
-                };
+        var DBUpdateReminders = function() {
+            var query = new QSqlQuery;
+            query.exec("CREATE TABLE IF NOT EXISTS reminders (id bigserial PRIMARY KEY NOT NULL, reminder text NOT NULL)");
+            query.exec("UPDATE TypicaFeatures SET version = 5 WHERE feature = 'base-features'");
+            query = query.invalidate();
+        };
 		var DBUpdateSpecification = function() {
-                    var query = new QSqlQuery;
-                    query.exec("CREATE TABLE IF NOT EXISTS roasting_specification (\"time\" timestamp without time zone NOT NULL, item bigint NOT NULL, loss numeric, tolerance numeric, notes text)");
-                    query.exec("UPDATE TypicaFeatures SET version = 6 WHERE feature = 'base-features'");
-                    query = query.invalidate();
-                };
-                
-		query = new QSqlQuery();
-		/* A table keeps track of database versioning information. This table is created
-		   if required. */
-		query.exec("CREATE TABLE IF NOT EXISTS TypicaFeatures (feature TEXT PRIMARY KEY, enabled boolean, version bigint)");
-		/* At the moment everything we're interested in is covered in the base-features
-		   row, but this can be extended later if needed. Each row encodes if certain
-		database structures exist and what version of those structures exist. */
-		query.exec("SELECT feature, enabled, version FROM TypicaFeatures WHERE feature = 'base-features'");
-		if(query.next())
-		{
-                    if(query.value(2) < 1)
-                    {
-                            DBCreateBase();
-                    }
-                    if(query.value(2) < 2)
-                    {
-                            DBUpdateMultiUser();
-                            DBUpdateHistory();
-                    }
-                    if(query.value(2) < 3)
-                    {
-                            DBUpdateNotifications();
-                    }
-                    if(query.value(2) < 4)
-                    {
-                            DBUpdateTriggers();
-                    }
-                    if(query.value(2) < 5)
-                    {
-                        DBUpdateReminders();
-                    }
-                    if(query.value(2) < 6)
-                    {
-                        DBUpdateSpecification();
-                    }
-		}
-		else
-		{
-			DBCreateBase();
-		}
-		query.exec("SELECT feature, enabled, version FROM TypicaFeatures WHERE feature = 'sample-roasting'");
-		if(query.next())
-		{
-			if(query.value(2) < 1)
+            var query = new QSqlQuery;
+            query.exec("CREATE TABLE IF NOT EXISTS roasting_specification (\"time\" timestamp without time zone NOT NULL, item bigint NOT NULL, loss numeric, tolerance numeric, notes text)");
+            query.exec("UPDATE TypicaFeatures SET version = 6 WHERE feature = 'base-features'");
+            query = query.invalidate();
+        };
+		
+		/* Updates for Typica version 1.8 */
+		var DBUpdate18 = function() {
+			var query = new QSqlQuery;
+			/* Create a table for Typica users login data */
+			query.exec("CREATE TABLE IF NOT EXISTS typica_users(name TEXT PRIMARY KEY NOT NULL, password TEXT, active boolean NOT NULL, auto_login boolean NOT NULL)");
+			/* Update session user logging to only use the database user when a Typica user is not explicitly provided. This maintains compatibility for mixed version use. */
+			query.exec("CREATE OR REPLACE FUNCTION log_session_user() RETURNS trigger AS $$ BEGIN IF NEW.person IS NULL THEN NEW.person := session_user; END IF; RETURN NEW; END; $$ LANGUAGE plpgsql");
+			
+			/* Uncomment before release */
+			// query.exec("UPDATE TypicaFeatures SET version = 7 WHERE feature = 'base-features'");
+			query = query.invalidate();
+		};
+		if(Application.databaseConnected()) {
+			query = new QSqlQuery();
+			/* A table keeps track of database versioning information. This
+			   table is created
+			   if required. */
+			query.exec("CREATE TABLE IF NOT EXISTS TypicaFeatures (feature TEXT PRIMARY KEY, enabled boolean, version bigint)");
+			query.exec("SELECT feature, enabled, version FROM TypicaFeatures WHERE feature = 'sample-roasting'");
+			if(query.next())
+			{
+				if(query.value(2) < 1)
+				{
+					DBCreateSampleRoasting();
+				}
+			}
+			else
 			{
 				DBCreateSampleRoasting();
 			}
+			query.exec("SELECT feature, enabled, version FROM TypicaFeatures WHERE feature = 'base-features'");
+			if(query.next())
+			{
+				if(query.value(2) < 1)
+				{
+				        DBCreateBase();
+				}
+				if(query.value(2) < 2)
+				{
+			        DBUpdateMultiUser();
+			        DBUpdateHistory();
+				}
+				if(query.value(2) < 3)
+				{
+			        DBUpdateNotifications();
+				}
+				if(query.value(2) < 4)
+				{
+			        DBUpdateTriggers();
+				}
+				if(query.value(2) < 5)
+				{
+				    DBUpdateReminders();
+				}
+				if(query.value(2) < 6)
+				{
+					DBUpdateSpecification();
+				}
+				if(query.value(2) < 7) {
+					DBUpdate18();
+				}
+			}
+			else
+			{
+				DBCreateBase();
+			}
+			query = query.invalidate();
 		}
-		else
-		{
-			DBCreateSampleRoasting();
-		}
-		query = query.invalidate();
         ]]>
     </program>
 </window>

src/typica.w

@@ -1079,7 +1079,10 @@ class ScriptQMainWindow : public QMainWindow@/
 ScriptQMainWindow::ScriptQMainWindow()@+: QMainWindow(NULL),
     cprompt(tr("Closing this window may result in loss of data. Continue?"))@/
 {
-    /* Nothing needs to be done here. */
+    if(!AppInstance->databaseConnected())
+    {
+	    statusBar()->addWidget(new QLabel(tr("Not connected to database")));
+    }
 }
 
 void ScriptQMainWindow::saveSizeAndPosition(const QString &key)
@@ -12822,19 +12825,23 @@ class Application : public QApplication@/
         QDomDocument* configuration();
         @<Device configuration members@>@;
         QSqlDatabase database();
+        Q_INVOKABLE bool databaseConnected();
         QScriptEngine *engine;@/
     @[public slots@]:@/
+	    void setDatabaseConnected(bool status);
         @<Extended Application slots@>@;
     private:@/
         @<Application private data members@>@;
         QDomDocument conf;
+        bool connectionStatus;
 };
 
 @ The constructor for this class handles a few things that had previously been
 handled in |main()|.
 
 @<Application Implementation@>=
-Application::Application(int &argc, char **argv) : QApplication(argc, argv)@/
+Application::Application(int &argc, char **argv) : QApplication(argc, argv),
+	connectionStatus(false)@/
 {
     @<Allow use of the default QSettings constructor@>@;
     @<Load translation objects@>@;
@@ -12902,6 +12909,20 @@ QSqlDatabase Application::database()
     return QSqlDatabase::cloneDatabase(connection, QString(connectionName));
 }
 
+@ Starting with version 1.8 there are methods for determining if a connection
+to the database was successfully established when Typica was opened.
+
+@<Application Implementation@>=
+void Application::setDatabaseConnected(bool status)
+{
+	connectionStatus = status;
+}
+
+bool Application::databaseConnected()
+{
+	return connectionStatus;
+}
+
 @** Table editor for ordered arrays with SQL relations.
 
 \noindent A database in use at Wilson's Coffee \char'046~Tea stores information
@@ -13786,6 +13807,7 @@ void SqlConnectionSetup::testConnection()
         settings.setValue("database/user", user->text());
         settings.setValue("database/password", password->text());
         database.close();
+        AppInstance->setDatabaseConnected(true);
         accept();
     }
     else
@@ -13825,6 +13847,7 @@ if(!database.open())
 else
 {
     database.close();
+    AppInstance->setDatabaseConnected(true);
 }
 
 @** Viewing a record of batches.