From: <sie...@us...> - 2013-12-08 03:00:30
|
Revision: 5484 http://sourceforge.net/p/moneymanagerex/code/5484 Author: siena123 Date: 2013-12-08 03:00:27 +0000 (Sun, 08 Dec 2013) Log Message: ----------- create table indexes for previously created databases Modified Paths: -------------- branches/version_1.0.0.0/src/db/DB_Table.h branches/version_1.0.0.0/src/db/DB_Table_Accountlist_V1.h branches/version_1.0.0.0/src/db/DB_Table_Assets_V1.h branches/version_1.0.0.0/src/db/DB_Table_Billsdeposits_V1.h branches/version_1.0.0.0/src/db/DB_Table_Budgetsplittransactions_V1.h branches/version_1.0.0.0/src/db/DB_Table_Budgettable_V1.h branches/version_1.0.0.0/src/db/DB_Table_Budgetyear_V1.h branches/version_1.0.0.0/src/db/DB_Table_Category_V1.h branches/version_1.0.0.0/src/db/DB_Table_Checkingaccount_V1.h branches/version_1.0.0.0/src/db/DB_Table_Currencyformats_V1.h branches/version_1.0.0.0/src/db/DB_Table_Infotable_V1.h branches/version_1.0.0.0/src/db/DB_Table_Payee_V1.h branches/version_1.0.0.0/src/db/DB_Table_Setting_V1.h branches/version_1.0.0.0/src/db/DB_Table_Splittransactions_V1.h branches/version_1.0.0.0/src/db/DB_Table_Stock_V1.h branches/version_1.0.0.0/src/db/DB_Table_Subcategory_V1.h branches/version_1.0.0.0/util/sqlite2cpp.py Modified: branches/version_1.0.0.0/src/db/DB_Table.h =================================================================== --- branches/version_1.0.0.0/src/db/DB_Table.h 2013-12-08 02:14:15 UTC (rev 5483) +++ branches/version_1.0.0.0/src/db/DB_Table.h 2013-12-08 03:00:27 UTC (rev 5484) @@ -10,7 +10,7 @@ * @brief * * Revision History: - * AUTO GENERATED at 2013-11-21 23:51:10.170000. + * AUTO GENERATED at 2013-12-07 19:40:54.493000. * DO NOT EDIT! */ //============================================================================= Modified: branches/version_1.0.0.0/src/db/DB_Table_Accountlist_V1.h =================================================================== --- branches/version_1.0.0.0/src/db/DB_Table_Accountlist_V1.h 2013-12-08 02:14:15 UTC (rev 5483) +++ branches/version_1.0.0.0/src/db/DB_Table_Accountlist_V1.h 2013-12-08 03:00:27 UTC (rev 5484) @@ -10,7 +10,7 @@ * @brief * * Revision History: - * AUTO GENERATED at 2013-11-21 23:51:10.170000. + * AUTO GENERATED at 2013-12-07 19:40:54.493000. * DO NOT EDIT! */ //============================================================================= @@ -57,18 +57,19 @@ /** Creates the database table if the table does not exist*/ bool ensure(wxSQLite3Database* db) { - if (exists(db)) return true; + if (!exists(db)) + { + try + { + db->ExecuteUpdate("CREATE TABLE ACCOUNTLIST_V1(ACCOUNTID integer primary key, ACCOUNTNAME TEXT COLLATE NOCASE NOT NULL UNIQUE, ACCOUNTTYPE TEXT NOT NULL , ACCOUNTNUM TEXT, STATUS TEXT NOT NULL, NOTES TEXT , HELDAT TEXT , WEBSITE TEXT , CONTACTINFO TEXT, ACCESSINFO TEXT , INITIALBAL numeric , FAVORITEACCT TEXT NOT NULL, CURRENCYID integer NOT NULL)"); + } + catch(const wxSQLite3Exception &e) + { + wxLogError("ACCOUNTLIST_V1: Exception %s", e.GetMessage().c_str()); + return false; + } + } - try - { - db->ExecuteUpdate("CREATE TABLE ACCOUNTLIST_V1(ACCOUNTID integer primary key, ACCOUNTNAME TEXT COLLATE NOCASE NOT NULL UNIQUE, ACCOUNTTYPE TEXT NOT NULL , ACCOUNTNUM TEXT, STATUS TEXT NOT NULL, NOTES TEXT , HELDAT TEXT , WEBSITE TEXT , CONTACTINFO TEXT, ACCESSINFO TEXT , INITIALBAL numeric , FAVORITEACCT TEXT NOT NULL, CURRENCYID integer NOT NULL)"); - } - catch(const wxSQLite3Exception &e) - { - wxLogError("ACCOUNTLIST_V1: Exception %s", e.GetMessage().c_str()); - return false; - } - this->ensure_index(db); return true; @@ -78,7 +79,7 @@ { try { - db->ExecuteUpdate("CREATE INDEX IDX_ACCOUNTLIST_ACCOUNTTYPE ON ACCOUNTLIST_V1(ACCOUNTTYPE)"); + db->ExecuteUpdate("CREATE INDEX IF NOT EXISTS IDX_ACCOUNTLIST_ACCOUNTTYPE ON ACCOUNTLIST_V1(ACCOUNTTYPE)"); } catch(const wxSQLite3Exception &e) { Modified: branches/version_1.0.0.0/src/db/DB_Table_Assets_V1.h =================================================================== --- branches/version_1.0.0.0/src/db/DB_Table_Assets_V1.h 2013-12-08 02:14:15 UTC (rev 5483) +++ branches/version_1.0.0.0/src/db/DB_Table_Assets_V1.h 2013-12-08 03:00:27 UTC (rev 5484) @@ -10,7 +10,7 @@ * @brief * * Revision History: - * AUTO GENERATED at 2013-11-21 23:51:10.170000. + * AUTO GENERATED at 2013-12-07 19:40:54.493000. * DO NOT EDIT! */ //============================================================================= @@ -57,18 +57,19 @@ /** Creates the database table if the table does not exist*/ bool ensure(wxSQLite3Database* db) { - if (exists(db)) return true; + if (!exists(db)) + { + try + { + db->ExecuteUpdate("CREATE TABLE ASSETS_V1(ASSETID integer primary key, STARTDATE TEXT NOT NULL , ASSETNAME TEXT COLLATE NOCASE NOT NULL, VALUE numeric, VALUECHANGE TEXT, NOTES TEXT, VALUECHANGERATE numeric, ASSETTYPE TEXT)"); + } + catch(const wxSQLite3Exception &e) + { + wxLogError("ASSETS_V1: Exception %s", e.GetMessage().c_str()); + return false; + } + } - try - { - db->ExecuteUpdate("CREATE TABLE ASSETS_V1(ASSETID integer primary key, STARTDATE TEXT NOT NULL , ASSETNAME TEXT COLLATE NOCASE NOT NULL, VALUE numeric, VALUECHANGE TEXT, NOTES TEXT, VALUECHANGERATE numeric, ASSETTYPE TEXT)"); - } - catch(const wxSQLite3Exception &e) - { - wxLogError("ASSETS_V1: Exception %s", e.GetMessage().c_str()); - return false; - } - this->ensure_index(db); return true; @@ -78,7 +79,7 @@ { try { - db->ExecuteUpdate("CREATE INDEX IDX_ASSETS_ASSETTYPE ON ASSETS_V1(ASSETTYPE)"); + db->ExecuteUpdate("CREATE INDEX IF NOT EXISTS IDX_ASSETS_ASSETTYPE ON ASSETS_V1(ASSETTYPE)"); } catch(const wxSQLite3Exception &e) { Modified: branches/version_1.0.0.0/src/db/DB_Table_Billsdeposits_V1.h =================================================================== --- branches/version_1.0.0.0/src/db/DB_Table_Billsdeposits_V1.h 2013-12-08 02:14:15 UTC (rev 5483) +++ branches/version_1.0.0.0/src/db/DB_Table_Billsdeposits_V1.h 2013-12-08 03:00:27 UTC (rev 5484) @@ -10,7 +10,7 @@ * @brief * * Revision History: - * AUTO GENERATED at 2013-11-21 23:51:10.170000. + * AUTO GENERATED at 2013-12-07 19:40:54.493000. * DO NOT EDIT! */ //============================================================================= @@ -57,18 +57,19 @@ /** Creates the database table if the table does not exist*/ bool ensure(wxSQLite3Database* db) { - if (exists(db)) return true; + if (!exists(db)) + { + try + { + db->ExecuteUpdate("CREATE TABLE BILLSDEPOSITS_V1(BDID integer primary key, ACCOUNTID integer NOT NULL, TOACCOUNTID integer, PAYEEID integer NOT NULL, TRANSCODE TEXT NOT NULL, TRANSAMOUNT numeric NOT NULL, STATUS TEXT, TRANSACTIONNUMBER TEXT, NOTES TEXT, CATEGID integer, SUBCATEGID integer, TRANSDATE TEXT, FOLLOWUPID integer, TOTRANSAMOUNT numeric, REPEATS integer, NEXTOCCURRENCEDATE TEXT, NUMOCCURRENCES integer )"); + } + catch(const wxSQLite3Exception &e) + { + wxLogError("BILLSDEPOSITS_V1: Exception %s", e.GetMessage().c_str()); + return false; + } + } - try - { - db->ExecuteUpdate("CREATE TABLE BILLSDEPOSITS_V1(BDID integer primary key, ACCOUNTID integer NOT NULL, TOACCOUNTID integer, PAYEEID integer NOT NULL, TRANSCODE TEXT NOT NULL, TRANSAMOUNT numeric NOT NULL, STATUS TEXT, TRANSACTIONNUMBER TEXT, NOTES TEXT, CATEGID integer, SUBCATEGID integer, TRANSDATE TEXT, FOLLOWUPID integer, TOTRANSAMOUNT numeric, REPEATS integer, NEXTOCCURRENCEDATE TEXT, NUMOCCURRENCES integer )"); - } - catch(const wxSQLite3Exception &e) - { - wxLogError("BILLSDEPOSITS_V1: Exception %s", e.GetMessage().c_str()); - return false; - } - this->ensure_index(db); return true; @@ -78,7 +79,7 @@ { try { - db->ExecuteUpdate("CREATE INDEX IDX_BILLSDEPOSITS_ACCOUNT ON BILLSDEPOSITS_V1 (ACCOUNTID, TOACCOUNTID)"); + db->ExecuteUpdate("CREATE INDEX IF NOT EXISTS IDX_BILLSDEPOSITS_ACCOUNT ON BILLSDEPOSITS_V1 (ACCOUNTID, TOACCOUNTID)"); } catch(const wxSQLite3Exception &e) { Modified: branches/version_1.0.0.0/src/db/DB_Table_Budgetsplittransactions_V1.h =================================================================== --- branches/version_1.0.0.0/src/db/DB_Table_Budgetsplittransactions_V1.h 2013-12-08 02:14:15 UTC (rev 5483) +++ branches/version_1.0.0.0/src/db/DB_Table_Budgetsplittransactions_V1.h 2013-12-08 03:00:27 UTC (rev 5484) @@ -10,7 +10,7 @@ * @brief * * Revision History: - * AUTO GENERATED at 2013-11-21 23:51:10.170000. + * AUTO GENERATED at 2013-12-07 19:40:54.493000. * DO NOT EDIT! */ //============================================================================= @@ -57,18 +57,19 @@ /** Creates the database table if the table does not exist*/ bool ensure(wxSQLite3Database* db) { - if (exists(db)) return true; + if (!exists(db)) + { + try + { + db->ExecuteUpdate("CREATE TABLE BUDGETSPLITTRANSACTIONS_V1(SPLITTRANSID integer primary key, TRANSID integer NOT NULL, CATEGID integer, SUBCATEGID integer, SPLITTRANSAMOUNT numeric)"); + } + catch(const wxSQLite3Exception &e) + { + wxLogError("BUDGETSPLITTRANSACTIONS_V1: Exception %s", e.GetMessage().c_str()); + return false; + } + } - try - { - db->ExecuteUpdate("CREATE TABLE BUDGETSPLITTRANSACTIONS_V1(SPLITTRANSID integer primary key, TRANSID integer NOT NULL, CATEGID integer, SUBCATEGID integer, SPLITTRANSAMOUNT numeric)"); - } - catch(const wxSQLite3Exception &e) - { - wxLogError("BUDGETSPLITTRANSACTIONS_V1: Exception %s", e.GetMessage().c_str()); - return false; - } - this->ensure_index(db); return true; @@ -78,7 +79,7 @@ { try { - db->ExecuteUpdate("CREATE INDEX IDX_BUDGETSPLITTRANSACTIONS_TRANSID ON BUDGETSPLITTRANSACTIONS_V1(TRANSID)"); + db->ExecuteUpdate("CREATE INDEX IF NOT EXISTS IDX_BUDGETSPLITTRANSACTIONS_TRANSID ON BUDGETSPLITTRANSACTIONS_V1(TRANSID)"); } catch(const wxSQLite3Exception &e) { Modified: branches/version_1.0.0.0/src/db/DB_Table_Budgettable_V1.h =================================================================== --- branches/version_1.0.0.0/src/db/DB_Table_Budgettable_V1.h 2013-12-08 02:14:15 UTC (rev 5483) +++ branches/version_1.0.0.0/src/db/DB_Table_Budgettable_V1.h 2013-12-08 03:00:27 UTC (rev 5484) @@ -10,7 +10,7 @@ * @brief * * Revision History: - * AUTO GENERATED at 2013-11-21 23:51:10.170000. + * AUTO GENERATED at 2013-12-07 19:40:54.493000. * DO NOT EDIT! */ //============================================================================= @@ -57,18 +57,19 @@ /** Creates the database table if the table does not exist*/ bool ensure(wxSQLite3Database* db) { - if (exists(db)) return true; + if (!exists(db)) + { + try + { + db->ExecuteUpdate("CREATE TABLE BUDGETTABLE_V1(BUDGETENTRYID integer primary key, BUDGETYEARID integer, CATEGID integer, SUBCATEGID integer, PERIOD TEXT NOT NULL, AMOUNT numeric NOT NULL)"); + } + catch(const wxSQLite3Exception &e) + { + wxLogError("BUDGETTABLE_V1: Exception %s", e.GetMessage().c_str()); + return false; + } + } - try - { - db->ExecuteUpdate("CREATE TABLE BUDGETTABLE_V1(BUDGETENTRYID integer primary key, BUDGETYEARID integer, CATEGID integer, SUBCATEGID integer, PERIOD TEXT NOT NULL, AMOUNT numeric NOT NULL)"); - } - catch(const wxSQLite3Exception &e) - { - wxLogError("BUDGETTABLE_V1: Exception %s", e.GetMessage().c_str()); - return false; - } - this->ensure_index(db); return true; @@ -78,7 +79,7 @@ { try { - db->ExecuteUpdate("CREATE INDEX IDX_BUDGETTABLE_BUDGETYEARID ON BUDGETTABLE_V1(BUDGETYEARID)"); + db->ExecuteUpdate("CREATE INDEX IF NOT EXISTS IDX_BUDGETTABLE_BUDGETYEARID ON BUDGETTABLE_V1(BUDGETYEARID)"); } catch(const wxSQLite3Exception &e) { Modified: branches/version_1.0.0.0/src/db/DB_Table_Budgetyear_V1.h =================================================================== --- branches/version_1.0.0.0/src/db/DB_Table_Budgetyear_V1.h 2013-12-08 02:14:15 UTC (rev 5483) +++ branches/version_1.0.0.0/src/db/DB_Table_Budgetyear_V1.h 2013-12-08 03:00:27 UTC (rev 5484) @@ -10,7 +10,7 @@ * @brief * * Revision History: - * AUTO GENERATED at 2013-11-21 23:51:10.170000. + * AUTO GENERATED at 2013-12-07 19:40:54.493000. * DO NOT EDIT! */ //============================================================================= @@ -57,18 +57,19 @@ /** Creates the database table if the table does not exist*/ bool ensure(wxSQLite3Database* db) { - if (exists(db)) return true; + if (!exists(db)) + { + try + { + db->ExecuteUpdate("CREATE TABLE BUDGETYEAR_V1(BUDGETYEARID integer primary key, BUDGETYEARNAME TEXT NOT NULL UNIQUE)"); + } + catch(const wxSQLite3Exception &e) + { + wxLogError("BUDGETYEAR_V1: Exception %s", e.GetMessage().c_str()); + return false; + } + } - try - { - db->ExecuteUpdate("CREATE TABLE BUDGETYEAR_V1(BUDGETYEARID integer primary key, BUDGETYEARNAME TEXT NOT NULL UNIQUE)"); - } - catch(const wxSQLite3Exception &e) - { - wxLogError("BUDGETYEAR_V1: Exception %s", e.GetMessage().c_str()); - return false; - } - this->ensure_index(db); return true; @@ -78,7 +79,7 @@ { try { - db->ExecuteUpdate("CREATE INDEX IDX_BUDGETYEAR_BUDGETYEARNAME ON BUDGETYEAR_V1(BUDGETYEARNAME)"); + db->ExecuteUpdate("CREATE INDEX IF NOT EXISTS IDX_BUDGETYEAR_BUDGETYEARNAME ON BUDGETYEAR_V1(BUDGETYEARNAME)"); } catch(const wxSQLite3Exception &e) { Modified: branches/version_1.0.0.0/src/db/DB_Table_Category_V1.h =================================================================== --- branches/version_1.0.0.0/src/db/DB_Table_Category_V1.h 2013-12-08 02:14:15 UTC (rev 5483) +++ branches/version_1.0.0.0/src/db/DB_Table_Category_V1.h 2013-12-08 03:00:27 UTC (rev 5484) @@ -10,7 +10,7 @@ * @brief * * Revision History: - * AUTO GENERATED at 2013-11-21 23:51:10.170000. + * AUTO GENERATED at 2013-12-07 19:40:54.493000. * DO NOT EDIT! */ //============================================================================= @@ -57,18 +57,19 @@ /** Creates the database table if the table does not exist*/ bool ensure(wxSQLite3Database* db) { - if (exists(db)) return true; + if (!exists(db)) + { + try + { + db->ExecuteUpdate("CREATE TABLE CATEGORY_V1(CATEGID integer primary key, CATEGNAME TEXT COLLATE NOCASE NOT NULL UNIQUE)"); + } + catch(const wxSQLite3Exception &e) + { + wxLogError("CATEGORY_V1: Exception %s", e.GetMessage().c_str()); + return false; + } + } - try - { - db->ExecuteUpdate("CREATE TABLE CATEGORY_V1(CATEGID integer primary key, CATEGNAME TEXT COLLATE NOCASE NOT NULL UNIQUE)"); - } - catch(const wxSQLite3Exception &e) - { - wxLogError("CATEGORY_V1: Exception %s", e.GetMessage().c_str()); - return false; - } - this->ensure_index(db); return true; @@ -78,7 +79,7 @@ { try { - db->ExecuteUpdate("CREATE INDEX IDX_CATEGORY_CATEGNAME ON CATEGORY_V1(CATEGNAME)"); + db->ExecuteUpdate("CREATE INDEX IF NOT EXISTS IDX_CATEGORY_CATEGNAME ON CATEGORY_V1(CATEGNAME)"); } catch(const wxSQLite3Exception &e) { Modified: branches/version_1.0.0.0/src/db/DB_Table_Checkingaccount_V1.h =================================================================== --- branches/version_1.0.0.0/src/db/DB_Table_Checkingaccount_V1.h 2013-12-08 02:14:15 UTC (rev 5483) +++ branches/version_1.0.0.0/src/db/DB_Table_Checkingaccount_V1.h 2013-12-08 03:00:27 UTC (rev 5484) @@ -10,7 +10,7 @@ * @brief * * Revision History: - * AUTO GENERATED at 2013-11-21 23:51:10.170000. + * AUTO GENERATED at 2013-12-07 19:40:54.493000. * DO NOT EDIT! */ //============================================================================= @@ -57,18 +57,19 @@ /** Creates the database table if the table does not exist*/ bool ensure(wxSQLite3Database* db) { - if (exists(db)) return true; + if (!exists(db)) + { + try + { + db->ExecuteUpdate("CREATE TABLE CHECKINGACCOUNT_V1(TRANSID integer primary key, ACCOUNTID integer NOT NULL, TOACCOUNTID integer, PAYEEID integer NOT NULL, TRANSCODE TEXT NOT NULL, TRANSAMOUNT numeric NOT NULL, STATUS TEXT, TRANSACTIONNUMBER TEXT, NOTES TEXT, CATEGID integer, SUBCATEGID integer, TRANSDATE TEXT, FOLLOWUPID integer, TOTRANSAMOUNT numeric)"); + } + catch(const wxSQLite3Exception &e) + { + wxLogError("CHECKINGACCOUNT_V1: Exception %s", e.GetMessage().c_str()); + return false; + } + } - try - { - db->ExecuteUpdate("CREATE TABLE CHECKINGACCOUNT_V1(TRANSID integer primary key, ACCOUNTID integer NOT NULL, TOACCOUNTID integer, PAYEEID integer NOT NULL, TRANSCODE TEXT NOT NULL, TRANSAMOUNT numeric NOT NULL, STATUS TEXT, TRANSACTIONNUMBER TEXT, NOTES TEXT, CATEGID integer, SUBCATEGID integer, TRANSDATE TEXT, FOLLOWUPID integer, TOTRANSAMOUNT numeric)"); - } - catch(const wxSQLite3Exception &e) - { - wxLogError("CHECKINGACCOUNT_V1: Exception %s", e.GetMessage().c_str()); - return false; - } - this->ensure_index(db); return true; @@ -78,8 +79,8 @@ { try { - db->ExecuteUpdate("CREATE INDEX IDX_CHECKINGACCOUNT_ACCOUNT ON CHECKINGACCOUNT_V1 (ACCOUNTID, TOACCOUNTID)"); - db->ExecuteUpdate("CREATE INDEX IDX_CHECKINGACCOUNT_TRANSDATE ON CHECKINGACCOUNT_V1 (TRANSDATE)"); + db->ExecuteUpdate("CREATE INDEX IF NOT EXISTS IDX_CHECKINGACCOUNT_ACCOUNT ON CHECKINGACCOUNT_V1 (ACCOUNTID, TOACCOUNTID)"); + db->ExecuteUpdate("CREATE INDEX IF NOT EXISTS IDX_CHECKINGACCOUNT_TRANSDATE ON CHECKINGACCOUNT_V1 (TRANSDATE)"); } catch(const wxSQLite3Exception &e) { Modified: branches/version_1.0.0.0/src/db/DB_Table_Currencyformats_V1.h =================================================================== --- branches/version_1.0.0.0/src/db/DB_Table_Currencyformats_V1.h 2013-12-08 02:14:15 UTC (rev 5483) +++ branches/version_1.0.0.0/src/db/DB_Table_Currencyformats_V1.h 2013-12-08 03:00:27 UTC (rev 5484) @@ -10,7 +10,7 @@ * @brief * * Revision History: - * AUTO GENERATED at 2013-11-21 23:51:10.170000. + * AUTO GENERATED at 2013-12-07 19:40:54.493000. * DO NOT EDIT! */ //============================================================================= @@ -57,18 +57,19 @@ /** Creates the database table if the table does not exist*/ bool ensure(wxSQLite3Database* db) { - if (exists(db)) return true; + if (!exists(db)) + { + try + { + db->ExecuteUpdate("CREATE TABLE CURRENCYFORMATS_V1(CURRENCYID integer primary key, CURRENCYNAME TEXT COLLATE NOCASE COLLATE NOCASE NOT NULL UNIQUE, PFX_SYMBOL TEXT, SFX_SYMBOL TEXT, DECIMAL_POINT TEXT, GROUP_SEPARATOR TEXT, UNIT_NAME TEXT COLLATE NOCASE, CENT_NAME TEXT COLLATE NOCASE, SCALE integer, BASECONVRATE numeric, CURRENCY_SYMBOL TEXT)"); + } + catch(const wxSQLite3Exception &e) + { + wxLogError("CURRENCYFORMATS_V1: Exception %s", e.GetMessage().c_str()); + return false; + } + } - try - { - db->ExecuteUpdate("CREATE TABLE CURRENCYFORMATS_V1(CURRENCYID integer primary key, CURRENCYNAME TEXT COLLATE NOCASE COLLATE NOCASE NOT NULL UNIQUE, PFX_SYMBOL TEXT, SFX_SYMBOL TEXT, DECIMAL_POINT TEXT, GROUP_SEPARATOR TEXT, UNIT_NAME TEXT COLLATE NOCASE, CENT_NAME TEXT COLLATE NOCASE, SCALE integer, BASECONVRATE numeric, CURRENCY_SYMBOL TEXT)"); - } - catch(const wxSQLite3Exception &e) - { - wxLogError("CURRENCYFORMATS_V1: Exception %s", e.GetMessage().c_str()); - return false; - } - this->ensure_index(db); return true; @@ -78,7 +79,7 @@ { try { - db->ExecuteUpdate("CREATE INDEX IDX_CURRENCYFORMATS_SYMBOL ON CURRENCYFORMATS_V1(CURRENCY_SYMBOL)"); + db->ExecuteUpdate("CREATE INDEX IF NOT EXISTS IDX_CURRENCYFORMATS_SYMBOL ON CURRENCYFORMATS_V1(CURRENCY_SYMBOL)"); } catch(const wxSQLite3Exception &e) { Modified: branches/version_1.0.0.0/src/db/DB_Table_Infotable_V1.h =================================================================== --- branches/version_1.0.0.0/src/db/DB_Table_Infotable_V1.h 2013-12-08 02:14:15 UTC (rev 5483) +++ branches/version_1.0.0.0/src/db/DB_Table_Infotable_V1.h 2013-12-08 03:00:27 UTC (rev 5484) @@ -10,7 +10,7 @@ * @brief * * Revision History: - * AUTO GENERATED at 2013-11-21 23:51:10.170000. + * AUTO GENERATED at 2013-12-07 19:40:54.493000. * DO NOT EDIT! */ //============================================================================= @@ -57,18 +57,19 @@ /** Creates the database table if the table does not exist*/ bool ensure(wxSQLite3Database* db) { - if (exists(db)) return true; + if (!exists(db)) + { + try + { + db->ExecuteUpdate("CREATE TABLE INFOTABLE_V1(INFOID integer not null primary key, INFONAME TEXT COLLATE NOCASE NOT NULL UNIQUE, INFOVALUE TEXT NOT NULL)"); + } + catch(const wxSQLite3Exception &e) + { + wxLogError("INFOTABLE_V1: Exception %s", e.GetMessage().c_str()); + return false; + } + } - try - { - db->ExecuteUpdate("CREATE TABLE INFOTABLE_V1(INFOID integer not null primary key, INFONAME TEXT COLLATE NOCASE NOT NULL UNIQUE, INFOVALUE TEXT NOT NULL)"); - } - catch(const wxSQLite3Exception &e) - { - wxLogError("INFOTABLE_V1: Exception %s", e.GetMessage().c_str()); - return false; - } - this->ensure_index(db); return true; @@ -78,7 +79,7 @@ { try { - db->ExecuteUpdate("CREATE INDEX IDX_INFOTABLE_INFONAME ON INFOTABLE_V1(INFONAME)"); + db->ExecuteUpdate("CREATE INDEX IF NOT EXISTS IDX_INFOTABLE_INFONAME ON INFOTABLE_V1(INFONAME)"); } catch(const wxSQLite3Exception &e) { Modified: branches/version_1.0.0.0/src/db/DB_Table_Payee_V1.h =================================================================== --- branches/version_1.0.0.0/src/db/DB_Table_Payee_V1.h 2013-12-08 02:14:15 UTC (rev 5483) +++ branches/version_1.0.0.0/src/db/DB_Table_Payee_V1.h 2013-12-08 03:00:27 UTC (rev 5484) @@ -10,7 +10,7 @@ * @brief * * Revision History: - * AUTO GENERATED at 2013-11-21 23:51:10.170000. + * AUTO GENERATED at 2013-12-07 19:40:54.493000. * DO NOT EDIT! */ //============================================================================= @@ -57,18 +57,19 @@ /** Creates the database table if the table does not exist*/ bool ensure(wxSQLite3Database* db) { - if (exists(db)) return true; + if (!exists(db)) + { + try + { + db->ExecuteUpdate("CREATE TABLE PAYEE_V1(PAYEEID integer primary key, PAYEENAME TEXT COLLATE NOCASE NOT NULL UNIQUE, CATEGID integer, SUBCATEGID integer)"); + } + catch(const wxSQLite3Exception &e) + { + wxLogError("PAYEE_V1: Exception %s", e.GetMessage().c_str()); + return false; + } + } - try - { - db->ExecuteUpdate("CREATE TABLE PAYEE_V1(PAYEEID integer primary key, PAYEENAME TEXT COLLATE NOCASE NOT NULL UNIQUE, CATEGID integer, SUBCATEGID integer)"); - } - catch(const wxSQLite3Exception &e) - { - wxLogError("PAYEE_V1: Exception %s", e.GetMessage().c_str()); - return false; - } - this->ensure_index(db); return true; @@ -78,7 +79,7 @@ { try { - db->ExecuteUpdate("CREATE INDEX IDX_PAYEE_INFONAME ON PAYEE_V1(PAYEENAME)"); + db->ExecuteUpdate("CREATE INDEX IF NOT EXISTS IDX_PAYEE_INFONAME ON PAYEE_V1(PAYEENAME)"); } catch(const wxSQLite3Exception &e) { Modified: branches/version_1.0.0.0/src/db/DB_Table_Setting_V1.h =================================================================== --- branches/version_1.0.0.0/src/db/DB_Table_Setting_V1.h 2013-12-08 02:14:15 UTC (rev 5483) +++ branches/version_1.0.0.0/src/db/DB_Table_Setting_V1.h 2013-12-08 03:00:27 UTC (rev 5484) @@ -10,7 +10,7 @@ * @brief * * Revision History: - * AUTO GENERATED at 2013-11-21 23:51:10.170000. + * AUTO GENERATED at 2013-12-07 19:40:54.493000. * DO NOT EDIT! */ //============================================================================= @@ -57,18 +57,19 @@ /** Creates the database table if the table does not exist*/ bool ensure(wxSQLite3Database* db) { - if (exists(db)) return true; + if (!exists(db)) + { + try + { + db->ExecuteUpdate("CREATE TABLE SETTING_V1(SETTINGID integer not null primary key, SETTINGNAME TEXT COLLATE NOCASE NOT NULL UNIQUE, SETTINGVALUE TEXT)"); + } + catch(const wxSQLite3Exception &e) + { + wxLogError("SETTING_V1: Exception %s", e.GetMessage().c_str()); + return false; + } + } - try - { - db->ExecuteUpdate("CREATE TABLE SETTING_V1(SETTINGID integer not null primary key, SETTINGNAME TEXT COLLATE NOCASE NOT NULL UNIQUE, SETTINGVALUE TEXT)"); - } - catch(const wxSQLite3Exception &e) - { - wxLogError("SETTING_V1: Exception %s", e.GetMessage().c_str()); - return false; - } - this->ensure_index(db); return true; @@ -78,7 +79,7 @@ { try { - db->ExecuteUpdate("CREATE INDEX IDX_SETTING_SETTINGNAME ON SETTING_V1(SETTINGNAME)"); + db->ExecuteUpdate("CREATE INDEX IF NOT EXISTS IDX_SETTING_SETTINGNAME ON SETTING_V1(SETTINGNAME)"); } catch(const wxSQLite3Exception &e) { Modified: branches/version_1.0.0.0/src/db/DB_Table_Splittransactions_V1.h =================================================================== --- branches/version_1.0.0.0/src/db/DB_Table_Splittransactions_V1.h 2013-12-08 02:14:15 UTC (rev 5483) +++ branches/version_1.0.0.0/src/db/DB_Table_Splittransactions_V1.h 2013-12-08 03:00:27 UTC (rev 5484) @@ -10,7 +10,7 @@ * @brief * * Revision History: - * AUTO GENERATED at 2013-11-21 23:51:10.170000. + * AUTO GENERATED at 2013-12-07 19:40:54.493000. * DO NOT EDIT! */ //============================================================================= @@ -57,18 +57,19 @@ /** Creates the database table if the table does not exist*/ bool ensure(wxSQLite3Database* db) { - if (exists(db)) return true; + if (!exists(db)) + { + try + { + db->ExecuteUpdate("CREATE TABLE SPLITTRANSACTIONS_V1(SPLITTRANSID integer primary key, TRANSID integer NOT NULL, CATEGID integer, SUBCATEGID integer, SPLITTRANSAMOUNT numeric)"); + } + catch(const wxSQLite3Exception &e) + { + wxLogError("SPLITTRANSACTIONS_V1: Exception %s", e.GetMessage().c_str()); + return false; + } + } - try - { - db->ExecuteUpdate("CREATE TABLE SPLITTRANSACTIONS_V1(SPLITTRANSID integer primary key, TRANSID integer NOT NULL, CATEGID integer, SUBCATEGID integer, SPLITTRANSAMOUNT numeric)"); - } - catch(const wxSQLite3Exception &e) - { - wxLogError("SPLITTRANSACTIONS_V1: Exception %s", e.GetMessage().c_str()); - return false; - } - this->ensure_index(db); return true; @@ -78,7 +79,7 @@ { try { - db->ExecuteUpdate("CREATE INDEX IDX_SPLITTRANSACTIONS_TRANSID ON SPLITTRANSACTIONS_V1(TRANSID)"); + db->ExecuteUpdate("CREATE INDEX IF NOT EXISTS IDX_SPLITTRANSACTIONS_TRANSID ON SPLITTRANSACTIONS_V1(TRANSID)"); } catch(const wxSQLite3Exception &e) { Modified: branches/version_1.0.0.0/src/db/DB_Table_Stock_V1.h =================================================================== --- branches/version_1.0.0.0/src/db/DB_Table_Stock_V1.h 2013-12-08 02:14:15 UTC (rev 5483) +++ branches/version_1.0.0.0/src/db/DB_Table_Stock_V1.h 2013-12-08 03:00:27 UTC (rev 5484) @@ -10,7 +10,7 @@ * @brief * * Revision History: - * AUTO GENERATED at 2013-11-21 23:51:10.170000. + * AUTO GENERATED at 2013-12-07 19:40:54.493000. * DO NOT EDIT! */ //============================================================================= @@ -57,18 +57,19 @@ /** Creates the database table if the table does not exist*/ bool ensure(wxSQLite3Database* db) { - if (exists(db)) return true; + if (!exists(db)) + { + try + { + db->ExecuteUpdate("CREATE TABLE STOCK_V1(STOCKID integer primary key, HELDAT integer , PURCHASEDATE TEXT NOT NULL, STOCKNAME TEXT COLLATE NOCASE NOT NULL UNIQUE, SYMBOL TEXT, NUMSHARES numeric, PURCHASEPRICE numeric NOT NULL, NOTES TEXT, CURRENTPRICE numeric NOT NULL, VALUE numeric, COMMISSION numeric)"); + } + catch(const wxSQLite3Exception &e) + { + wxLogError("STOCK_V1: Exception %s", e.GetMessage().c_str()); + return false; + } + } - try - { - db->ExecuteUpdate("CREATE TABLE STOCK_V1(STOCKID integer primary key, HELDAT integer , PURCHASEDATE TEXT NOT NULL, STOCKNAME TEXT COLLATE NOCASE NOT NULL UNIQUE, SYMBOL TEXT, NUMSHARES numeric, PURCHASEPRICE numeric NOT NULL, NOTES TEXT, CURRENTPRICE numeric NOT NULL, VALUE numeric, COMMISSION numeric)"); - } - catch(const wxSQLite3Exception &e) - { - wxLogError("STOCK_V1: Exception %s", e.GetMessage().c_str()); - return false; - } - this->ensure_index(db); return true; @@ -78,7 +79,7 @@ { try { - db->ExecuteUpdate("CREATE INDEX IDX_STOCK_HELDAT ON STOCK_V1(HELDAT)"); + db->ExecuteUpdate("CREATE INDEX IF NOT EXISTS IDX_STOCK_HELDAT ON STOCK_V1(HELDAT)"); } catch(const wxSQLite3Exception &e) { Modified: branches/version_1.0.0.0/src/db/DB_Table_Subcategory_V1.h =================================================================== --- branches/version_1.0.0.0/src/db/DB_Table_Subcategory_V1.h 2013-12-08 02:14:15 UTC (rev 5483) +++ branches/version_1.0.0.0/src/db/DB_Table_Subcategory_V1.h 2013-12-08 03:00:27 UTC (rev 5484) @@ -10,7 +10,7 @@ * @brief * * Revision History: - * AUTO GENERATED at 2013-11-21 23:51:10.170000. + * AUTO GENERATED at 2013-12-07 19:40:54.493000. * DO NOT EDIT! */ //============================================================================= @@ -57,18 +57,19 @@ /** Creates the database table if the table does not exist*/ bool ensure(wxSQLite3Database* db) { - if (exists(db)) return true; + if (!exists(db)) + { + try + { + db->ExecuteUpdate("CREATE TABLE SUBCATEGORY_V1(SUBCATEGID integer primary key, SUBCATEGNAME TEXT COLLATE NOCASE NOT NULL, CATEGID integer NOT NULL, UNIQUE(CATEGID, SUBCATEGNAME))"); + } + catch(const wxSQLite3Exception &e) + { + wxLogError("SUBCATEGORY_V1: Exception %s", e.GetMessage().c_str()); + return false; + } + } - try - { - db->ExecuteUpdate("CREATE TABLE SUBCATEGORY_V1(SUBCATEGID integer primary key, SUBCATEGNAME TEXT COLLATE NOCASE NOT NULL, CATEGID integer NOT NULL, UNIQUE(CATEGID, SUBCATEGNAME))"); - } - catch(const wxSQLite3Exception &e) - { - wxLogError("SUBCATEGORY_V1: Exception %s", e.GetMessage().c_str()); - return false; - } - this->ensure_index(db); return true; @@ -78,7 +79,7 @@ { try { - db->ExecuteUpdate("CREATE INDEX IDX_SUBCATEGORY_CATEGID ON SUBCATEGORY_V1(CATEGID)"); + db->ExecuteUpdate("CREATE INDEX IF NOT EXISTS IDX_SUBCATEGORY_CATEGID ON SUBCATEGORY_V1(CATEGID)"); } catch(const wxSQLite3Exception &e) { Modified: branches/version_1.0.0.0/util/sqlite2cpp.py =================================================================== --- branches/version_1.0.0.0/util/sqlite2cpp.py 2013-12-08 02:14:15 UTC (rev 5483) +++ branches/version_1.0.0.0/util/sqlite2cpp.py 2013-12-08 03:00:27 UTC (rev 5484) @@ -116,18 +116,19 @@ /** Creates the database table if the table does not exist*/ bool ensure(wxSQLite3Database* db) { - if (exists(db)) return true; + if (!exists(db)) + { + try + { + db->ExecuteUpdate("%s"); + } + catch(const wxSQLite3Exception &e) + { + wxLogError("%s: Exception %%s", e.GetMessage().c_str()); + return false; + } + } - try - { - db->ExecuteUpdate("%s"); - } - catch(const wxSQLite3Exception &e) - { - wxLogError("%s: Exception %%s", e.GetMessage().c_str()); - return false; - } - this->ensure_index(db); return true; @@ -140,8 +141,13 @@ try {''' for i in self._index: + mi = i.split() + mi.insert(2, 'IF') + mi.insert(3, 'NOT') + mi.insert(4, 'EXISTS') + ni = ' '.join(mi) s += ''' - db->ExecuteUpdate("%s");''' % (i.replace('\n', '')) + db->ExecuteUpdate("%s");''' % (ni.replace('\n', '')) s += ''' } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |