فهرست منبع

add more testing to mysql driver

oz123 10 سال پیش
والد
کامیت
1bb83c3123
2فایلهای تغییر یافته به همراه10 افزوده شده و 7 حذف شده
  1. 7 7
      pwman/data/drivers/mysql.py
  2. 3 0
      pwman/tests/test_mysql.py

+ 7 - 7
pwman/data/drivers/mysql.py

@@ -50,7 +50,7 @@ class MySQLDatabase(Database):
             con.rollback()
 
     def __init__(self, mysqluri, dbformat=__DB_FORMAT__):
-        self._mysqluri = mysqluri
+        self.dburi = mysqluri
         self.dbversion = dbformat
 
     def _open(self):
@@ -87,20 +87,20 @@ class MySQLDatabase(Database):
                               ")")
 
             self._cur.execute("CREATE TABLE TAG"
-                              "(ID SERIAL PRIMARY KEY,"
-                              "DATA TEXT NOT NULL UNIQUE)")
+                              "(ID  SERIAL PRIMARY KEY,"
+                              "DATA VARCHAR(255) NOT NULL UNIQUE)")
 
             self._cur.execute("CREATE TABLE LOOKUP ("
-                              "nodeid SERIAL REFERENCES NODE(ID),"
-                              "tagid SERIAL REFERENCES TAG(ID)"
+                              "nodeid INTEGER NOT NULL REFERENCES NODE(ID),"
+                              "tagid INTEGER NOT NULL REFERENCES TAG(ID)"
                               ")")
 
             self._cur.execute("CREATE TABLE CRYPTO "
                               "(SEED TEXT, DIGEST TEXT)")
 
             self._cur.execute("CREATE TABLE DBVERSION("
-                              "VERSION TEXT NOT NULL DEFAULT {}"
-                              ")".format(__DB_FORMAT__))
+                              "VERSION TEXT NOT NULL "
+                              ")")
 
             self._cur.execute("INSERT INTO DBVERSION VALUES(%s)",
                               (self.dbversion,))

+ 3 - 0
pwman/tests/test_mysql.py

@@ -47,6 +47,9 @@ class TestMySQLDatabase(unittest.TestCase):
         self.db._cur.execute("DROP TABLE CRYPTO")
         self.db._con.commit()
 
+    def test_1_con(self):
+        pass
+
 if __name__ == '__main__':
 
     ce = CryptoEngine.get()