From 37aba5df39afb192f0dd1dd51005374e63b4cb5f Mon Sep 17 00:00:00 2001
From: "Bart A.M. Jourquin" <bart.jourquin@fucam.ac.be>
Date: Tue, 25 Apr 2000 13:33:31 +0000
Subject: [PATCH] support of Sybase ASE 11

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7272 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/common/db.cpp      |  2 +-
 src/common/dbtable.cpp | 74 ++++++++++++++++++++++++++++++++----------
 2 files changed, 57 insertions(+), 19 deletions(-)

diff --git a/src/common/db.cpp b/src/common/db.cpp
index e37680defa..29de4dba2b 100644
--- a/src/common/db.cpp
+++ b/src/common/db.cpp
@@ -2490,7 +2490,7 @@ wxDBMS wxDb::Dbms(void)
     if (!wxStricmp(dbInf.dbmsName,"MySQL"))
         return(dbmsMY_SQL);
     if (!wxStricmp(baseName,"Sybase"))             
-      return(dbmsSYBASE_ASA);
+      return(dbmsSYBASE_ASE);
 
     baseName[5] = 0;
     if (!wxStricmp(baseName,"DBASE"))
diff --git a/src/common/dbtable.cpp b/src/common/dbtable.cpp
index 39d4c33a06..85e86cf91a 100644
--- a/src/common/dbtable.cpp
+++ b/src/common/dbtable.cpp
@@ -184,38 +184,53 @@ wxDbTable::wxDbTable(wxDb *pwxDb, const char *tblName, const int nCols,
 
     // Set the cursor type for the statement handles
     cursorType = SQL_CURSOR_STATIC;
+    //cursorType = SQL_CURSOR_FORWARD_ONLY;
     if (SQLSetStmtOption(hstmtInternal, SQL_CURSOR_TYPE, cursorType) != SQL_SUCCESS)
-    {
+      {	
         // Check to see if cursor type is supported
         pDb->GetNextError(henv, hdbc, hstmtInternal);
         if (! wxStrcmp(pDb->sqlState, "01S02"))  // Option Value Changed
-        {
+	  {
+	    
             // Datasource does not support static cursors.  Driver
             // will substitute a cursor type.  Call SQLGetStmtOption()
             // to determine which cursor type was selected.
             if (SQLGetStmtOption(hstmtInternal, SQL_CURSOR_TYPE, &cursorType) != SQL_SUCCESS)
-                pDb->DispAllErrors(henv, hdbc, hstmtInternal);
+	      pDb->DispAllErrors(henv, hdbc, hstmtInternal);
 #ifdef DBDEBUG_CONSOLE
             cout << "Static cursor changed to: ";
             switch(cursorType)
-            {
-            case SQL_CURSOR_FORWARD_ONLY:
+	      {
+	      case SQL_CURSOR_FORWARD_ONLY:
                 cout << "Forward Only";     break;
-            case SQL_CURSOR_STATIC:
+	      case SQL_CURSOR_STATIC:
                 cout << "Static";           break;
-            case SQL_CURSOR_KEYSET_DRIVEN:
+	      case SQL_CURSOR_KEYSET_DRIVEN:
                 cout << "Keyset Driven";    break;
-            case SQL_CURSOR_DYNAMIC:
+	      case SQL_CURSOR_DYNAMIC:
                 cout << "Dynamic";          break;
-            }
+	      }
             cout << endl << endl;
 #endif
-        }
-        else
-        {
+
+	    // BJO20000425
+	    if (pDb->FwdOnlyCursors() && cursorType != SQL_CURSOR_FORWARD_ONLY)
+	      {
+		// Force the use of a forward only cursor...
+		cursorType = SQL_CURSOR_FORWARD_ONLY;
+		if (SQLSetStmtOption(hstmtInternal, SQL_CURSOR_TYPE, cursorType) != SQL_SUCCESS)
+		  {
+		    // Should never happen
+		    pDb->GetNextError(henv, hdbc, hstmtInternal);
+		    return;
+		  }
+	      }
+	  }
+	else
+	  {
             pDb->DispNextError();
             pDb->DispAllErrors(henv, hdbc, hstmtInternal);
-        }
+	  }
     }
 #ifdef DBDEBUG_CONSOLE
     else
@@ -538,6 +553,20 @@ bool wxDbTable::execUpdate(const char *pSqlStmt)
 /********** wxDbTable::query() **********/
 bool wxDbTable::query(int queryType, bool forUpdate, bool distinct, const char *pSqlStmt)
 {
+
+
+
+/*  SQLFreeStmt(hstmt, SQL_CLOSE);
+  if (SQLExecDirect(hstmt, (UCHAR FAR *) pSqlStmt, SQL_NTS) == SQL_SUCCESS)
+    return(TRUE);
+  else
+    {
+      pDb->DispAllErrors(henv, hdbc, hstmt);
+      return(FALSE);
+    }
+*/
+
+
     char sqlStmt[DB_MAX_STATEMENT_LEN];
 
     // Set the selectForUpdate member variable
@@ -554,15 +583,24 @@ bool wxDbTable::query(int queryType, bool forUpdate, bool distinct, const char *
         pDb->WriteSqlLog(sqlStmt);
     }
 
+    SQLFreeStmt(hstmt, SQL_CLOSE);
+    if (SQLExecDirect(hstmt, (UCHAR FAR *) sqlStmt, SQL_NTS) == SQL_SUCCESS)
+      return(TRUE);
+    else
+      {
+        pDb->DispAllErrors(henv, hdbc, hstmt);
+        return(FALSE);
+      }
+
     // Make sure the cursor is closed first
     if (! CloseCursor(hstmt))
-        return(FALSE);
+      return(FALSE);
 
     // Execute the SQL SELECT statement
-    int retcode;   
-    retcode = SQLExecDirect(hstmt, (UCHAR FAR *) (queryType == DB_SELECT_STATEMENT ? pSqlStmt : sqlStmt), SQL_NTS);
+    int retcode;     
+    retcode = SQLExecDirect(hstmt, (UCHAR FAR *) (queryType == DB_SELECT_STATEMENT ? pSqlStmt : sqlStmt), SQL_NTS);      
     if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO)
-        return(pDb->DispAllErrors(henv, hdbc, hstmt));
+      return(pDb->DispAllErrors(henv, hdbc, hstmt));
 
     // Completed successfully
     return(TRUE);
@@ -1081,7 +1119,7 @@ bool wxDbTable::DropTable()
         {
             // Check for product specific error codes
             if (!((pDb->Dbms() == dbmsSYBASE_ASA && !wxStrcmp(pDb->sqlState,"42000"))   ||  // 5.x (and lower?)
-		  (pDb->Dbms() == dbmsSYBASE_ASA && !wxStrcmp(pDb->sqlState,"37000"))   ||
+		  (pDb->Dbms() == dbmsSYBASE_ASE && !wxStrcmp(pDb->sqlState,"37000"))   ||
                   (pDb->Dbms() == dbmsMY_SQL     && !wxStrcmp(pDb->sqlState,"S1000"))   ||  // untested
                   (pDb->Dbms() == dbmsPOSTGRES   && !wxStrcmp(pDb->sqlState,"08S01"))))     // untested
             {