From 78b23868227cfc6d689259dc9db7ffaf1d21070c Mon Sep 17 00:00:00 2001 From: Linas Vepstas Date: Wed, 2 Jan 2002 06:39:47 +0000 Subject: [PATCH] never mind, revert that last patch git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@6477 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/backend/postgres/price.c | 3 +-- src/backend/postgres/table-audit.sql | 3 +-- src/backend/postgres/table-create.sql | 3 +-- src/backend/postgres/table.m4 | 1 - src/backend/postgres/upgrade.c | 15 --------------- src/import-export/binary-import/druid-commodity.c | 2 +- 6 files changed, 4 insertions(+), 23 deletions(-) diff --git a/src/backend/postgres/price.c b/src/backend/postgres/price.c index a780ed2908..2112a2e78a 100644 --- a/src/backend/postgres/price.c +++ b/src/backend/postgres/price.c @@ -73,8 +73,7 @@ get_commodities_cb (PGBackend *be, PGresult *result, int j, gpointer data) DB_GET_VAL("namespace",j), DB_GET_VAL("mnemonic",j), DB_GET_VAL("code",j), - atoi(DB_GET_VAL("fraction",j)), - be->book); + atoi(DB_GET_VAL("fraction",j))); gnc_commodity_table_insert (comtab, com); return comtab; diff --git a/src/backend/postgres/table-audit.sql b/src/backend/postgres/table-audit.sql index b98c3dbdcd..dfe3f6d1ff 100644 --- a/src/backend/postgres/table-audit.sql +++ b/src/backend/postgres/table-audit.sql @@ -66,8 +66,7 @@ CREATE TABLE gncCommodityTrail ( namespace TEXT NOT NULL, mnemonic TEXT NOT NULL, code TEXT, - fraction INT DEFAULT '100', - bookGuid CHAR(32) NOT NULL + fraction INT DEFAULT '100' ) INHERITS (gncAuditTrail); CREATE INDEX gncCommodityTrail_commodity_idx ON gncCommodityTrail (commodity); diff --git a/src/backend/postgres/table-create.sql b/src/backend/postgres/table-create.sql index 6515834131..2d5d638e85 100644 --- a/src/backend/postgres/table-create.sql +++ b/src/backend/postgres/table-create.sql @@ -41,8 +41,7 @@ CREATE TABLE gncCommodity ( namespace TEXT NOT NULL, mnemonic TEXT NOT NULL, code TEXT, - fraction INT DEFAULT '100', - bookGuid CHAR(32) NOT NULL + fraction INT DEFAULT '100' ); CREATE TABLE gncBook ( diff --git a/src/backend/postgres/table.m4 b/src/backend/postgres/table.m4 index ab3d7de59d..caf665b1fb 100644 --- a/src/backend/postgres/table.m4 +++ b/src/backend/postgres/table.m4 @@ -64,7 +64,6 @@ define(`modity', `gncCommodity, Commodity, gnc_commodity, c, mnemonic, , char *, gnc_commodity_get_mnemonic(ptr), code, , char *, gnc_commodity_get_exchange_code(ptr), fraction, , int32, gnc_commodity_get_fraction(ptr), - bookGUID, , GUID *, gnc_book_get_guid(gnc_commodity_get_book(ptr)), commodity, KEY, char *, gnc_commodity_get_unique_name(ptr), ') diff --git a/src/backend/postgres/upgrade.c b/src/backend/postgres/upgrade.c index c02d0cd19f..657527cd90 100644 --- a/src/backend/postgres/upgrade.c +++ b/src/backend/postgres/upgrade.c @@ -295,8 +295,6 @@ add_multiple_book_support (PGBackend *be) p = "LOCK TABLE gncAccount IN ACCESS EXCLUSIVE MODE;\n" "LOCK TABLE gncAccountTrail IN ACCESS EXCLUSIVE MODE;\n" - "LOCK TABLE gncCommodity IN ACCESS EXCLUSIVE MODE;\n" - "LOCK TABLE gncCommodityTrail IN ACCESS EXCLUSIVE MODE;\n" "LOCK TABLE gncPrice IN ACCESS EXCLUSIVE MODE;\n" "LOCK TABLE gncPriceTrail IN ACCESS EXCLUSIVE MODE;\n" "LOCK TABLE gncVersion IN ACCESS EXCLUSIVE MODE;\n" @@ -326,8 +324,6 @@ add_multiple_book_support (PGBackend *be) p = "ALTER TABLE gncAccount ADD COLUMN bookGuid CHAR(32) NOT NULL;\n" "ALTER TABLE gncAccountTrail ADD COLUMN bookGuid CHAR(32) NOT NULL;\n" - "ALTER TABLE gncCommodity ADD COLUMN bookGuid CHAR(32) NOT NULL;\n" - "ALTER TABLE gncCommodityTrail ADD COLUMN bookGuid CHAR(32) NOT NULL;\n" "ALTER TABLE gncPrice ADD COLUMN bookGuid CHAR(32) NOT NULL;\n" "ALTER TABLE gncPriceTrail ADD COLUMN bookGuid CHAR(32) NOT NULL;\n"; SEND_QUERY (be,p, ); @@ -353,17 +349,6 @@ add_multiple_book_support (PGBackend *be) SEND_QUERY (be,buff, ); FINISH_QUERY(be->connection); - p = buff; - p = stpcpy (p, "UPDATE gncCommodity SET bookGuid = '"); - p = guid_to_string_buff (gnc_book_get_guid (be->book), p); - p = stpcpy (p, "';\n"); - p = stpcpy (p, "UPDATE gncCommodityTrail SET bookGuid = '"); - p = guid_to_string_buff (gnc_book_get_guid (be->book), p); - p = stpcpy (p, "';\n"); - SEND_QUERY (be,buff, ); - FINISH_QUERY(be->connection); - - p = buff; p = stpcpy (p, "INSERT INTO gncBook (bookGuid, book_open, version, iguid) " "VALUES ('"); diff --git a/src/import-export/binary-import/druid-commodity.c b/src/import-export/binary-import/druid-commodity.c index bfd83b7efe..a749c08fb8 100644 --- a/src/import-export/binary-import/druid-commodity.c +++ b/src/import-export/binary-import/druid-commodity.c @@ -186,7 +186,7 @@ gnc_ui_commodity_druid_create(const char * filename) found = gnc_commodity_new(gnc_commodity_get_mnemonic(lost), GNC_COMMODITY_NS_NASDAQ, gnc_commodity_get_mnemonic(lost), - NULL, 100000, gnc_get_current_book()); + NULL, 100000); } g_hash_table_insert(d->new_map, (gpointer)gnc_commodity_get_mnemonic(lost),