From 05f1bd638d39f9fb9eb75a908f68dcbfc0576591 Mon Sep 17 00:00:00 2001 From: joamag Date: Fri, 10 Apr 2015 14:35:46 +0100 Subject: [PATCH] new db prefix support --- data/src/entity_mysql/system.py | 4 ++-- data/src/entity_pgsql/system.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/src/entity_mysql/system.py b/data/src/entity_mysql/system.py index 3e0c10bedd..34000c5fb6 100644 --- a/data/src/entity_mysql/system.py +++ b/data/src/entity_mysql/system.py @@ -142,11 +142,11 @@ def apply_types(self, types_map): types_map["metadata"] = "longtext" def connect(self, connection, parameters = {}): - default = self.entity_manager.id or "default" host = parameters.get("host", "localhost") user = parameters.get("user", "root") password = parameters.get("password", "root") - database = parameters.get("database", default) + db_prefix = parameters.get("db_prefix", "") + database = parameters.get("database", db_prefix + "default") isolation = parameters.get("isolation", ISOLATION_LEVEL) host = colony.conf("DB_HOST", host) user = colony.conf("DB_USER", user) diff --git a/data/src/entity_pgsql/system.py b/data/src/entity_pgsql/system.py index ac4b40de88..6f17825bd6 100644 --- a/data/src/entity_pgsql/system.py +++ b/data/src/entity_pgsql/system.py @@ -129,11 +129,11 @@ def get_database_encoding(self): return encoding def connect(self, connection, parameters = {}): - default = self.entity_manager.id or "default" host = parameters.get("host", "localhost") user = parameters.get("user", "postgres") password = parameters.get("password", "postgres") - database = parameters.get("database", default) + db_prefix = parameters.get("db_prefix", "") + database = parameters.get("database", db_prefix + "default") isolation = parameters.get("isolation", ISOLATION_LEVEL) host = colony.conf("DB_HOST", host) user = colony.conf("DB_USER", user)