Changeset 9195 for trunk/MagicSoft/Mars/msql

Timestamp:

12/21/08 18:09:49 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/msql

Files:

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

trunk/MagicSoft/Mars/msql/MSQLMagic.cc

@@ -33 +33 @@
 #include "MSQLMagic.h"
 
+#include <stdlib.h> // atoi (Ubuntu 8.10)
+
 #include <iostream>
 

trunk/MagicSoft/Mars/msql/MSQLServer.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MSQLServer.cc,v 1.16 2008-07-05 18:57:35 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MSQLServer.cc,v 1.17 2008-12-21 18:09:49 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -58 +58 @@
 #include <TBrowser.h>
 
+#include <TObjString.h>
+#include <TObjArray.h>
+
 ClassImp(MSQLServer);
 
@@ -781 +784 @@
 // Return the name of the (first) column with a primary key
 //
-TString MSQLServer::GetPrimaryKey(const char *table)
+TString MSQLServer::GetPrimaryKeys(const char *table)
 {
     TSQLResult *res = GetColumns(table);
@@ -787 +790 @@
         return "";
 
-    TString rc;
+    TObjArray arr;
+    arr.SetOwner();
 
     TSQLRow *row = 0;
@@ -794 +798 @@
         const TString key = (*row)[3];
         if (key=="PRI")
-        {
-            if (!rc.IsNull())
-                rc += ", ";
-            rc += (*row)[0];
-        }
+            arr.Add(new TObjString((*row)[0]));
         delete row;
     }
-
     delete res;
+
+    arr.Sort();
+
+    TString rc;
+    for (int i=0; i<arr.GetEntries(); i++)
+    {
+        if (i>0)
+            rc += ", ";
+        rc += arr[i]->GetName();
+    }
     return rc;
 }
@@ -849 +858 @@
 
         // Now get the primary key of the table to be joined
-        const TString prim = GetPrimaryKey(tab);
+        const TString prim = GetPrimaryKeys(tab);
         if (prim.IsNull())
             continue;

trunk/MagicSoft/Mars/msql/MSQLServer.h

@@ -123 +123 @@
 
     TString     GetEntry(const char *where, const char *col=0, const char *table=0) const;
-    TString     GetPrimaryKey(const char *table);
+    TString     GetPrimaryKeys(const char *table);
     TString     GetJoins(const char *table, const TString text);