- Changing CONNECT version number and date

modified:
  storage/connect/ha_connect.cc
  storage/connect/mysql-test/connect/r/xml.result

- Testing default pivot columns for srcdef
  Fixing order by MariaDB bug for pivot tables
modified:
  storage/connect/tabmysql.cpp
  storage/connect/tabmysql.h
  storage/connect/tabpivot.cpp
  storage/connect/tabpivot.h

storage/connect/ha_connect.cc

@@ -158,7 +158,7 @@ extern "C" char  nmfile[];
 extern "C" char  pdebug[];
 
 extern "C" {
-       char  version[]= "Version 1.01.0005 April 27, 2013";
+       char  version[]= "Version 1.01.0006 Mai 21, 2013";
 
 #if defined(XMSG)
        char  msglang[];            // Default message language

storage/connect/mysql-test/connect/r/xml.result

@@ -413,7 +413,7 @@ DROP TABLE t1;
 SET @a=LOAD_FILE('MYSQLD_DATADIR/test/t1.xml');
 SELECT CAST(@a AS CHAR CHARACTER SET latin1);
 CAST(@a AS CHAR CHARACTER SET latin1)	<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Created by CONNECT Version 1.01.0005 April 27, 2013 -->
+<!-- Created by CONNECT Version 1.01.0006 Mai 21, 2013 -->
 <t1>
 	<line>
 		<node>ÀÁÂÃ</node>

storage/connect/tabmysql.cpp

@@ -900,6 +900,29 @@ PCOL TDBMYSQL::MakeFieldColumn(PGLOBAL g, char *name)
   return colp;
   } // end of MakeFieldColumn
 
+/***********************************************************************/
+/*  Called by Pivot tables to find default column names in a View      */
+/*  as the name of last field not equal to the passed name.            */
+/***********************************************************************/
+char *TDBMYSQL::FindFieldColumn(char *name)
+  {
+  int          n;
+  MYSQL_FIELD *fld;
+  char        *cp = NULL;
+
+  for (n = Myc.m_Fields - 1; n >= 0; n--) {
+    fld = &Myc.m_Res->fields[n];
+
+    if (!name || stricmp(name, fld->name)) {
+      cp = fld->name;
+      break;
+      } // endif name
+
+    } // endfor n
+
+  return cp;
+  } // end of FindFieldColumn
+
 /***********************************************************************/
 /*  Data Base read routine for MYSQL access method.                    */
 /***********************************************************************/

storage/connect/tabmysql.h

@@ -90,6 +90,7 @@ class TDBMYSQL : public TDBASE {
   // Specific routines
           bool SetColumnRanks(PGLOBAL g);
           PCOL MakeFieldColumn(PGLOBAL g, char *name);
+          PSZ  FindFieldColumn(char *name);
 
  protected:
   // Internal functions

storage/connect/tabpivot.cpp

@@ -162,19 +162,10 @@ PCOL TDBPIVOT::MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n)
   } // end of MakeCol
 
 /***********************************************************************/
-/*  Prepare the source table Query.                                    */
+/*  Find default fonction and pivot columns.                           */
 /***********************************************************************/
-bool TDBPIVOT::GetSourceTable(PGLOBAL g)
+bool TDBPIVOT::FindDefaultColumns(PGLOBAL g)
   {
-  if (Tdbp)
-    return false;             // Already done
-
-  if (!Tabsrc && Tabname) {
-    // Get the table description block of this table
-    if (!(Tdbp = GetSubTable(g, ((PPIVOTDEF)To_Def)->Tablep, true)))
-      return true;
-
-    if (!Tdbp->IsView()) {
   PCOLDEF cdp;
   PTABDEF defp = Tdbp->GetDef();
 
@@ -193,7 +184,7 @@ bool TDBPIVOT::GetSourceTable(PGLOBAL g)
   if (!Picol) {
     // Find default Picol as the last one not equal to Fncol
     for (cdp = defp->GetCols(); cdp; cdp = cdp->GetNext())
-          if (!Fncol || stricmp(Fncol, cdp->GetName()))
+      if (stricmp(Fncol, cdp->GetName()))
         Picol = cdp->GetName();
   
     if (!Picol) {
@@ -203,8 +194,28 @@ bool TDBPIVOT::GetSourceTable(PGLOBAL g)
   
     } // endif Picol
   
+  return false;
+  } // end of FindDefaultColumns
+
+/***********************************************************************/
+/*  Prepare the source table Query.                                    */
+/***********************************************************************/
+bool TDBPIVOT::GetSourceTable(PGLOBAL g)
+  {
+  if (Tdbp)
+    return false;             // Already done
+
+  if (!Tabsrc && Tabname) {
+    // Get the table description block of this table
+    if (!(Tdbp = GetSubTable(g, ((PPIVOTDEF)To_Def)->Tablep, true)))
+      return true;
+
     if (!GBdone) {
       char   *colist;
+      PCOLDEF cdp;
+
+      if (FindDefaultColumns(g))
+        return true;
   
       // Locate the suballocated colist (size is not known yet)
       *(colist = (char*)PlugSubAlloc(g, NULL, 0)) = 0;
@@ -232,12 +243,13 @@ bool TDBPIVOT::GetSourceTable(PGLOBAL g)
       strcat(strcat(Tabsrc, " FROM "), Tabname);
       strcat(strcat(Tabsrc, " GROUP BY "), colist);
   
+      if (Tdbp->IsView())     // Until MariaDB bug is fixed
+        strcat(strcat(Tabsrc, " ORDER BY "), colist);
+
       // Now we know how much was suballocated
       PlugSubAlloc(g, NULL, strlen(Tabsrc));
       } // endif !GBdone
 
-    } // endif IsView
-
   } else if (!Tabsrc) {
     strcpy(g->Message, MSG(SRC_TABLE_UNDEF));
     return true;
@@ -263,6 +275,10 @@ bool TDBPIVOT::GetSourceTable(PGLOBAL g)
 bool TDBPIVOT::MakePivotColumns(PGLOBAL g)
   {
   if (!Tdbp->IsView()) {
+    // This was not done yet if GBdone is true
+    if (FindDefaultColumns(g))
+      return true;
+  
     // Now it is time to allocate the pivot and function columns
     if (!(Fcolp = Tdbp->ColDB(g, Fncol, 0))) {
       // Function column not found in table                                       
@@ -309,37 +325,16 @@ bool TDBPIVOT::MakeViewColumns(PGLOBAL g)
     } else
       tdbp = (PTDBMY)Tdbp;
 
-    if (!Fncol || !Picol) {
-      strcpy(g->Message, "Missing Function or Pivot column");
-      return true;
-      } // endif
-#if 0
-    if (!Fncol) {
-      for (crp = qryp->Colresp; crp; crp = crp->Next)
-        if (!Picol || stricmp(Picol, crp->Name))
-          Fncol = crp->Name;
-
-      if (!Fncol) {
+    if (!Fncol && !(Fncol = tdbp->FindFieldColumn(Picol))) {
       strcpy(g->Message, MSG(NO_DEF_FNCCOL));
       return true;
       } // endif Fncol
 
-      } // endif Fncol
-
-    if (!Picol) {
-      // Find default Picol as the last one not equal to Fncol
-      for (crp = qryp->Colresp; crp; crp = crp->Next)
-        if (!Fncol || stricmp(Fncol, crp->Name))
-          Picol = crp->Name;
-
-      if (!Picol) {
+    if (!Picol && !(Picol = tdbp->FindFieldColumn(Fncol))) {
       strcpy(g->Message, MSG(NO_DEF_PIVOTCOL));
       return true;
       } // endif Picol
 
-      } // endif Picol
-#endif // 0
-
     // Now it is time to allocate the pivot and function columns
     if (!(Fcolp = tdbp->MakeFieldColumn(g, Fncol)))
     	return true;

storage/connect/tabpivot.h

@@ -78,6 +78,7 @@ class TDBPIVOT : public TDBPRX {
 
  protected:
   // Internal routines
+          bool FindDefaultColumns(PGLOBAL g);
           bool GetSourceTable(PGLOBAL g);
           bool MakePivotColumns(PGLOBAL g);
           bool MakeViewColumns(PGLOBAL g);