From cae2c0998fe58d363eec88af4f95ec8283687a3b Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Tue, 3 Feb 2009 16:40:24 +0000
Subject: [PATCH] reference SqlExp, SqlArray fixes

git-svn-id: svn://ultimatepp.org/upp/trunk@834 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 reference/SqlArray/main.cpp | 140 ++++++++++++++++++------------------
 reference/SqlExp/SqlExp.cpp |   2 +-
 reference/SqlExp/SqlExp.upp |   4 +-
 3 files changed, 73 insertions(+), 73 deletions(-)

diff --git a/reference/SqlArray/main.cpp b/reference/SqlArray/main.cpp
index 2ebcb4eac..bb97a86fd 100644
--- a/reference/SqlArray/main.cpp
+++ b/reference/SqlArray/main.cpp
@@ -1,70 +1,70 @@
-#include <SqlCtrl/SqlCtrl.h>
-#include <plugin/sqlite3/Sqlite3.h>
-
-using namespace Upp;
-
-#define MODEL <SQLArray/db.sch>
-
-#define SCHEMADIALECT <plugin/sqlite3/Sqlite3Schema.h>
-#include "Sql/sch_header.h"
-
-#define SCHEMADIALECT <plugin/sqlite3/Sqlite3Schema.h>
-#include "Sql/sch_source.h"
-
-#define SCHEMADIALECT <plugin/sqlite3/Sqlite3Schema.h>
-#include "Sql/sch_schema.h"
-
-#define LAYOUTFILE <SqlArray/app.lay>
-#include <CtrlCore/lay.h>
-
-
-struct App : public WithAppLayout<TopWindow> {
-	EditString author;
-	EditString title;
-	EditString person;
-
-	App() {
-		CtrlLayout(*this, "SqlArray SQL table editing example");
-		master.SetTable(BOOK);
-		master.AddKey(ID);
-		master.AddColumn(AUTHOR, "Author").Edit(author);
-		master.AddColumn(TITLE, "Title").Edit(title);
-		master.Appending().Removing();
-		master.SetOrderBy(AUTHOR, TITLE);
-		
-		detail.SetTable(BORROW_RECORD);
-		detail.AddKey(ID);
-		detail.Join(BOOK_ID, master);
-		detail.AddColumn(PERSON, "Borrowed by").Edit(person);
-		detail.AddCtrl(BORROWED, borrowed);
-		detail.AddCtrl(RETURNED, returned);
-		detail.Appending().Removing();
-		detail.SetOrderBy(PERSON);
-		
-		master.Query();
-	}
-};
-
-GUI_APP_MAIN
-{
-	Sqlite3Session sqlite3;
-	if(!sqlite3.Open(ConfigFile("simple.db"))) {
-		Exclamation("Can't create or open database file\n");
-		return;
-	}
-	SQL = sqlite3;
-	SqlSchema sch(SQLITE3);
-	sqlite3.SetTrace();
-	All_Tables(sch);
-	if(sch.ScriptChanged(SqlSchema::UPGRADE))
-		Sqlite3PerformScript(sch.Upgrade());
-	if(sch.ScriptChanged(SqlSchema::ATTRIBUTES))
-		Sqlite3PerformScript(sch.Attributes());
-	if(sch.ScriptChanged(SqlSchema::CONFIG)) {
-		Sqlite3PerformScript(sch.ConfigDrop());
-		Sqlite3PerformScript(sch.Config());
-	}
-	sqlite3.SetTrace();
-	
-	App().Run();
-}
+#include <SqlCtrl/SqlCtrl.h>
+#include <plugin/sqlite3/Sqlite3.h>
+
+using namespace Upp;
+
+#define MODEL <SqlArray/db.sch>
+
+#define SCHEMADIALECT <plugin/sqlite3/Sqlite3Schema.h>
+#include "Sql/sch_header.h"
+
+#define SCHEMADIALECT <plugin/sqlite3/Sqlite3Schema.h>
+#include "Sql/sch_source.h"
+
+#define SCHEMADIALECT <plugin/sqlite3/Sqlite3Schema.h>
+#include "Sql/sch_schema.h"
+
+#define LAYOUTFILE <SqlArray/app.lay>
+#include <CtrlCore/lay.h>
+
+
+struct App : public WithAppLayout<TopWindow> {
+	EditString author;
+	EditString title;
+	EditString person;
+
+	App() {
+		CtrlLayout(*this, "SqlArray SQL table editing example");
+		master.SetTable(BOOK);
+		master.AddKey(ID);
+		master.AddColumn(AUTHOR, "Author").Edit(author);
+		master.AddColumn(TITLE, "Title").Edit(title);
+		master.Appending().Removing();
+		master.SetOrderBy(AUTHOR, TITLE);
+		
+		detail.SetTable(BORROW_RECORD);
+		detail.AddKey(ID);
+		detail.Join(BOOK_ID, master);
+		detail.AddColumn(PERSON, "Borrowed by").Edit(person);
+		detail.AddCtrl(BORROWED, borrowed);
+		detail.AddCtrl(RETURNED, returned);
+		detail.Appending().Removing();
+		detail.SetOrderBy(PERSON);
+		
+		master.Query();
+	}
+};
+
+GUI_APP_MAIN
+{
+	Sqlite3Session sqlite3;
+	if(!sqlite3.Open(ConfigFile("simple.db"))) {
+		Exclamation("Can't create or open database file\n");
+		return;
+	}
+	SQL = sqlite3;
+	SqlSchema sch(SQLITE3);
+	sqlite3.SetTrace();
+	All_Tables(sch);
+	if(sch.ScriptChanged(SqlSchema::UPGRADE))
+		Sqlite3PerformScript(sch.Upgrade());
+	if(sch.ScriptChanged(SqlSchema::ATTRIBUTES))
+		Sqlite3PerformScript(sch.Attributes());
+	if(sch.ScriptChanged(SqlSchema::CONFIG)) {
+		Sqlite3PerformScript(sch.ConfigDrop());
+		Sqlite3PerformScript(sch.Config());
+	}
+	sqlite3.SetTrace();
+	
+	App().Run();
+}
diff --git a/reference/SqlExp/SqlExp.cpp b/reference/SqlExp/SqlExp.cpp
index e632c36cf..a4e2e27b5 100644
--- a/reference/SqlExp/SqlExp.cpp
+++ b/reference/SqlExp/SqlExp.cpp
@@ -57,7 +57,7 @@ void Exp(const char *s, SqlStatement sql)
 }
 #endif
 
-CONSOLE_APP_MAIN
+GUI_APP_MAIN
 {
 #ifdef GENERATE_QTF
 	qtf << "[C1 {{1:1 SqlExp C`+`+:: PostgreSQL";
diff --git a/reference/SqlExp/SqlExp.upp b/reference/SqlExp/SqlExp.upp
index f06d9e447..c88e36cac 100644
--- a/reference/SqlExp/SqlExp.upp
+++ b/reference/SqlExp/SqlExp.upp
@@ -9,6 +9,6 @@ file
 	SqlExp.cpp;
 
 mainconfig
-	"" = "",
-	"" = "QTF";
+	"" = "GUI",
+	"" = "GUI QTF";