Improve SQLGetDiagField so that an MFC appliaction reports

error messages properly(bug report from Silvio Scarpati).

diff --git a/environ.c b/environ.c
index 8121cfd452b2ad23050929f04136ed837abea36a..dd3c3883a053ecd28fd05446b2e327ee8edb429c 100644 (file)
--- a/environ.c
+++ b/environ.c
@@ -541,7 +541,7 @@ PGAPI_Error(
    else if (SQL_NULL_HDBC != hdbc)
        ret = PGAPI_ConnectError(hdbc, -1, szSqlState, pfNativeError,
             szErrorMsg, cbErrorMsgMax, pcbErrorMsg, flag);
-   else if (SQL_NULL_HENV != hdbc)
+   else if (SQL_NULL_HENV != henv)
        ret = PGAPI_EnvError(henv, -1, szSqlState, pfNativeError,
             szErrorMsg, cbErrorMsgMax, pcbErrorMsg, flag);
    else

diff --git a/pgapi30.c b/pgapi30.c
index 9945998d3ec1ef3222fe09071dabdfa67d505609..41718c5613c2990f381876ec0bce7cccd5b66bd0 100644 (file)
--- a/pgapi30.c
+++ b/pgapi30.c
@@ -295,6 +295,18 @@ PGAPI_GetDiagField(SQLSMALLINT HandleType, SQLHANDLE Handle,
                        *StringLengthPtr = sizeof(SQLINTEGER);
                    ret = SQL_SUCCESS;
                    break;
+               case SQL_DIAG_ROW_NUMBER:
+                   *((SQLINTEGER *) DiagInfoPtr) = SQL_ROW_NUMBER_UNKNOWN;
+                   if (StringLengthPtr)
+                       *StringLengthPtr = sizeof(SQLINTEGER);
+                   ret = SQL_SUCCESS;
+                   break;
+               case SQL_DIAG_COLUMN_NUMBER:
+                   *((SQLINTEGER *) DiagInfoPtr) = SQL_COLUMN_NUMBER_UNKNOWN;
+                   if (StringLengthPtr)
+                       *StringLengthPtr = sizeof(SQLINTEGER);
+                   ret = SQL_SUCCESS;
+                   break;
                case SQL_DIAG_RETURNCODE: /* driver manager returns */
                    break;
            }

diff --git a/version.h b/version.h
index a176c4204f6f2628071dcdc8cffa1f304399649b..c6074fc537adfa71f5e73bf0769c0deb62920276 100644 (file)
--- a/version.h
+++ b/version.h
@@ -9,8 +9,8 @@
 #ifndef __VERSION_H__
 #define __VERSION_H__
 
-#define POSTGRESDRIVERVERSION      "07.03.0109"
-#define POSTGRES_RESOURCE_VERSION  "07.03.0109\0"
-#define PG_DRVFILE_VERSION     7,3,1,09
+#define POSTGRESDRIVERVERSION      "07.03.0110"
+#define POSTGRES_RESOURCE_VERSION  "07.03.0110\0"
+#define PG_DRVFILE_VERSION     7,3,1,10
 
 #endif