Changeset 15419 for trunk/Mars/msql/MTreeSQL.h

Timestamp:

04/24/13 19:11:15 (11 years ago)

Author:

tbretz

Message:

Removed support for writing to the table; added support for left joins

File:

• trunk/Mars/msql/MTreeSQL.h (modified) (3 diffs)

trunk/Mars/msql/MTreeSQL.h

@@ -39 +39 @@
 class TSQLServer;
 class TSQLRow;
-class MBasketSQL;
 
 class MTreeSQL : public TTree {
@@ -46 +45 @@
    Int_t                  fCurrentEntry;
    TString                fDB;
-   TString                fInsertQuery;   
    TString                fQuery;
-   TString                fTable;
    TSQLResult            *fResult;
    TSQLRow               *fRow;
    TSQLServer            *fServer;
-   Bool_t                 fBranchChecked;
+   std::vector<TString>   fTables;
 
-   void                   CheckBasket(TBranch * tb);
-   Bool_t                 CheckBranch(TBranch * tb);
    Bool_t                 CheckTable(const TString &table) const;
-   TString                CreateBranches(TSQLResult * rs);
+   TString                CreateBranches(TSQLResult * rs, const TString &table);
    std::vector<Int_t>    *GetColumnIndice(TBranch *branch);
-   void                   Init();   
-   void                   ResetQuery();
-   TString                ConvertTypeName(const TString& typeName );
-   virtual void           CreateBranch(const TString& branchName,const TString &typeName);
-   Bool_t                 CreateTable(const TString& table);
-   virtual TBasket       *CreateBasket(TBranch * br); 
+   void                   Init();
+   virtual TBasket       *CreateBasket(TBranch * br);
 
    virtual TBranch *BranchImp(const char *branchname, const char *classname, TClass *ptrClass, void *addobj, Int_t bufsize, Int_t splitlevel);
    virtual TBranch *BranchImp(const char *branchname, TClass *ptrClass, void *addobj, Int_t bufsize, Int_t splitlevel);
-   
+
 public:
-   MTreeSQL(TSQLServer * server, TString DB, const TString& table, const TString &addon);
+   MTreeSQL(TSQLServer * server, TString DB, const TString& table, const TString &addon="");
 
    virtual Int_t          Branch(TCollection *list, Int_t bufsize=32000, Int_t splitlevel=99, const char *name="");
@@ -88 +79 @@
    virtual Long64_t       GetEntries(const char *sel) { return TTree::GetEntries(sel); }
    virtual Long64_t       GetEntriesFast()const;
-           TString        GetTableName(){ return fTable; }
    virtual Long64_t       LoadTree(Long64_t entry);
    virtual Long64_t       PrepEntry(Long64_t entry);