From 3902cb0b27cb4bfac435498fb9dddaf7f7d4cce3 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Wed, 3 Sep 2014 16:37:19 -0500 Subject: [PATCH] support for multiple db filesystems, thanks Luca --- VERSION | 2 +- gluon/dal.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/VERSION b/VERSION index 560c0b35..14157cd4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.9.6-stable+timestamp.2014.09.03.16.28.59 +Version 2.9.6-stable+timestamp.2014.09.03.16.37.15 diff --git a/gluon/dal.py b/gluon/dal.py index 5fcaca24..f1034826 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -4587,20 +4587,20 @@ class CubridAdapter(MySQLAdapter): ######## GAE MySQL ########## class DatabaseStoredFile: - web2py_filesystem = False + web2py_filesystems = set() def escape(self, obj): return self.db._adapter.escape(obj) @classmethod def try_create_web2py_filesystem(db): - if not DatabaseStoredFile.web2py_filesystem: + if not db._uri in DatabaseStoredFile.web2py_filesystems: if db._adapter.dbengine == 'mysql': sql = "CREATE TABLE IF NOT EXISTS web2py_filesystem (path VARCHAR(255), content LONGTEXT, PRIMARY KEY(path) ) ENGINE=InnoDB;" elif db._adapter.dbengine in ('postgres', 'sqlite'): sql = "CREATE TABLE IF NOT EXISTS web2py_filesystem (path VARCHAR(255), content TEXT, PRIMARY KEY(path));" db.executesql(sql) - DatabaseStoredFile.web2py_filesystem = True + DatabaseStoredFile.web2py_filesystems.add(db._uri) def __init__(self, db, filename, mode): if not db._adapter.dbengine in ('mysql', 'postgres', 'sqlite'):