. Add CC_set_autocommit to psqlodbc(a).def files.

. Handle Standard_conforming_strings.

diff --git a/connection.c b/connection.c
index c76e64fc1b6763c3cf36d353eeb42023dc256b5e..ae5437ae0f35d64675d53dfd5a721b5176fef203 100644 (file)
--- a/connection.c
+++ b/connection.c
@@ -1032,6 +1032,15 @@ inolog("parameter name=%s\n", msgbuffer);
            free(conn->current_client_encoding);
        conn->current_client_encoding = strdup(msgbuffer);
    }
+   else if (stricmp(msgbuffer, "standard_conforming_strings") == 0)
+   {
+       SOCK_get_string(sock, msgbuffer, sizeof(msgbuffer));
+       if (stricmp(msgbuffer, "on") == 0)
+       {
+           mylog("standard_conforming_strings=%s\n", msgbuffer); 
+           conn->escape_in_literal = '\0';
+       }
+   }
    else if (stricmp(msgbuffer, "server_version") == 0)
    {
        char    szVersion[32];

diff --git a/convert.c b/convert.c
index dfc6f77339125fcec332ed1d19559bce7f6a780a..4db8ee8a79270d0a9d3510bb57ac678a06e3f5fc 100644 (file)
--- a/convert.c
+++ b/convert.c
@@ -3734,6 +3734,8 @@ mylog("cvt_null_date_string=%d pgtype=%d buf=%p\n", conn->connInfo.cvt_null_date
            case SQL_CHAR:
            case SQL_VARCHAR:
            case SQL_LONGVARCHAR:
+           case SQL_VARBINARY:
+           case SQL_LONGVARBINARY:
 #ifdef UNICODE_SUPPORT
            case SQL_WCHAR:
            case SQL_WVARCHAR:

diff --git a/psqlodbc.def b/psqlodbc.def
index fa72f2f4ade872532887e34cce3dfc33ab5174db..8ae53a29f114bea0e81d07dbb50ab6080adf5645 100644 (file)
--- a/psqlodbc.def
+++ b/psqlodbc.def
@@ -115,5 +115,6 @@ CC_connect
 CC_set_error
 CC_commit
 CC_abort
+CC_set_autocommit
 CC_send_query
 QR_Destructor

diff --git a/psqlodbca.def b/psqlodbca.def
index 4824d54cb4d1b8048647ed1633fe605f38cf8084..add3419df434a1a3a46ba76d75831e8b7864c189 100644 (file)
--- a/psqlodbca.def
+++ b/psqlodbca.def
@@ -89,5 +89,6 @@ CC_connect
 CC_set_error
 CC_commit
 CC_abort
+CC_set_autocommit
 CC_send_query
 QR_Destructor

diff --git a/socket.c b/socket.c
index 9ac03f1074478ad611acf58a71ce26808b09dda7..e9fac02efee8c0ebf24d71516c2889352d89f3e3 100644 (file)
--- a/socket.c
+++ b/socket.c
@@ -116,8 +116,7 @@ SOCK_Destructor(SocketClass *self)
        {
            if (self->via_libpq)
            {
-               if (self->pqconn)
-                   PQfinish(self->pqconn);
+               PQfinish(self->pqconn);
                /* UnloadDelayLoadedDLLs(NULL != self->ssl); */
            }
            self->via_libpq = FALSE;

diff --git a/version.h b/version.h
index 9a01f282dbdff6a3ac06435ba42a40f692afcea4..69312bc4602cb2cd857286ab343475ce1c61ac08 100644 (file)
--- a/version.h
+++ b/version.h
@@ -12,6 +12,6 @@
 #define POSTGRESDRIVERVERSION      "08.02.0402"
 #define POSTGRES_RESOURCE_VERSION  "08.02.0402\0"
 #define PG_DRVFILE_VERSION     8,2,04,02
-#define PG_BUILD_VERSION       "200706020001"
+#define PG_BUILD_VERSION       "200706040001"
 
 #endif