fixed bug in parsing filenames without paths, added more/better tests

[wxWidgets.git] / src / common / dbtable.cpp

diff --git a/src/common/dbtable.cpp b/src/common/dbtable.cpp
index e190a7b17a7ed28dc17fe2e46d5c923321d7ab0b..de3b913141d9b31410423e56bb3a4fc47cc2d205 100644 (file)
--- a/src/common/dbtable.cpp
+++ b/src/common/dbtable.cpp
@@ -1441,6 +1441,42 @@ bool wxDbTable::DropIndex(const char * idxName)
 }  // wxDbTable::DropIndex()
 
 
 }  // wxDbTable::DropIndex()
 
 

+/********** wxDbTable::SetOrderByColNums() **********/
+bool wxDbTable::SetOrderByColNums(int first, ... )
+{
+    int         colNo = first;
+    va_list     argptr;
+
+    bool        abort = FALSE;
+    wxString    tempStr;
+
+    va_start(argptr, first);     /* Initialize variable arguments. */
+    while (!abort && (colNo != wxDB_NO_MORE_COLUMN_NUMBERS))
+    {
+        // Make sure the passed in column number
+        // is within the valid range of columns
+        //
+        // Valid columns are 0 thru noCols-1
+        if (colNo >= noCols || colNo < 0)
+        {
+            abort = TRUE;
+            continue;
+        }
+
+        if (colNo != first)
+            tempStr += ",";
+
+        tempStr += colDefs[colNo].ColName;
+        colNo = va_arg (argptr, int);
+    }
+    va_end (argptr);              /* Reset variable arguments.      */
+
+    SetOrderByClause(tempStr.c_str());
+
+    return (!abort);
+}  // wxDbTable::SetOrderByColNums()
+
+

 /********** wxDbTable::Insert() **********/
 int wxDbTable::Insert(void)
 {
 /********** wxDbTable::Insert() **********/
 int wxDbTable::Insert(void)
 {


@@ -1830,6 +1866,9 @@ bool wxDbTable::IsColNull(int colNo)
 /********** wxDbTable::CanSelectForUpdate() **********/
 bool wxDbTable::CanSelectForUpdate(void)
 {
 /********** wxDbTable::CanSelectForUpdate() **********/
 bool wxDbTable::CanSelectForUpdate(void)
 {

+    if (queryOnly)
+        return FALSE;
+

     if (pDb->Dbms() == dbmsMY_SQL)
         return FALSE;
 
     if (pDb->Dbms() == dbmsMY_SQL)
         return FALSE;