Changeset 15440 for trunk/Mars/msql/MSQLServer.cc

Timestamp:

04/25/13 14:32:54 (11 years ago)

Author:

tbretz

Message:

Support more than one MTreeSQL per database connection.

File:

• trunk/Mars/msql/MSQLServer.cc (modified) (4 diffs)

trunk/Mars/msql/MSQLServer.cc

@@ -447 +447 @@
         if (TestBit(kIsOwner))
         {
-            if (fTree)
-                delete fTree;
+            fTrees.Delete();
 
             delete fServ;
@@ -626 +625 @@
         fType = kIsZombie;
 
-    fTree = 0;
     fList.SetOwner();
 }
@@ -720 +718 @@
 {
     fServ = serv.fServ;
-    fTree = 0;
 
     fDataBase = serv.fDataBase;
@@ -881 +878 @@
 }
 
-MTreeSQL *MSQLServer::GetTree(const char *table, const char *addon)
+MTreeSQL *MSQLServer::GetTree(TString table, TString addon)
 {
     if (fType!=kIsServer || !fServ || !TestBit(kIsOwner))
         return 0;
 
-    if (!fTree)
-        fTree = new MTreeSQL(this, table, addon);
-
-    return fTree;
+    TIter Next(&fTrees);
+    TObject *o = 0;
+    while ((o=Next()))
+    {
+        if (o->GetName()==table && o->GetName()==addon)
+            return (MTreeSQL*)o;
+    }
+
+    MTreeSQL *t = new MTreeSQL(this, table, addon);
+    fTrees.Add(t);
+
+    return t;
 }