Browse Source

Fix bug in mysql driver initialization

oz123 10 years ago
parent
commit
eea9b7ec62
2 changed files with 3 additions and 1 deletions
  1. 2 0
      pwman/data/drivers/mysql.py
  2. 1 1
      tests/test_mysql.py

+ 2 - 0
pwman/data/drivers/mysql.py

@@ -50,6 +50,8 @@ class MySQLDatabase(Database):
         except mysql.ProgrammingError:
             con.rollback()
 
+        return str(__DB_FORMAT__)
+
     def __init__(self, mysqluri, dbformat=__DB_FORMAT__):
         self.dburi = mysqluri
         self.dbversion = dbformat

+ 1 - 1
tests/test_mysql.py

@@ -117,7 +117,7 @@ class TestMySQLDatabase(unittest.TestCase):
         self.db._cur.execute("DROP TABLE DBVERSION")
         self.db._con.commit()
         v = self.db.check_db_version(urlparse(dburi))
-        self.assertEqual(v, None)
+        self.assertEqual(v, '0.6')
         self.db._cur.execute("CREATE TABLE DBVERSION("
                              "VERSION TEXT NOT NULL) ")
         self.db._con.commit()