diff --git a/uppdev/sqlite3sch/schema.sch b/uppdev/sqlite3sch/schema.sch index 37148e851..edb7a691f 100644 --- a/uppdev/sqlite3sch/schema.sch +++ b/uppdev/sqlite3sch/schema.sch @@ -1,14 +1,5 @@ -TABLE_(SUPPLIER) - INT_ (ID) PRIMARY_KEY AUTO_INCREMENT - STRING_ (NAME, 80) NOT_NULL SQLDEFAULT("") - STRING_ (ADDRESS1, 128) - STRING_ (ADDRESS2, 128) - STRING_ (CITY, 128) - STRING_ (STATE, 80) - STRING_ (POSTAL_CODE, 24) - STRING_ (PRIMARY_PHONE, 35) - STRING_ (SECONDARY_PHONE, 35) - STRING_ (EMAIL, 128) - STRING_ (WEB_ADDRESS, 500) - BLOB_ (DESCRIPTION) -END_TABLE +TABLE_(PERSON) + INT_ (ID) PRIMARY_KEY AUTO_INCREMENT + STRING_ (NAME, 80) NOT_NULL SQLDEFAULT("") + STRING_ (ADDRESS, 128) +END_TABLE diff --git a/uppdev/sqlite3sch/sqlite3sch.cpp b/uppdev/sqlite3sch/sqlite3sch.cpp index 826a60bbd..a6ef40cdf 100644 --- a/uppdev/sqlite3sch/sqlite3sch.cpp +++ b/uppdev/sqlite3sch/sqlite3sch.cpp @@ -1,35 +1,45 @@ -#include -#include - -using namespace Upp; - -#define SCHEMADIALECT -#define MODEL -#include "Sql/sch_header.h" - -#include -#include - -CONSOLE_APP_MAIN -{ - Sqlite3Session sqlite3; - if(!sqlite3.Open(ConfigFile("simple.db"))) { - Cout() << "Can't create or open database file\n"; - return; - } - -#ifdef _DEBUG - sqlite3.SetTrace(); -#endif - - - SQL = sqlite3; - - SQL.Execute("drop table SUPPLIER"); - - SqlSchema sch(SQLITE3); - All_Tables(sch); - SqlPerformScript(sch.Upgrade()); - SqlPerformScript(sch.Attributes()); - SQL.ClearError(); -} +#include +#include + +using namespace Upp; + +#define SCHEMADIALECT +#define MODEL +#include "Sql/sch_header.h" + +#include +#include + +CONSOLE_APP_MAIN +{ + Sqlite3Session sqlite3; + if(!sqlite3.Open(ConfigFile("simple.db"))) { + Cout() << "Can't create or open database file\n"; + return; + } + +#ifdef _DEBUG + sqlite3.SetTrace(); +#endif + + + SQL = sqlite3; + + SQL.Execute("drop table PERSON"); + + SqlSchema sch(SQLITE3); + All_Tables(sch); + SqlPerformScript(sch.Upgrade()); + SqlPerformScript(sch.Attributes()); + SQL.ClearError(); + + { + SqlMassInsert ins(PERSON); + ins(NAME, "a name")(ADDRESS, "an address").EndRow(); + } + + DDUMP(SQL ^ Select(ADDRESS, NAME).From(PERSON)); + Value v = SQL ^ Select(ADDRESS, NAME).From(PERSON); + DDUMP(v[ADDRESS]); + DDUMP(v[NAME]); +}