Changeset 7940 for trunk/MagicSoft/Mars

Timestamp:

08/25/06 17:17:50 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• msql/MSQLMagic.cc (added)
• msql/MSQLMagic.h (added)
• msql/MSQLServer.cc (modified) (15 diffs)
• msql/MSQLServer.h (modified) (5 diffs)
• msql/Makefile (modified) (1 diff)
• msql/SqlLinkDef.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -65 +65 @@
    * resources/sequences.rc:
      - resource file how to build sequences... added.
+
+   * msql/MSQLMagic.[h,cc]:
+     - added
+
+   * msql/MSQLServer.[h,cc]:
+     - added copy constructor
+     - allow fServ to be NULL (added sanity checks)
+     - Implemented Exec-command
+
+   * msql/Makefile, msql/SqlLinkDef.h:
+     - added MSQLMagic
 
 

trunk/MagicSoft/Mars/msql/MSQLServer.cc

@@ -64 +64 @@
 void MSQLServer::BrowseColumn(TBrowser *b) /*FOLD00*/
 {
+    if (!fServ)
+        return;
+
     const TString query0(Form("EXPLAIN %s.%s %s", (const char*)fDataBase, (const char*)fTable, (const char*)fColumn));
     const TString query1(Form("SELECT %s FROM %s.%s", (const char*)fColumn, (const char*)fDataBase, (const char*)fTable));
@@ -161 +164 @@
 void MSQLServer::BrowseTable(TBrowser *b) /*FOLD00*/
 {
+    if (!fServ)
+        return;
+
     TSQLResult *res = fServ->GetColumns(fDataBase, fTable);
     if (!res)
@@ -182 +188 @@
 void MSQLServer::BrowseDataBase(TBrowser *b) /*FOLD00*/
 {
+    if (!fServ)
+        return;
+
     TSQLResult *res = fServ->GetTables(fDataBase);
     if (!res)
@@ -203 +212 @@
 void MSQLServer::BrowseServer(TBrowser *b) /*FOLD00*/
 {
+    if (!fServ)
+        return;
+
     TSQLResult *res = fServ->GetDataBases();
     if (!res)
@@ -278 +290 @@
 TString MSQLServer::GetFields() const /*FOLD00*/
 {
+    if (!fServ)
+        return "";
+
     TSQLResult *res = fServ->GetColumns(fDataBase, fTable);
     if (!res)
@@ -303 +318 @@
 void MSQLServer::PrintQuery(const char *query) const /*FOLD00*/
 {
+    if (!fServ)
+        return;
+
     TSQLResult *res = fServ->Query(query);
     if (res)
@@ -407 +425 @@
 void MSQLServer::Close(Option_t *option) /*FOLD00*/
 {
-    if (fType==kIsServer)
+    if (fType==kIsServer && fServ)
+    {
         fServ->Close(option);
+        if (TestBit(kIsOwner))
+        {
+            delete fServ;
+            fServ=0;
+            ResetBit(kIsOwner);
+            fType=kIsZombie;
+        }
+    }
 }
 
 // --------------------------------------------------------------------------
 //
-// Send a SQL query to the SQl server.
+// Send a SQL query to the SQL server.
 //
 // If MSQLServer is no server (column, row, ...) NULL is returned and an
@@ -426 +453 @@
 TSQLResult *MSQLServer::Query(const char *sql) /*FOLD00*/
 {
+    if (!fServ)
+        return NULL;
+
     if (fType!=kIsServer)
     {
@@ -435 +465 @@
     if (!res)
     {
-        cout << "ERROR: MSQLServer::Query - Query failed: " << sql << endl;
+        cout << /*"ERROR: MSQLServer::Query - Query failed: " <<*/ sql << endl;
         return NULL;
     }
@@ -442 +472 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Send a SQL query to the SQL server.
+//
+// If MSQLServer is no server (column, row, ...) NULL is returned and an
+//  error message is send to stdout.
+//
+// If the query failed kFALSE is returned.
+//
+// On success kTRUE is returned.
+//
+Bool_t MSQLServer::Exec(const char* sql)
+{
+    if (!fServ)
+        return kFALSE;
+
+#if ROOT_VERSION_CODE < ROOT_VERSION(5,12,00)
+    TSQLResult *res = fServ->Query(sql);
+    if (!res)
+    {
+        cout << "ERROR: MSQLServer::Exec - Query failed: " << sql << endl;
+        return kFALSE;
+    }
+    delete res;
+    return kTRUE;
+#else
+    if (fType!=kIsServer)
+    {
+        cout << "ERROR: MSQLServer::Exec - this is not a server!" << endl;
+        return kFALSE;
+    }
+
+    return fServ->Exec(sql);
+#endif
+}
+
 Int_t MSQLServer::SelectDataBase(const char *dbname) /*FOLD00*/
 {
     fDataBase = dbname;
-    return fType==kIsServer ? fServ->SelectDataBase(dbname) : 0;
+    return fType==kIsServer && fServ ? fServ->SelectDataBase(dbname) : 0;
 }
 
 TSQLResult *MSQLServer::GetDataBases(const char *wild) /*FOLD00*/
 {
-    return fType==kIsServer ? fServ->GetDataBases(wild) : NULL;
+    return fType==kIsServer && fServ ? fServ->GetDataBases(wild) : NULL;
 }
 
 TSQLResult *MSQLServer::GetTables(const char *dbname, const char *wild) /*FOLD00*/
 {
-    return fType==kIsServer ? fServ->GetTables(dbname, wild) : NULL;
+    return fType==kIsServer && fServ ? fServ->GetTables(dbname, wild) : NULL;
 }
 
 TSQLResult *MSQLServer::GetColumns(const char *dbname, const char *table, const char *wild) /*FOLD00*/
 {
-    return fType==kIsServer ? fServ->GetColumns(dbname, table, wild) : NULL;
+    return fType==kIsServer && fServ ? fServ->GetColumns(dbname, table, wild) : NULL;
 }
 
 Int_t MSQLServer::CreateDataBase(const char *dbname) /*FOLD00*/
 {
-    return fType==kIsServer ? fServ->CreateDataBase(dbname) : 0;
+    return fType==kIsServer && fServ ? fServ->CreateDataBase(dbname) : 0;
 }
 
 Int_t MSQLServer::DropDataBase(const char *dbname) /*FOLD00*/
 {
-    return fType==kIsServer ? fServ->DropDataBase(dbname) : 0;
+    return fType==kIsServer && fServ ? fServ->DropDataBase(dbname) : 0;
 }
 
 Int_t MSQLServer::Reload() /*FOLD00*/
 {
-    return fType==kIsServer ? fServ->Reload() : 0;
+    return fType==kIsServer && fServ ? fServ->Reload() : 0;
 }
 
 Int_t MSQLServer::Shutdown() /*FOLD00*/
 {
-    return fType==kIsServer ? fServ->Shutdown() : 0;
+    return fType==kIsServer && fServ ? fServ->Shutdown() : 0;
 }
 
 const char *MSQLServer::ServerInfo() /*FOLD00*/
 {
-    return fType==kIsServer ? fServ->ServerInfo() : "";
+    return fType==kIsServer && fServ ? fServ->ServerInfo() : "";
 }
 
 Bool_t MSQLServer::IsConnected() const
 {
-    return fType==kIsServer ? fServ->IsConnected() : kFALSE;
+    return fType==kIsServer && fServ ? fServ->IsConnected() : kFALSE;
 }
 
 const char *MSQLServer::GetName() const
 {
+    if (!fServ)
+        return "Unconnected!";
+
     switch (fType)
     {
@@ -531 +600 @@
         gROOT->GetListOfBrowsables()->Add(this, connection);
         fType = kIsServer;
+        SetBit(kIsOwner);
+        SetBit(kMustCleanup);
     }
     else
@@ -567 +638 @@
         if (!Split(url, user, pass))
         {
-            SetBit(kIsZombie);
+            fType = kIsZombie;
             return;
         }
@@ -590 +661 @@
     if (!Split(url, user, pasw))
     {
-        SetBit(kIsZombie);
+        fType = kIsZombie;
         return;
     }
@@ -607 +678 @@
 }
 
+MSQLServer::MSQLServer(MSQLServer &serv)
+{
+    fServ = serv.fServ;
+
+    fDataBase = serv.fDataBase;
+    fTable = serv.fTable;
+    fColumn = serv.fColumn;
+
+    fType = serv.fType;
+}
+
 MSQLServer::~MSQLServer() /*FOLD00*/
 {
-    Close();
     if (gDebug>0)
         cout << "Delete: " << GetName() << endl;
+    Close();
 }
 
@@ -666 +748 @@
     return rc;
 }
+
+void MSQLServer::RecursiveRemove(TObject *obj)
+{
+    if (fServ==obj)
+    {
+        fServ=NULL;
+        fType = kIsZombie;
+        ResetBit(kIsOwner);
+    }
+}

trunk/MagicSoft/Mars/msql/MSQLServer.h

@@ -14 +14 @@
 class MSQLServer : public TObject
 {
+private:
     TSQLServer *fServ;
 
@@ -25 +26 @@
 
     Type_t  fType;
+
+    enum { kIsOwner=BIT(14) };
 
     Bool_t IsFolder() const { return kTRUE; }
@@ -85 +88 @@
     MSQLServer(const char *link);
     MSQLServer(TEnv &env, const char *prefix=0);
+    MSQLServer(MSQLServer &serv);
     MSQLServer();
     ~MSQLServer();
@@ -106 +110 @@
     void Close(Option_t *option="");
     TSQLResult *Query(const char *sql);
+    Bool_t      Exec(const char* sql);
     Int_t       SelectDataBase(const char *dbname);
     TSQLResult *GetDataBases(const char *wild = 0);
@@ -118 +123 @@
 
     TString     GetEntry(const char *where, const char *col=0, const char *table=0) const;
+
+    void RecursiveRemove(TObject *obj);
 
     ClassDef(MSQLServer, 0) // An enhancement of TSQLServer

trunk/MagicSoft/Mars/msql/Makefile

@@ -22 +22 @@
 
 SRCFILES = \
-        MSQLServer.cc
+        MSQLServer.cc \
+        MSQLMagic.cc
 
 ############################################################

trunk/MagicSoft/Mars/msql/SqlLinkDef.h

@@ -8 +8 @@
 #pragma link C++ class MSQLServer+;
 
+#pragma link C++ class MSQLMagic+;
+
 #endif