diff --git a/ChangeLog b/ChangeLog index 56bf7e9bd2..9fb7b5a54d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2003-01-03 Matthew Vanecek + * 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 * src/report/report-system/html-utilities.scm: Fix malformed URLs diff --git a/src/backend/postgres/PostgresBackend.c b/src/backend/postgres/PostgresBackend.c index 84c2e13f37..13b2595fd6 100644 --- a/src/backend/postgres/PostgresBackend.c +++ b/src/backend/postgres/PostgresBackend.c @@ -148,7 +148,7 @@ pgendAccountLookup (PGBackend *be, const GUID *acct_guid) GList *node; Account * acc = NULL; - ENTER("guid = %s", acct_guid); + ENTER("guid = %s", guid_to_string(acct_guid)); for (node=be->blist; node; node=node->next) { GNCBook *book = node->data; @@ -166,7 +166,7 @@ pgendTransLookup (PGBackend *be, const GUID *txn_guid) GList *node; Transaction * txn = NULL; - ENTER("guid = %s", txn_guid); + ENTER("guid = %s", guid_to_string(txn_guid)); for (node=be->blist; node; node=node->next) { GNCBook *book = node->data; @@ -184,7 +184,7 @@ pgendSplitLookup (PGBackend *be, const GUID *split_guid) GList *node; Split * split = NULL; - ENTER("guid = %s", split_guid); + ENTER("guid = %s", guid_to_string(split_guid)); for (node=be->blist; node; node=node->next) { GNCBook *book = node->data; @@ -202,7 +202,7 @@ pgendPriceLookup (PGBackend *be, const GUID *price_guid) GList *node; GNCPrice * price = NULL; - ENTER("guid = %s", price_guid); + ENTER("guid = %s", guid_to_string(price_guid)); for (node=be->blist; node; node=node->next) { GNCBook *book = node->data; @@ -219,7 +219,7 @@ pgendGUIDType (PGBackend *be, const GUID *guid) GList *node; GNCIdType tip = GNC_ID_NONE; - ENTER("guid = %s", guid); + ENTER("guid = %s", guid_to_string(guid)); for (node=be->blist; node; node=node->next) { GNCBook *book = node->data; @@ -1137,6 +1137,9 @@ pgendSessionGetMode (PGBackend *be) return "POLL"; case MODE_EVENT: return "EVENT"; + /* quiet compiler warnings about MODE_NONE */ + default: + return "ERROR"; } return "ERROR"; } @@ -1629,15 +1632,15 @@ pgend_do_begin (Backend *bend, GNCIdTypeConst type, gpointer object) return pgend_book_transfer_begin (bend, object); switch (be->session_mode) { - case MODE_EVENT: - case MODE_POLL: - case MODE_SINGLE_UPDATE: + case MODE_EVENT: + case MODE_POLL: + case MODE_SINGLE_UPDATE: + if (!safe_strcmp (type, GNC_ID_PRICE)) + return pgend_price_begin_edit (bend, object); - if (!safe_strcmp (type, GNC_ID_PRICE)) - return pgend_price_begin_edit (bend, object); - - case MODE_SINGLE_FILE: - break; + case MODE_SINGLE_FILE: + case MODE_NONE: + break; } /* XXX: Add dynamic plug-in here */ @@ -1670,7 +1673,9 @@ pgend_do_commit (Backend *bend, GNCIdTypeConst type, gpointer object) return pgend_account_commit_edit (bend, object); case MODE_SINGLE_FILE: + case MODE_NONE: break; + } /* 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_FILE: + case MODE_NONE: break; } diff --git a/src/backend/postgres/test/test-db.c b/src/backend/postgres/test/test-db.c index 1496893161..be7c5ee832 100644 --- a/src/backend/postgres/test/test-db.c +++ b/src/backend/postgres/test/test-db.c @@ -21,7 +21,8 @@ #include "test-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 save_xml_file (GNCSession *session, const char *filename_base) diff --git a/src/backend/postgres/upgrade.c b/src/backend/postgres/upgrade.c index 1cf5a6cfc2..45257457a7 100644 --- a/src/backend/postgres/upgrade.c +++ b/src/backend/postgres/upgrade.c @@ -152,7 +152,8 @@ put_iguid_in_tables (PGBackend *be) SEND_QUERY (be,buff, ); 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 = gncGUIDCache.iguid " @@ -160,7 +161,8 @@ put_iguid_in_tables (PGBackend *be) " WHERE gncGUIDCache.guid = gncEntry.entryGUID " " 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 = gncGUIDCache.iguid " @@ -170,7 +172,8 @@ put_iguid_in_tables (PGBackend *be) SEND_QUERY (be,p, ); 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 = gncGUIDCache.iguid " @@ -178,7 +181,8 @@ put_iguid_in_tables (PGBackend *be) " WHERE gncGUIDCache.guid = gncTransaction.transGUID " " 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 = gncGUIDCache.iguid " @@ -188,7 +192,8 @@ put_iguid_in_tables (PGBackend *be) SEND_QUERY (be,p, ); 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 = gncGUIDCache.iguid " @@ -196,7 +201,8 @@ put_iguid_in_tables (PGBackend *be) " WHERE gncGUIDCache.guid = gncAccount.accountGUID " " 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 = gncGUIDCache.iguid "