new db prefix support

hivesolutions · Apr 10, 2015 · 05f1bd6 · 05f1bd6
1 parent 2900f53
commit 05f1bd6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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)