summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJames Walker <walkah@walkah.net>2010-07-29 21:04:28 -0400
committerJames Walker <walkah@walkah.net>2010-07-29 21:04:28 -0400
commit47f19988d1b0e4f64fde8a385d3205c2fd476234 (patch)
treef55b02d80eda38097912d6f9878e591c056504e4 /lib
parentc2a26ba65339f7731e5e1f019704ee70c3943e94 (diff)
allow schema to work on more than one connection (namely, the Status_network DB)
Diffstat (limited to 'lib')
-rw-r--r--lib/schema.php37
1 files changed, 22 insertions, 15 deletions
diff --git a/lib/schema.php b/lib/schema.php
index 1503c96d4..e5def514e 100644
--- a/lib/schema.php
+++ b/lib/schema.php
@@ -47,40 +47,47 @@ if (!defined('STATUSNET')) {
class Schema
{
- static $_single = null;
+ static $_static = null;
protected $conn = null;
/**
* Constructor. Only run once for singleton object.
*/
- protected function __construct()
+ protected function __construct($conn = null)
{
- // XXX: there should be an easier way to do this.
- $user = new User();
-
- $this->conn = $user->getDatabaseConnection();
-
- $user->free();
+ if (is_null($conn)) {
+ // XXX: there should be an easier way to do this.
+ $user = new User();
+ $conn = $user->getDatabaseConnection();
+ $user->free();
+ unset($user);
+ }
- unset($user);
+ $this->conn = $conn;
}
/**
* Main public entry point. Use this to get
- * the singleton object.
+ * the schema object.
*
- * @return Schema the (single) Schema object
+ * @return Schema the Schema object for the connection
*/
- static function get()
+ static function get($conn = null)
{
+ if (is_null($conn)) {
+ $key = 'default';
+ } else {
+ $key = md5(serialize($conn->dsn));
+ }
+
$type = common_config('db', 'type');
- if (empty(self::$_single)) {
+ if (empty(self::$_static[$key])) {
$schemaClass = ucfirst($type).'Schema';
- self::$_single = new $schemaClass();
+ self::$_static[$key] = new $schemaClass($conn);
}
- return self::$_single;
+ return self::$_static[$key];
}
/**