Applying patch to bugs 1699718 and 1713439

git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/branches/1.2@1145 4979c152-3d1c-0410-bac9-87ea11338e46

1 files changed, 6 insertions, 2 deletions

diff --git a/UPGRADE b/UPGRADE
index c4e0e00f..ade50238 100644
--- a/UPGRADE
+++ b/UPGRADE
@@ -56,8 +56,12 @@ and may not be required in all circumstances.  These include:
 
   a) cd to the sql/legacy/ directory of the new ledger directory
   b) run "psql" with appropriate options to connect to your database.
-  c) Note the db version by running the following query:
-     "SELECT version FROM defaults;"
+  c) Note the db schema version by running the following query:
+     "SELECT value from defaults where setting_key = 'version';" (1.2.0 or 
+     later)
+       or
+     "SELECT version FROM defaults;" (SQL-Ledger 2.6.x or LedgerSMB 1.1.x 
+     or earlier)
   d) Run the SQL upgrade scripts in order starting with the one whose name
      begins with "Pg-upgrade-[version]" (each of these scripts will upgrade to
      the next database version which is also identified in the file name).