mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-25 18:55:30 -06:00
never mind, revert that last patch
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@6477 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
parent
a6cbfe7948
commit
78b2386822
@ -73,8 +73,7 @@ get_commodities_cb (PGBackend *be, PGresult *result, int j, gpointer data)
|
|||||||
DB_GET_VAL("namespace",j),
|
DB_GET_VAL("namespace",j),
|
||||||
DB_GET_VAL("mnemonic",j),
|
DB_GET_VAL("mnemonic",j),
|
||||||
DB_GET_VAL("code",j),
|
DB_GET_VAL("code",j),
|
||||||
atoi(DB_GET_VAL("fraction",j)),
|
atoi(DB_GET_VAL("fraction",j)));
|
||||||
be->book);
|
|
||||||
|
|
||||||
gnc_commodity_table_insert (comtab, com);
|
gnc_commodity_table_insert (comtab, com);
|
||||||
return comtab;
|
return comtab;
|
||||||
|
@ -66,8 +66,7 @@ CREATE TABLE gncCommodityTrail (
|
|||||||
namespace TEXT NOT NULL,
|
namespace TEXT NOT NULL,
|
||||||
mnemonic TEXT NOT NULL,
|
mnemonic TEXT NOT NULL,
|
||||||
code TEXT,
|
code TEXT,
|
||||||
fraction INT DEFAULT '100',
|
fraction INT DEFAULT '100'
|
||||||
bookGuid CHAR(32) NOT NULL
|
|
||||||
) INHERITS (gncAuditTrail);
|
) INHERITS (gncAuditTrail);
|
||||||
|
|
||||||
CREATE INDEX gncCommodityTrail_commodity_idx ON gncCommodityTrail (commodity);
|
CREATE INDEX gncCommodityTrail_commodity_idx ON gncCommodityTrail (commodity);
|
||||||
|
@ -41,8 +41,7 @@ CREATE TABLE gncCommodity (
|
|||||||
namespace TEXT NOT NULL,
|
namespace TEXT NOT NULL,
|
||||||
mnemonic TEXT NOT NULL,
|
mnemonic TEXT NOT NULL,
|
||||||
code TEXT,
|
code TEXT,
|
||||||
fraction INT DEFAULT '100',
|
fraction INT DEFAULT '100'
|
||||||
bookGuid CHAR(32) NOT NULL
|
|
||||||
);
|
);
|
||||||
|
|
||||||
CREATE TABLE gncBook (
|
CREATE TABLE gncBook (
|
||||||
|
@ -64,7 +64,6 @@ define(`modity', `gncCommodity, Commodity, gnc_commodity, c,
|
|||||||
mnemonic, , char *, gnc_commodity_get_mnemonic(ptr),
|
mnemonic, , char *, gnc_commodity_get_mnemonic(ptr),
|
||||||
code, , char *, gnc_commodity_get_exchange_code(ptr),
|
code, , char *, gnc_commodity_get_exchange_code(ptr),
|
||||||
fraction, , int32, gnc_commodity_get_fraction(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),
|
commodity, KEY, char *, gnc_commodity_get_unique_name(ptr),
|
||||||
')
|
')
|
||||||
|
|
||||||
|
@ -295,8 +295,6 @@ add_multiple_book_support (PGBackend *be)
|
|||||||
|
|
||||||
p = "LOCK TABLE gncAccount IN ACCESS EXCLUSIVE MODE;\n"
|
p = "LOCK TABLE gncAccount IN ACCESS EXCLUSIVE MODE;\n"
|
||||||
"LOCK TABLE gncAccountTrail 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 gncPrice IN ACCESS EXCLUSIVE MODE;\n"
|
||||||
"LOCK TABLE gncPriceTrail IN ACCESS EXCLUSIVE MODE;\n"
|
"LOCK TABLE gncPriceTrail IN ACCESS EXCLUSIVE MODE;\n"
|
||||||
"LOCK TABLE gncVersion 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"
|
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 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 gncPrice ADD COLUMN bookGuid CHAR(32) NOT NULL;\n"
|
||||||
"ALTER TABLE gncPriceTrail ADD COLUMN bookGuid CHAR(32) NOT NULL;\n";
|
"ALTER TABLE gncPriceTrail ADD COLUMN bookGuid CHAR(32) NOT NULL;\n";
|
||||||
SEND_QUERY (be,p, );
|
SEND_QUERY (be,p, );
|
||||||
@ -353,17 +349,6 @@ add_multiple_book_support (PGBackend *be)
|
|||||||
SEND_QUERY (be,buff, );
|
SEND_QUERY (be,buff, );
|
||||||
FINISH_QUERY(be->connection);
|
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 = buff;
|
||||||
p = stpcpy (p, "INSERT INTO gncBook (bookGuid, book_open, version, iguid) "
|
p = stpcpy (p, "INSERT INTO gncBook (bookGuid, book_open, version, iguid) "
|
||||||
"VALUES ('");
|
"VALUES ('");
|
||||||
|
@ -186,7 +186,7 @@ gnc_ui_commodity_druid_create(const char * filename)
|
|||||||
found = gnc_commodity_new(gnc_commodity_get_mnemonic(lost),
|
found = gnc_commodity_new(gnc_commodity_get_mnemonic(lost),
|
||||||
GNC_COMMODITY_NS_NASDAQ,
|
GNC_COMMODITY_NS_NASDAQ,
|
||||||
gnc_commodity_get_mnemonic(lost),
|
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),
|
g_hash_table_insert(d->new_map, (gpointer)gnc_commodity_get_mnemonic(lost),
|
||||||
|
Loading…
Reference in New Issue
Block a user