Postgres backend patch
Matthew Vanecek
mevanecek@yahoo.com
03 Jan 2003 10:22:30 -0600
--=-0vSBdb4XrJEGaRQZStj+
Content-Type: multipart/mixed; boundary="=-rgIDPkS6zJXE3f6gOaix"
--=-rgIDPkS6zJXE3f6gOaix
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
This patch corrects some compiler warnings from gcc 2.96.x, and it fixes
some malformed SQL pointed out by Christopher Browne.
Thanks,
--=20
Matthew Vanecek
perl -e 'print $i=3Dpack(c5,(41*2),sqrt(7056),(unpack(c,H)-2),oct(115),10);'
***************************************************************************=
*****
For 93 million miles, there is nothing between the sun and my shadow except=
me.
I'm always getting in the way of something...
--=-rgIDPkS6zJXE3f6gOaix
Content-Type: application/DEFANGED-0; name="pg_diff.DEFANGED-0"; charset="ISO-8859-1"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment; filename="pg_diff.DEFANGED-0"
? make.out
? src/backend/postgres/.account.c.swp
? src/engine/.Account.c.swp
? src/engine/.Account.h.swp
? src/engine/.AccountP.h.swp
? src/engine/.Group.c.swp
? src/engine/.gnc-commodity.h.swp
Index: ChangeLog
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/cvs/cvsroot/gnucash/ChangeLog,v
retrieving revision 1.1337
diff -u -r1.1337 ChangeLog
--- ChangeLog 3 Jan 2003 07:49:59 -0000 1.1337
+++ ChangeLog 3 Jan 2003 16:14:44 -0000
@@ -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=20
+ modifier in a separate ALTER statement. This was reported by
+ Christopher B. Browne.
+
2003-01-02 David Hampton <hampton@employees.org>
=20
* src/report/report-system/html-utilities.scm: Fix malformed URLs
Index: src/backend/postgres/PostgresBackend.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/cvs/cvsroot/gnucash/src/backend/postgres/PostgresBackend.c,v
retrieving revision 1.40
diff -u -r1.40 PostgresBackend.c
--- src/backend/postgres/PostgresBackend.c 30 Dec 2002 18:40:08 -0000 1.40
+++ src/backend/postgres/PostgresBackend.c 3 Jan 2003 16:14:56 -0000
@@ -148,7 +148,7 @@
GList *node;
Account * acc =3D NULL;
=20
- ENTER("guid =3D %s", acct_guid);
+ ENTER("guid =3D %s", guid_to_string(acct_guid));
for (node=3Dbe->blist; node; node=3Dnode->next)
{
GNCBook *book =3D node->data;
@@ -166,7 +166,7 @@
GList *node;
Transaction * txn =3D NULL;
=20
- ENTER("guid =3D %s", txn_guid);
+ ENTER("guid =3D %s", guid_to_string(txn_guid));
for (node=3Dbe->blist; node; node=3Dnode->next)
{
GNCBook *book =3D node->data;
@@ -184,7 +184,7 @@
GList *node;
Split * split =3D NULL;
=20
- ENTER("guid =3D %s", split_guid);
+ ENTER("guid =3D %s", guid_to_string(split_guid));
for (node=3Dbe->blist; node; node=3Dnode->next)
{
GNCBook *book =3D node->data;
@@ -202,7 +202,7 @@
GList *node;
GNCPrice * price =3D NULL;
=20
- ENTER("guid =3D %s", price_guid);
+ ENTER("guid =3D %s", guid_to_string(price_guid));
for (node=3Dbe->blist; node; node=3Dnode->next)
{
GNCBook *book =3D node->data;
@@ -219,7 +219,7 @@
GList *node;
GNCIdType tip =3D GNC_ID_NONE;
=20
- ENTER("guid =3D %s", guid);
+ ENTER("guid =3D %s", guid_to_string(guid));
for (node=3Dbe->blist; node; node=3Dnode->next)
{
GNCBook *book =3D node->data;
@@ -1137,6 +1137,9 @@
return "POLL";
case MODE_EVENT:
return "EVENT";
+ /* quiet compiler warnings about MODE_NONE */
+ default:
+ return "ERROR";
}
return "ERROR";
}
@@ -1629,15 +1632,15 @@
return pgend_book_transfer_begin (bend, object);
=20
switch (be->session_mode) {
- case MODE_EVENT:
- case MODE_POLL:
- case MODE_SINGLE_UPDATE:
-
- if (!safe_strcmp (type, GNC_ID_PRICE))
- return pgend_price_begin_edit (bend, object);
+ case MODE_EVENT:
+ case MODE_POLL:
+ case MODE_SINGLE_UPDATE:
+ if (!safe_strcmp (type, GNC_ID_PRICE))
+ return pgend_price_begin_edit (bend, object);
=20
- case MODE_SINGLE_FILE:
- break;
+ case MODE_SINGLE_FILE:
+ case MODE_NONE:
+ break;
}
=20
/* XXX: Add dynamic plug-in here */
@@ -1670,7 +1673,9 @@
return pgend_account_commit_edit (bend, object);
=20
case MODE_SINGLE_FILE:
+ case MODE_NONE:
break;
+=20=20=20=20
}
=20
/* XXX: Add dynamic plug-in here */
@@ -1692,6 +1697,7 @@
=20
case MODE_SINGLE_UPDATE:
case MODE_SINGLE_FILE:
+ case MODE_NONE:
break;
}
=20
Index: src/backend/postgres/upgrade.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/cvs/cvsroot/gnucash/src/backend/postgres/upgrade.c,v
retrieving revision 1.11
diff -u -r1.11 upgrade.c
--- src/backend/postgres/upgrade.c 30 Dec 2002 18:40:11 -0000 1.11
+++ src/backend/postgres/upgrade.c 3 Jan 2003 16:14:56 -0000
@@ -152,7 +152,8 @@
SEND_QUERY (be,buff, );
FINISH_QUERY(be->connection);
=20
- p =3D "ALTER TABLE gncEntry ADD COLUMN iguid INT4 DEFAULT 0;\n"
+ p =3D "ALTER TABLE gncEntry ADD COLUMN iguid INT4;\n"
+ "ALTER TABLE gncEntry ALTER COLUMN iguid set DEFAULT 0;\n"
"UPDATE gncEntry SET iguid =3D 0;\n"=20
=20=20=20=20=20=20=20=20
"UPDATE gncEntry SET iguid =3D gncGUIDCache.iguid "
@@ -160,7 +161,8 @@
" WHERE gncGUIDCache.guid =3D gncEntry.entryGUID "
" AND gncGUIDCache.iguid =3D gncKVPValue.iguid;\n"
=20
- "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 =3D 0;\n"=20
=20=20=20=20=20=20=20=20
"UPDATE gncEntryTrail SET iguid =3D gncGUIDCache.iguid "
@@ -170,7 +172,8 @@
SEND_QUERY (be,p, );
FINISH_QUERY(be->connection);
=20=20=20=20
- p =3D "ALTER TABLE gncTransaction ADD COLUMN iguid INT4 DEFAULT 0;\n"
+ p =3D "ALTER TABLE gncTransaction ADD COLUMN iguid INT4;\n"
+ "ALTER TABLE gncTransaction ALTER COLUMN iguid set DEFAULT 0;\n"
"UPDATE gncTransaction SET iguid =3D 0;\n"=20
=20=20=20=20=20=20=20=20
"UPDATE gncTransaction SET iguid =3D gncGUIDCache.iguid "
@@ -178,7 +181,8 @@
" WHERE gncGUIDCache.guid =3D gncTransaction.transGUID "
" AND gncGUIDCache.iguid =3D gncKVPValue.iguid;\n"
=20
- "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 =3D 0;\n"=20
=20=20=20=20=20=20=20=20
"UPDATE gncTransactionTrail SET iguid =3D gncGUIDCache.iguid "
@@ -188,7 +192,8 @@
SEND_QUERY (be,p, );
FINISH_QUERY(be->connection);
=20=09=20=20=20
- p =3D "ALTER TABLE gncAccount ADD COLUMN iguid INT4 DEFAULT 0;\n"
+ p =3D "ALTER TABLE gncAccount ADD COLUMN iguid INT4;\n"
+ "ALTER TABLE gncAccount ALTER COLUMN iguid set DEFAULT 0;\n"
"UPDATE gncAccount SET iguid =3D 0;\n"=20
=20=20=20=20=20=20=20=20
"UPDATE gncAccount SET iguid =3D gncGUIDCache.iguid "
@@ -196,7 +201,8 @@
" WHERE gncGUIDCache.guid =3D gncAccount.accountGUID "
" AND gncGUIDCache.iguid =3D gncKVPValue.iguid;\n"
=20
- "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 =3D 0;\n"=20
=20=20=20=20=20=20=20=20
"UPDATE gncAccountTrail SET iguid =3D gncGUIDCache.iguid "
Index: src/backend/postgres/test/test-db.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/cvs/cvsroot/gnucash/src/backend/postgres/test/test-db.c,v
retrieving revision 1.47
diff -u -r1.47 test-db.c
--- src/backend/postgres/test/test-db.c 5 Oct 2002 09:15:03 -0000 1.47
+++ src/backend/postgres/test/test-db.c 3 Jan 2003 16:14:57 -0000
@@ -21,7 +21,8 @@
#include "test-stuff.h"
#include "test-engine-stuff.h"
=20
-static short module =3D MOD_TEST;=20
+/* Prevent compiler warnings. Uncomment if LEAVE/WARN/et al get used*/
+/* static short module =3D MOD_TEST; */
=20
static void
save_xml_file (GNCSession *session, const char *filename_base)
--=-rgIDPkS6zJXE3f6gOaix--
--=-0vSBdb4XrJEGaRQZStj+
Content-Type: application/DEFANGED-1; name="signature_asc.DEFANGED-1"
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.6 (GNU/Linux)
Comment: For info see http://www.gnupg.org
iD8DBQA+FbjFi/CNzDSN0RIRAqs6AJwLd6pCBo9l+tLvta2DD5b43SMjgwCgoEMK
IvAm3H2wemphuzwVMgHdCEo=
=9nHw
-----END PGP SIGNATURE-----
--=-0vSBdb4XrJEGaRQZStj+--