IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Matthew Vanecek's patch:

Browse Source 
This patch corrects some compiler warnings from gcc 2.96.x, and it fixes
some malformed SQL pointed out by Christopher Browne.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@7762 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Derek Atkins 2003-01-03 18:22:07 +00:00
parent 7e731a19c3
commit 9faae84d6f
4 changed files with 48 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@ -1,3 +1,18 @@
2003-01-03 Matthew Vanecek <mevanecek@yahoo.com>
* src/backend/postgres/Postgresbackend.c: Fixed some compiler
warning messages about MODE_NONE and a some GUIDs used as
string pointers in informational messages.
* src/backend/postgres/test/test-db.c: Commented out the
"short module" declaration. It was not used and was causing a
compiler warning.
* src/backend/postgres/upgrade.c: Changed the "ALTER TABLE table
ADD COLUMN..." statements to conform to the current Postgres
implementation (and SQL 92) standard by putting the DEFAULT
modifier in a separate ALTER statement. This was reported by
Christopher B. Browne.
2003-01-02 David Hampton <hampton@employees.org> 2003-01-02 David Hampton <hampton@employees.org>
* src/report/report-system/html-utilities.scm: Fix malformed URLs * src/report/report-system/html-utilities.scm: Fix malformed URLs

18
src/backend/postgres/PostgresBackend.c
View File

@ -148,7 +148,7 @@ pgendAccountLookup (PGBackend *be, const GUID *acct_guid)
GList *node; GList *node;
Account * acc = NULL; Account * acc = NULL;
ENTER("guid = %s", acct_guid); ENTER("guid = %s", guid_to_string(acct_guid));
for (node=be->blist; node; node=node->next) for (node=be->blist; node; node=node->next)
{ {
GNCBook *book = node->data; GNCBook *book = node->data;
@ -166,7 +166,7 @@ pgendTransLookup (PGBackend *be, const GUID *txn_guid)
GList *node; GList *node;
Transaction * txn = NULL; Transaction * txn = NULL;
ENTER("guid = %s", txn_guid); ENTER("guid = %s", guid_to_string(txn_guid));
for (node=be->blist; node; node=node->next) for (node=be->blist; node; node=node->next)
{ {
GNCBook *book = node->data; GNCBook *book = node->data;
@ -184,7 +184,7 @@ pgendSplitLookup (PGBackend *be, const GUID *split_guid)
GList *node; GList *node;
Split * split = NULL; Split * split = NULL;
ENTER("guid = %s", split_guid); ENTER("guid = %s", guid_to_string(split_guid));
for (node=be->blist; node; node=node->next) for (node=be->blist; node; node=node->next)
{ {
GNCBook *book = node->data; GNCBook *book = node->data;
@ -202,7 +202,7 @@ pgendPriceLookup (PGBackend *be, const GUID *price_guid)
GList *node; GList *node;
GNCPrice * price = NULL; GNCPrice * price = NULL;
ENTER("guid = %s", price_guid); ENTER("guid = %s", guid_to_string(price_guid));
for (node=be->blist; node; node=node->next) for (node=be->blist; node; node=node->next)
{ {
GNCBook *book = node->data; GNCBook *book = node->data;
@ -219,7 +219,7 @@ pgendGUIDType (PGBackend *be, const GUID *guid)
GList *node; GList *node;
GNCIdType tip = GNC_ID_NONE; GNCIdType tip = GNC_ID_NONE;
ENTER("guid = %s", guid); ENTER("guid = %s", guid_to_string(guid));
for (node=be->blist; node; node=node->next) for (node=be->blist; node; node=node->next)
{ {
GNCBook *book = node->data; GNCBook *book = node->data;
@ -1137,6 +1137,9 @@ pgendSessionGetMode (PGBackend *be)
return "POLL"; return "POLL";
case MODE_EVENT: case MODE_EVENT:
return "EVENT"; return "EVENT";
/* quiet compiler warnings about MODE_NONE */
default:
return "ERROR";
} }
return "ERROR"; return "ERROR";
} }
@ -1632,11 +1635,11 @@ pgend_do_begin (Backend *bend, GNCIdTypeConst type, gpointer object)
case MODE_EVENT: case MODE_EVENT:
case MODE_POLL: case MODE_POLL:
case MODE_SINGLE_UPDATE: case MODE_SINGLE_UPDATE:
if (!safe_strcmp (type, GNC_ID_PRICE)) if (!safe_strcmp (type, GNC_ID_PRICE))
return pgend_price_begin_edit (bend, object); return pgend_price_begin_edit (bend, object);
case MODE_SINGLE_FILE: case MODE_SINGLE_FILE:
case MODE_NONE:
break; break;
} }
@ -1670,7 +1673,9 @@ pgend_do_commit (Backend *bend, GNCIdTypeConst type, gpointer object)
return pgend_account_commit_edit (bend, object); return pgend_account_commit_edit (bend, object);
case MODE_SINGLE_FILE: case MODE_SINGLE_FILE:
case MODE_NONE:
break; break;
} }
/* XXX: Add dynamic plug-in here */ /* XXX: Add dynamic plug-in here */
@ -1692,6 +1697,7 @@ pgend_do_rollback (Backend *bend, GNCIdTypeConst type, gpointer object)
case MODE_SINGLE_UPDATE: case MODE_SINGLE_UPDATE:
case MODE_SINGLE_FILE: case MODE_SINGLE_FILE:
case MODE_NONE:
break; break;
} }

3
src/backend/postgres/test/test-db.c
View File

@ -21,7 +21,8 @@
#include "test-stuff.h" #include "test-stuff.h"
#include "test-engine-stuff.h" #include "test-engine-stuff.h"
static short module = MOD_TEST; /* Prevent compiler warnings. Uncomment if LEAVE/WARN/et al get used*/
/* static short module = MOD_TEST; */
static void static void
save_xml_file (GNCSession *session, const char *filename_base) save_xml_file (GNCSession *session, const char *filename_base)

18
src/backend/postgres/upgrade.c
View File

@ -152,7 +152,8 @@ put_iguid_in_tables (PGBackend *be)
SEND_QUERY (be,buff, ); SEND_QUERY (be,buff, );
FINISH_QUERY(be->connection); FINISH_QUERY(be->connection);
p = "ALTER TABLE gncEntry ADD COLUMN iguid INT4 DEFAULT 0;\n" p = "ALTER TABLE gncEntry ADD COLUMN iguid INT4;\n"
"ALTER TABLE gncEntry ALTER COLUMN iguid set DEFAULT 0;\n"
"UPDATE gncEntry SET iguid = 0;\n" "UPDATE gncEntry SET iguid = 0;\n"
"UPDATE gncEntry SET iguid = gncGUIDCache.iguid " "UPDATE gncEntry SET iguid = gncGUIDCache.iguid "
@ -160,7 +161,8 @@ put_iguid_in_tables (PGBackend *be)
" WHERE gncGUIDCache.guid = gncEntry.entryGUID " " WHERE gncGUIDCache.guid = gncEntry.entryGUID "
" AND gncGUIDCache.iguid = gncKVPValue.iguid;\n" " AND gncGUIDCache.iguid = gncKVPValue.iguid;\n"
"ALTER TABLE gncEntryTrail ADD COLUMN iguid INT4 DEFAULT 0;\n" "ALTER TABLE gncEntryTrail ADD COLUMN iguid INT4;\n"
"ALTER TABLE gncEntryTrail ALTER COLUMN iguid set DEFAULT 0;\n"
"UPDATE gncEntryTrail SET iguid = 0;\n" "UPDATE gncEntryTrail SET iguid = 0;\n"
"UPDATE gncEntryTrail SET iguid = gncGUIDCache.iguid " "UPDATE gncEntryTrail SET iguid = gncGUIDCache.iguid "
@ -170,7 +172,8 @@ put_iguid_in_tables (PGBackend *be)
SEND_QUERY (be,p, ); SEND_QUERY (be,p, );
FINISH_QUERY(be->connection); FINISH_QUERY(be->connection);
p = "ALTER TABLE gncTransaction ADD COLUMN iguid INT4 DEFAULT 0;\n" p = "ALTER TABLE gncTransaction ADD COLUMN iguid INT4;\n"
"ALTER TABLE gncTransaction ALTER COLUMN iguid set DEFAULT 0;\n"
"UPDATE gncTransaction SET iguid = 0;\n" "UPDATE gncTransaction SET iguid = 0;\n"
"UPDATE gncTransaction SET iguid = gncGUIDCache.iguid " "UPDATE gncTransaction SET iguid = gncGUIDCache.iguid "
@ -178,7 +181,8 @@ put_iguid_in_tables (PGBackend *be)
" WHERE gncGUIDCache.guid = gncTransaction.transGUID " " WHERE gncGUIDCache.guid = gncTransaction.transGUID "
" AND gncGUIDCache.iguid = gncKVPValue.iguid;\n" " AND gncGUIDCache.iguid = gncKVPValue.iguid;\n"
"ALTER TABLE gncTransactionTrail ADD COLUMN iguid INT4 DEFAULT 0;\n" "ALTER TABLE gncTransactionTrail ADD COLUMN iguid INT4;\n"
"ALTER TABLE gncTransactionTrail ALTER COLUMN iguid set DEFAULT 0;\n"
"UPDATE gncTransactionTrail SET iguid = 0;\n" "UPDATE gncTransactionTrail SET iguid = 0;\n"
"UPDATE gncTransactionTrail SET iguid = gncGUIDCache.iguid " "UPDATE gncTransactionTrail SET iguid = gncGUIDCache.iguid "
@ -188,7 +192,8 @@ put_iguid_in_tables (PGBackend *be)
SEND_QUERY (be,p, ); SEND_QUERY (be,p, );
FINISH_QUERY(be->connection); FINISH_QUERY(be->connection);
p = "ALTER TABLE gncAccount ADD COLUMN iguid INT4 DEFAULT 0;\n" p = "ALTER TABLE gncAccount ADD COLUMN iguid INT4;\n"
"ALTER TABLE gncAccount ALTER COLUMN iguid set DEFAULT 0;\n"
"UPDATE gncAccount SET iguid = 0;\n" "UPDATE gncAccount SET iguid = 0;\n"
"UPDATE gncAccount SET iguid = gncGUIDCache.iguid " "UPDATE gncAccount SET iguid = gncGUIDCache.iguid "
@ -196,7 +201,8 @@ put_iguid_in_tables (PGBackend *be)
" WHERE gncGUIDCache.guid = gncAccount.accountGUID " " WHERE gncGUIDCache.guid = gncAccount.accountGUID "
" AND gncGUIDCache.iguid = gncKVPValue.iguid;\n" " AND gncGUIDCache.iguid = gncKVPValue.iguid;\n"
"ALTER TABLE gncAccountTrail ADD COLUMN iguid INT4 DEFAULT 0;\n" "ALTER TABLE gncAccountTrail ADD COLUMN iguid INT4;\n"
"ALTER TABLE gncAccountTrail ALTER COLUMN iguid set DEFAULT 0;\n"
"UPDATE gncAccountTrail SET iguid = 0;\n" "UPDATE gncAccountTrail SET iguid = 0;\n"
"UPDATE gncAccountTrail SET iguid = gncGUIDCache.iguid " "UPDATE gncAccountTrail SET iguid = gncGUIDCache.iguid "