add sqlite database support

[erebus.git] / erebus.py

diff --git a/erebus.py b/erebus.py
index 1a06ed3b5f6714b8136291465518e3f4613fa373..12be844b4388acf1fd77980abb4731cb80eed7b5 100644 (file)
--- a/erebus.py
+++ b/erebus.py
@@ -194,17 +194,24 @@ class Erebus(object): #singleton to pass around
                        self.potype = "select"
                        self.fdlist = []
 
-       def query(self, *args, **kwargs):
-               if 'noretry' in kwargs:
-                       noretry = kwargs['noretry']
-                       del kwargs['noretry']
-               else:
-                       noretry = False
+       def query(self, sql, parameters=[], noretry=False):
+               # Callers use %s-style (paramstyle='format') placeholders in queries.
+               # There's no provision for a literal '%s' present inside the query; stuff it in a parameter instead.
+               if db_api.paramstyle == 'format' or db_api.paramstyle == 'pyformat': # mysql, postgresql
+                       # psycopg actually asks for a mapping with %(name)s style (pyformat) but it will accept %s style.
+                       pass
+               elif db_api.paramstyle == 'qmark': # sqlite doesn't like %s style.
+                       parameters = [str(p) for p in parameters]
+                       sql = sql.replace('%s', '?') # hope that wasn't literal, oopsie
+
+               log_noretry = ''
+               if noretry:
+                       log_noretry = ', noretry=True'
+               self.log("[SQL]", "?", "query(%r, %r%s)" % (sql, parameters, log_noretry))
 
-               self.log("[SQL]", "?", "query(%s, %s)" % (', '.join([repr(i) for i in args]), ', '.join([str(key)+"="+repr(kwargs[key]) for key in kwargs])))
                try:
                        curs = self.db.cursor()
-                       res = curs.execute(*args, **kwargs)
+                       res = curs.execute(sql, parameters)
                        if res:
                                return curs
                        else:
@@ -216,11 +223,12 @@ class Erebus(object): #singleton to pass around
                        self.log("[SQL]", "!", "DB error! %r" % (e))
                        if not noretry:
                                dbsetup()
-                               return self.query(*args, noretry=True, **kwargs)
+                               return self.query(sql, parameters, noretry=True)
                        else:
                                raise e
 
        def querycb(self, cb, *args, **kwargs):
+               # TODO this should either get thrown out with getdb()/returndb(), or else be adjusted to make use of it.
                def run_query():
                        cb(self.query(*args, **kwargs))
                threading.Thread(target=run_query).start()
@@ -298,7 +306,9 @@ class Erebus(object): #singleton to pass around
                return [u for u in self.users.values() if u.auth == auth.lower()]
 
        def getdb(self):
-               """Get a DB object. The object must be returned to the pool after us, using returndb()."""
+               """Get a DB object. The object must be returned to the pool after us, using returndb(). This is intended for use from child threads.
+                       It should probably be treated as deprecated though. Where possible new modules should avoid using threads.
+                       In the future, timers will be provided (manipulating the timeout_seconds of the poll() method), and that should mostly be used in place of threading."""
                return self.dbs.pop()
 
        def returndb(self, db):
@@ -360,6 +370,8 @@ def dbsetup():
        dbtype = cfg.get('erebus', 'dbtype', 'mysql')
        if dbtype == 'mysql':
                _dbsetup_mysql()
+       elif dbtype == 'sqlite':
+               _dbsetup_sqlite()
        else:
                main.log('*', '!', 'Unknown dbtype in config: %s' % (dbtype))
 
@@ -370,6 +382,14 @@ def _dbsetup_mysql():
                main.dbs.append(db_api.connect(host=cfg.dbhost, user=cfg.dbuser, passwd=cfg.dbpass, db=cfg.dbname, cursorclass=MySQLdb.cursors.DictCursor))
        main.db = db_api.connect(host=cfg.dbhost, user=cfg.dbuser, passwd=cfg.dbpass, db=cfg.dbname, cursorclass=MySQLdb.cursors.DictCursor)
 
+def _dbsetup_sqlite():
+       global db_api
+       import sqlite3 as db_api
+       for i in range(cfg.get('erebus', 'num_db_connections', 2)):
+               main.db = db_api.connect(cfg.dbhost)
+               main.db.row_factory = db_api.Row
+               main.db.isolation_level = None
+               main.dbs.append(main.db)
 
 def setup():
        global cfg, main