From d25385328bb8c2e9bce4dfbdcde2415fcf04c3bd Mon Sep 17 00:00:00 2001
From: kulath <guy.linton@gmail.com>
Date: Mon, 2 Mar 2015 17:42:51 +0000
Subject: [PATCH] Make a zip backup if schema is to be upgraded see 8134: Error
 converting python2 utf-8 strings to python3 str when loading data from
 database

---
 src/gen/db/dbconst.py |  3 ++-
 src/gen/db/write.py   | 27 +++++++++++++++++++++++----
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/gen/db/dbconst.py b/src/gen/db/dbconst.py
index 8694ac8d8..752b01fd9 100644
--- a/src/gen/db/dbconst.py
+++ b/src/gen/db/dbconst.py
@@ -40,7 +40,7 @@ __all__ = (
             ('DBPAGE', 'DBMODE', 'DBCACHE', 'DBLOCKS', 'DBOBJECTS', 'DBUNDO',
              'DBEXT', 'DBMODE_R', 'DBMODE_W', 'DBUNDOFN', 'DBLOCKFN',
              'DBRECOVFN','BDBVERSFN', 'DBLOGNAME', 'DBFLAGS_O',  'DBFLAGS_R',
-             'DBFLAGS_D',
+             'DBFLAGS_D', 'SCHVERSFN'
             ) +
             
             ('PERSON_KEY', 'FAMILY_KEY', 'SOURCE_KEY', 'CITATION_KEY',
@@ -56,6 +56,7 @@ DBUNDOFN  = "undo.db"       # File name of 'undo' database
 DBLOCKFN  = "lock"          # File name of lock file
 DBRECOVFN = "need_recover"  # File name of recovery file
 BDBVERSFN = "bdbversion.txt"# File name of Berkeley DB version file
+SCHVERSFN = "schemaversion.txt"# File name of schema version file
 DBLOGNAME = ".Db"           # Name of logger
 DBMODE_R  = "r"             # Read-only access
 DBMODE_W  = "w"             # Full Read/Write access
diff --git a/src/gen/db/write.py b/src/gen/db/write.py
index 730225f0e..f6fc9da54 100644
--- a/src/gen/db/write.py
+++ b/src/gen/db/write.py
@@ -558,6 +558,18 @@ class DbBsddb(DbBsddbRead, DbWriteBase, UpdateCallback):
         
         self.__check_python_version(name, force_python_upgrade)
 
+        # Check for schema upgrade
+        versionpath = os.path.join(self.path, SCHVERSFN)
+        if os.path.isfile(versionpath):
+            with open(versionpath, "r") as version_file:
+                schema_version = int(version_file.read().strip())
+        else:
+            schema_version = 0
+        if not self.readonly and schema_version < _DBVERSION and \
+                                 force_schema_upgrade:
+            _LOG.debug("Make backup in case there is a schema upgrade")
+            self.__make_zip_backup(name)
+
         # Set up database environment
         self.env = db.DBEnv()
         self.env.set_cachesize(0, DBCACHE)
@@ -664,7 +676,7 @@ class DbBsddb(DbBsddbRead, DbWriteBase, UpdateCallback):
             versionpath = os.path.join(name, BDBVERSFN)
             with open(versionpath, "w") as version_file:
                 version_file.write(str(db.version()))
-            _LOG.debug("Updated BDBVERSFN file to %s" % str(db.version()))
+            _LOG.debug("Updated bsddb version file to %s" % str(db.version()))
 
         if self.update_python_version:
             versionpath = os.path.join(name, "pythonversion.txt")
@@ -683,6 +695,10 @@ class DbBsddb(DbBsddbRead, DbWriteBase, UpdateCallback):
                        (oldschema, newschema))
             if force_schema_upgrade == True:
                 self.gramps_upgrade(callback)
+                versionpath = os.path.join(name, SCHVERSFN)
+                with open(versionpath, "w") as version_file:
+                    version_file.write(str(_DBVERSION))
+                _LOG.debug("Updated schema version file to %s" % str(_DBVERSION))
             else:
                 self.__close_early()
                 clear_lock_file(name)
@@ -2125,6 +2141,11 @@ class DbBsddb(DbBsddbRead, DbWriteBase, UpdateCallback):
         with open(versionpath, "w") as version_file:
             version_file.write(str(version_info[0]))
 
+        versionpath = os.path.join(name, SCHVERSFN)
+        _LOG.debug("Write schema version file to %s" % str(_DBVERSION))
+        with open(versionpath, "w") as version_file:
+            version_file.write(str(_DBVERSION))
+
         self.metadata.close()
         self.env.close()
   
@@ -2161,9 +2182,7 @@ def write_lock_file(name):
         try:
             user = os.getlogin()
         except:
-            # not win, so don't need get_env_var.
-            # under cron getlogin() throws and there is no USER.
-            user = os.environ.get('USER', 'noUSER')
+            user = os.environ.get('USER')
     if host:
         text = "%s@%s" % (user, host)
     else: