Make backwards compatible with nacl 1.0.x

[securemail.git] / db.py

diff --git a/db.py b/db.py
index 9715b89a162d8201064e5bc871fd6ede5e158ae7..93eea0991bfd8ac4ca8697bad8fafbd6adba0af5 100644 (file)
--- a/db.py
+++ b/db.py
@@ -18,25 +18,25 @@
 # along with SecureMail.  If not, see <https://www.gnu.org/licenses/>.
 
 # sqlite
 # along with SecureMail.  If not, see <https://www.gnu.org/licenses/>.
 
 # sqlite

-# create table account (
-# id int auto_increment,
-# token char(128) unique not null,
-# cipher text not null,
-# primary key (id));
-#
+sqlite_sql = """create table account (
+id int auto_increment,
+token char(128) unique not null,
+cipher text not null,
+primary key (id))"""
+

 # mysql
 # mysql

-# create table account (
-# id int auto_increment,
-# token char(128) unique not null,
-# cipher text not null,
-# primary key (id));
-#
+mysql_sql = """create table account (
+id int auto_increment,
+token char(128) unique not null,
+cipher text not null,
+primary key (id))"""
+

 # postgresql
 # postgresql

-# create table account (
-# id serial,
-# token char(128) unique not null,
-# cipher bytea not null,
-# primary key (id));
+postgresql_sql = """create table account (
+id serial,
+token char(128) unique not null,
+cipher bytea not null,
+primary key (id))"""

 
 import base64
 from config import DBTYPE, DBNAME
 
 import base64
 from config import DBTYPE, DBNAME


@@ -79,7 +79,7 @@ class DB:
         if self.conn is None:
             if DBTYPE == 'mysql':
                 import MySQLdb
         if self.conn is None:
             if DBTYPE == 'mysql':
                 import MySQLdb

-                self.conn = MySQLdb.connect(host=DBHOST, port=DBPORT, user=DBUID, password=DBPWD, database=DBNAME)
+                self.conn = MySQLdb.connect(host=DBHOST, port=DBPORT, user=DBUID, passwd=DBPWD, db=DBNAME)

             elif DBTYPE == 'postgresql':
                 import psycopg2
                 self.conn = psycopg2.connect(host=DBHOST, port=DBPORT, user=DBUID, password=DBPWD, dbname=DBNAME)
             elif DBTYPE == 'postgresql':
                 import psycopg2
                 self.conn = psycopg2.connect(host=DBHOST, port=DBPORT, user=DBUID, password=DBPWD, dbname=DBNAME)


@@ -139,3 +139,64 @@ class DBInterface:
             raise e
         finally:
             cursor.close()
             raise e
         finally:
             cursor.close()

+
+    @staticmethod
+    def create_database():
+        if DBTYPE == 'mysql':
+            from MySQLdb import Error as DBError
+        elif DBTYPE == 'postgresql':
+            from psycopg2 import Error as DBError
+        elif DBTYPE == 'sqlite':
+            from apsw import Error as DBError
+        conn = DB().get_connection()
+        cursor = conn.cursor()
+        try:
+            if DBTYPE != 'sqlite':
+                if DBTYPE == 'mysql':
+                    sql = mysql_sql
+                elif DBTYPE == 'postgresql':
+                    sql = postgresql_sql
+                cursor.execute(sql)
+                conn.commit()
+            else:
+                cursor.execute('begin')
+                cursor.execute(sqlite_sql)
+                cursor.execute('commit')
+        except DBError as e:
+            if DBTYPE != 'sqlite':
+                conn.rollback()
+            else:
+                cursor.execute('rollback')
+            raise e
+        finally:
+            cursor.close()
+
+def main():
+    from optparse import OptionParser
+    
+    usage = "usage: %prog [options] arg"
+    parser = OptionParser(usage)
+    parser.add_option("-c", "--create", action="store_true", dest="create",
+                      help="Create tables in database using config.py", default=False)
+    parser.add_option("-v", "--verbose", action="store_true", dest="verbose",
+                      help="Run in verbose mode", default=False)
+    (options, args) = parser.parse_args()
+    
+    if  options.create:
+        try:
+            if options.verbose:
+                print("Creating empty database")
+                print("Database Engine: {0}".format(DBTYPE))
+                if DBTYPE != 'sqlite':
+                    print("Database Host: {0}".format(DBHOST))
+                    print("Database Port: {0}".format(DBPORT))
+                else:
+                    print("Database File: ./{0}.db".format(DBNAME))
+            DBInterface.create_database()
+            print("Database created")
+        except Exception as e:
+            print("Creating database failed!")
+            print(e)
+        
+if __name__ == '__main__':
+    main()