Changeset 8996 for trunk/MagicSoft/Mars/msql

Timestamp:

07/05/08 20:01:55 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/msql

Files:

• MSQLMagic.cc (modified) (1 diff)
• MSQLMagic.h (modified) (1 diff)
• MSQLServer.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/msql/MSQLMagic.cc

@@ -187 +187 @@
 }
 
-Bool_t MSQLMagic::ExistStr(const char *column, const char *table, const char *test)
-{
-    TString query(Form("SELECT %s FROM %s WHERE %s='%s'", column, table, column, test));
+// --------------------------------------------------------------------------
+//
+// Check if the column of an entry in a table is existing and not null.
+// The entry is defined by column=test (column name) and a optional
+// WHERE statement.
+//
+Bool_t MSQLMagic::ExistStr(const char *column, const char *table, const char *test, const char *where)
+{
+    TString query(Form("SELECT %s FROM %s WHERE %s='%s' %s %s", column, table, column, test, where?"AND":"", where?where:""));
     TSQLResult *res = Query(query);
     if (!res)

trunk/MagicSoft/Mars/msql/MSQLMagic.h

@@ -44 +44 @@
     Int_t   QueryKeyOfVal(const char *col, const char *val);
     Int_t   QueryKeyOf(const char *col, const char *ext, const char *val);
-    Bool_t  ExistStr(const char *column, const char *table, const char *test);
+    Bool_t  ExistStr(const char *column, const char *table, const char *test, const char *where=0);
 
     Int_t Insert(const char *table, const char *vars, const char *where=0);

trunk/MagicSoft/Mars/msql/MSQLServer.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MSQLServer.cc,v 1.15 2008-06-02 08:46:49 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MSQLServer.cc,v 1.16 2008-07-05 18:57:35 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -668 +668 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Instantiate a dabase connection either by
+//   mysql://user:password@url/database
+// or by a resource file (in teh given string doesn't contain mysql://)
+//
 MSQLServer::MSQLServer(const char *u) : fType(kIsZombie) /*FOLD00*/
 {
-    TString url(u);
-    TString user, pasw;
-
-    if (!Split(url, user, pasw))
-    {
-        fType = kIsZombie;
-        return;
-    }
-    Init(url, user, pasw);
+    if (TString(u).Contains("mysql://", TString::kIgnoreCase))
+    {
+        TString url(u);
+        TString user, pasw;
+
+        if (!Split(url, user, pasw))
+        {
+            fType = kIsZombie;
+            return;
+        }
+        Init(url, user, pasw);
+    }
+    else
+    {
+        TEnv env(u);
+        InitEnv(env);
+    }
 }
 
@@ -781 +795 @@
         if (key=="PRI")
         {
-            rc = (*row)[0];
-            break;
+            if (!rc.IsNull())
+                rc += ", ";
+            rc += (*row)[0];
         }
         delete row;
@@ -823 +838 @@
 
         const TString tab = expr(0, expr.First('.'));
-        const TString var = expr(expr.First('.')+1, expr.Length());
+        //const TString var = expr(expr.First('.')+1, expr.Length());
 
         // If the table found is the primary table itself skip it.
@@ -838 +853 @@
             continue;
 
-        joins += Form("LEFT JOIN %s ON %s.%s=%s.%s ", tab.Data(),
-                      table, prim.Data(), tab.Data(), prim.Data());
+        joins += Form("LEFT JOIN %s USING (%s) ", tab.Data(), prim.Data());
     }