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

reverting incorrect changes; this file *must* call old/obsolte column

Browse Source 
names by thier old/obsolete column names, because that is the whole point
of this file.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@9060 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Linas Vepstas 2003-08-12 01:33:31 +00:00
parent 101179d5a0
commit f406fbc7da
1 changed files with 27 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -135,11 +135,9 @@ put_iguid_in_tables (PGBackend *be)
{ {
char *p, buff[200]; char *p, buff[200];
guint iguid; guint iguid;
execQuery(be, "BEGIN");
p = "LOCK TABLE gncAccount IN ACCESS EXCLUSIVE MODE;\n" p = "LOCK TABLE gncAccount IN ACCESS EXCLUSIVE MODE;\n"
"LOCK TABLE gncSplit IN ACCESS EXCLUSIVE MODE;\n" "LOCK TABLE gncEntry IN ACCESS EXCLUSIVE MODE;\n"
"LOCK TABLE gncTransaction IN ACCESS EXCLUSIVE MODE;\n" "LOCK TABLE gncTransaction IN ACCESS EXCLUSIVE MODE;\n"
"LOCK TABLE gncKVPValue IN ACCESS EXCLUSIVE MODE;\n" "LOCK TABLE gncKVPValue IN ACCESS EXCLUSIVE MODE;\n"
"LOCK TABLE gncVersion IN ACCESS EXCLUSIVE MODE;\n" "LOCK TABLE gncVersion IN ACCESS EXCLUSIVE MODE;\n"
@ -157,22 +155,22 @@ 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 gncSplit ADD COLUMN iguid INT4;\n" p = "ALTER TABLE gncEntry ADD COLUMN iguid INT4;\n"
"ALTER TABLE gncSplit ALTER COLUMN iguid set DEFAULT 0;\n" "ALTER TABLE gncEntry ALTER COLUMN iguid set DEFAULT 0;\n"
"UPDATE gncSplit SET iguid = 0;\n" "UPDATE gncEntry SET iguid = 0;\n"
"UPDATE gncSplit SET iguid = gncGUIDCache.iguid " "UPDATE gncEntry SET iguid = gncGUIDCache.iguid "
" FROM gncGUIDCache, gncKVPValue " " FROM gncGUIDCache, gncKVPValue "
" WHERE gncGUIDCache.guid = gncSplit.splitGuid " " WHERE gncGUIDCache.guid = gncEntry.entryGUID "
" AND gncGUIDCache.iguid = gncKVPValue.iguid;\n" " AND gncGUIDCache.iguid = gncKVPValue.iguid;\n"
"ALTER TABLE gncSplitTrail ADD COLUMN iguid INT4;\n" "ALTER TABLE gncEntryTrail ADD COLUMN iguid INT4;\n"
"ALTER TABLE gncSplitTrail ALTER COLUMN iguid set DEFAULT 0;\n" "ALTER TABLE gncEntryTrail ALTER COLUMN iguid set DEFAULT 0;\n"
"UPDATE gncSplitTrail SET iguid = 0;\n" "UPDATE gncEntryTrail SET iguid = 0;\n"
"UPDATE gncSplitTrail SET iguid = gncGUIDCache.iguid " "UPDATE gncEntryTrail SET iguid = gncGUIDCache.iguid "
" FROM gncGUIDCache, gncKVPValue " " FROM gncGUIDCache, gncKVPValue "
" WHERE gncGUIDCache.guid = gncSplitTrail.splitGuid " " WHERE gncGUIDCache.guid = gncEntryTrail.entryGUID "
" AND gncGUIDCache.iguid = gncKVPValue.iguid;\n"; " AND gncGUIDCache.iguid = gncKVPValue.iguid;\n";
SEND_QUERY (be,p, ); SEND_QUERY (be,p, );
FINISH_QUERY(be->connection); FINISH_QUERY(be->connection);
@ -222,7 +220,6 @@ put_iguid_in_tables (PGBackend *be)
" (1,1,1,'End Put iGUID in Main Tables');"; " (1,1,1,'End Put iGUID in Main Tables');";
SEND_QUERY (be,p, ); SEND_QUERY (be,p, );
FINISH_QUERY(be->connection); FINISH_QUERY(be->connection);
execQuery(be, "COMMIT");
} }
/* ============================================================= */ /* ============================================================= */
@ -232,8 +229,6 @@ fix_reconciled_balance_func (PGBackend *be)
{ {
char *p; char *p;
execQuery(be, "BEGIN");
p = "LOCK TABLE gncVersion IN ACCESS EXCLUSIVE MODE;\n " p = "LOCK TABLE gncVersion IN ACCESS EXCLUSIVE MODE;\n "
"INSERT INTO gncVersion (major,minor,rev,name) VALUES \n" "INSERT INTO gncVersion (major,minor,rev,name) VALUES \n"
" (1,2,0,'Start Fix gncSubtotalReconedBalance');"; " (1,2,0,'Start Fix gncSubtotalReconedBalance');";
@ -248,14 +243,14 @@ fix_reconciled_balance_func (PGBackend *be)
p = "CREATE FUNCTION " p = "CREATE FUNCTION "
"gncSubtotalReconedBalance (CHAR(32), TIMESTAMP, TIMESTAMP)" "gncSubtotalReconedBalance (CHAR(32), TIMESTAMP, TIMESTAMP)"
"RETURNS INT8 " "RETURNS INT8 "
"AS 'SELECT INT8(sum(gncSplit.amount)) " "AS 'SELECT INT8(sum(gncEntry.amount)) "
"FROM gncSplit, gncTransaction " "FROM gncEntry, gncTransaction "
"WHERE " "WHERE "
"gncSplit.accountGuid = $1 AND " "gncEntry.accountGuid = $1 AND "
"gncSplit.transGuid = gncTransaction.transGuid AND " "gncEntry.transGuid = gncTransaction.transGuid AND "
"gncTransaction.date_posted BETWEEN $2 AND $3 AND " "gncTransaction.date_posted BETWEEN $2 AND $3 AND "
"(gncSplit.reconciled = \\'y\\' OR " "(gncEntry.reconciled = \\'y\\' OR "
" gncSplit.reconciled = \\'f\\')' " " gncEntry.reconciled = \\'f\\')' "
"LANGUAGE 'sql';"; "LANGUAGE 'sql';";
SEND_QUERY (be,p, ); SEND_QUERY (be,p, );
FINISH_QUERY(be->connection); FINISH_QUERY(be->connection);
@ -264,7 +259,6 @@ fix_reconciled_balance_func (PGBackend *be)
" (1,2,1,'End Fix gncSubtotalReconedBalance');"; " (1,2,1,'End Fix gncSubtotalReconedBalance');";
SEND_QUERY (be,p, ); SEND_QUERY (be,p, );
FINISH_QUERY(be->connection); FINISH_QUERY(be->connection);
execQuery(be, "COMMIT");
} }
/* ============================================================= */ /* ============================================================= */
@ -274,7 +268,6 @@ add_kvp_timespec_tables (PGBackend *be)
{ {
char *p; char *p;
execQuery(be, "BEGIN");
p = "LOCK TABLE gncVersion IN ACCESS EXCLUSIVE MODE;\n " p = "LOCK TABLE gncVersion IN ACCESS EXCLUSIVE MODE;\n "
"INSERT INTO gncVersion (major,minor,rev,name) VALUES \n" "INSERT INTO gncVersion (major,minor,rev,name) VALUES \n"
" (1,3,0,'Start Add kvp_timespec tables');"; " (1,3,0,'Start Add kvp_timespec tables');";
@ -300,7 +293,6 @@ add_kvp_timespec_tables (PGBackend *be)
" (1,3,1,'End Add kvp_timespec tables');"; " (1,3,1,'End Add kvp_timespec tables');";
SEND_QUERY (be,p, ); SEND_QUERY (be,p, );
FINISH_QUERY(be->connection); FINISH_QUERY(be->connection);
execQuery(be, "COMMIT");
} }
/* ============================================================= */ /* ============================================================= */
@ -311,7 +303,6 @@ add_multiple_book_support (PGBackend *be)
char buff[4000]; char buff[4000];
char *p; char *p;
execQuery(be, "BEGIN");
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 gncPrice IN ACCESS EXCLUSIVE MODE;\n" "LOCK TABLE gncPrice IN ACCESS EXCLUSIVE MODE;\n"
@ -380,7 +371,6 @@ add_multiple_book_support (PGBackend *be)
" (1,4,1,'End Add multiple book support');"; " (1,4,1,'End Add multiple book support');";
SEND_QUERY (be,p, ); SEND_QUERY (be,p, );
FINISH_QUERY(be->connection); FINISH_QUERY(be->connection);
execQuery(be, "COMMIT");
} }
static void static void
@ -532,17 +522,17 @@ pgendDBVersionIsCurrent (PGBackend *be)
pgendVersionTable(be); pgendVersionTable(be);
vers = pgendGetVersion(be); vers = pgendGetVersion(be);
if (vers.major < 1) if (1 > vers.major)
{ {
qof_backend_set_error (&be->be, ERR_BACKEND_DATA_CORRUPT); qof_backend_set_error (&be->be, ERR_BACKEND_DATA_CORRUPT);
return -1; return -1;
} }
if ((vers.major == PGEND_CURRENT_MAJOR_VERSION) && if ((PGEND_CURRENT_MAJOR_VERSION == vers.major) &&
(vers.minor >= PGEND_CURRENT_MINOR_VERSION)) return 0; (PGEND_CURRENT_MINOR_VERSION <= vers.minor)) return 0;
/* check to see if this client can connect */ /* check to see if this client can connect */
if (vers.major > PGEND_CURRENT_MAJOR_VERSION) if (PGEND_CURRENT_MAJOR_VERSION < vers.major)
{ {
qof_backend_set_error (&be->be, ERR_BACKEND_TOO_NEW); qof_backend_set_error (&be->be, ERR_BACKEND_TOO_NEW);
return -1; return -1;
@ -561,22 +551,22 @@ pgendUpgradeDB (PGBackend *be)
vers = pgendGetVersion(be); vers = pgendGetVersion(be);
/* start adding features to bring database up to date */ /* start adding features to bring database up to date */
if (vers.major == 1) if (1 == vers.major)
{ {
/* version 1.1.0 add iguids to transaction and entry tables */ /* version 1.1.0 add iguids to transaction and entry tables */
if (vers.minor < 1) if (1 > vers.minor)
{ {
put_iguid_in_tables(be); put_iguid_in_tables(be);
} }
if (vers.minor < 2) if (2 > vers.minor)
{ {
fix_reconciled_balance_func (be); fix_reconciled_balance_func (be);
} }
if (vers.minor < 3) if (3 > vers.minor)
{ {
add_kvp_timespec_tables (be); add_kvp_timespec_tables (be);
} }
if (vers.minor < 4) if (4 > vers.minor)
{ {
add_multiple_book_support (be); add_multiple_book_support (be);
} }