Prep for 08.02.0100 release

diff --git a/configure.ac b/configure.ac
index 45e02ac8c8cd0d422e7d64e6a05b679f6fd5627b..64799a0a7eae8b2d57324d2c7ba1384993cfc760 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a configure script.
-AC_INIT(psqlodbc, 08.02.0007, [pgsql-odbc@postgresql.org])
+AC_INIT(psqlodbc, 08.02.0100, [pgsql-odbc@postgresql.org])
 AC_PREREQ(2.52)
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([bind.c])

diff --git a/docs/faq.html b/docs/faq.html
index 80bbd1486a975511c5f733f2fa66ee14543bc729..9465eb9c00a6d8acc0441510577647f445273df5 100644 (file)
--- a/docs/faq.html
+++ b/docs/faq.html
@@ -9,7 +9,7 @@
   
     <h1>psqlODBC FAQ</h1>
 
-    <p>Last updated: $Date: 2006/04/28 07:51:13 $</p>
+    <p>Last updated: $Date: 2006/08/31 08:38:20 $</p>
 
     <P>Current maintainer: Dave Page (<a href="mailto:dpage@postgresql.org">dpage@postgresql.org</a>)</p>
 
@@ -31,6 +31,7 @@
     <a href="#2.2">2.2</a>) What's the difference between a File DSN, System DSN, and User DSN?<br>
     <a href="#2.3">2.3</a>) How do I access more advanced driver and/or datasource options?<br>
     <a href="#2.4">2.4</a>) Where can I discover more information about ODBC errors?<br>
+    <a href="#2.5">2.5</a>) There are 2 drivers installed - which should I use?<br>
 
     <h2>3) Connections</h2>
     <a href="#3.1">3.1</a>) Why do I get a message like "Failed to authenticate client as Postgres user using unknown authentication type:be_recvauth: unrecognized message type: 65536" when I try to connect to a datasource?<br>
@@ -145,6 +146,23 @@
     This is good for applications that give misleading, little, or no descriptive information 
     when something goes wrong (VisData is a good example).
     </p>
+    
+    <h3><a name="2.5">2.5</a>) There are 2 drivers installed - which should I use?</h3>
+    <p>
+    <b>PostgreSQL Unicode</b> is a Unicode enabled driver that will work well with modern versions of
+    applications such as Microsoft Access, with character from a huge range of languages. You should
+    use this driver with PostgreSQL databases encoded as 'UNICODE' (more precisely known as 'UTF-8' in
+    PostgreSQL).
+    </p>
+    <p>
+    <b>PostgreSQL ANSI</b> is an ANSI driver which is also able to handle some multibyte character sets
+    such as EUC_JP, BIG5 and Shift-JIS. This driver should also be used with databases encoded using
+    any of the LATIN charactersets.
+    </p>
+    <p>
+    Note that some applications (notably Borland BDE) do not work properly with Unicode ODBC drivers.
+    In this case, you must use the ANSI driver.
+    </p>
 
     <h2>3) Connections</h2>
     

diff --git a/docs/release.html b/docs/release.html
index 9da282fef6e8c18c5975049451ac3e44db1cc838..6d18783511915c851f42d4819f1ebe71698e04c2 100644 (file)
--- a/docs/release.html
+++ b/docs/release.html
@@ -9,6 +9,16 @@
   
 <h1>psqlODBC release notes</h1>
 <hr>
+
+<h2>psqlODBC 08.02.0100 Release</h2>
+<li>Notes: psqlODBC 08.02.0100</li><br>
+Changes:<br>
+1) Return to Unicode/ANSI driver distribution as some users still find one works better than the other for them.<br>
+2) Improve connection error message in case of invalid protocol characters.<br>
+3) Initial value has set MSDTC=no of VC6 (Support of MSDTC is only VC7 and VC8)<br>
+4) Addition which is a driver name in a resource (Unicode or ANSI)<br>
+<br>
+
 <h2>Development snapshots</h2>
 <li>Notes: psqlODBC 08.02.0007</li><br>
 Changes:<br>

diff --git a/installer/Make.bat b/installer/Make.bat
index bdf449a4f0c22ada235c1fd04c1c0962a7db22a6..e0816bcce1277f86f8c62839566919f7aedb0fd4 100644 (file)
--- a/installer/Make.bat
+++ b/installer/Make.bat
@@ -9,7 +9,7 @@ if NOT "%1"=="" SET VERSION="%1"
 if NOT "%1"=="" GOTO GOT_VERSION
 
 REM The full version number of the build in XXXX.XX.XX format
-SET VERSION="08.02.0003"
+SET VERSION="08.02.0100"
 
 echo.
 echo Version not specified - defaulting to %VERSION%

diff --git a/installer/psqlodbcm.wxs b/installer/psqlodbcm.wxs
index 7ea094f86121ed8f4ca5ae4e980f3d0dbb5d3295..b08d945a3fe33dc41464e6617cc741375c52dfef 100644 (file)
--- a/installer/psqlodbcm.wxs
+++ b/installer/psqlodbcm.wxs
@@ -22,7 +22,9 @@
         <Component Id="psqlodbc.files" Guid="00A1ACE3-B7C2-41b8-A1F1-DB565990DA4E">
 
           <!-- PostgreSQL -->
+          <File Id="psqlodbc30a.dll" LongName="psqlodbc30a.dll" Name="psqlodxA.dll" src="../MultibyteRelease/psqlodbc30a.dll" />
           <File Id="psqlodbc35w.dll" LongName="psqlodbc35w.dll" Name="psqlodxW.dll" src="../Release/psqlodbc35w.dll" />
+          <File Id="pgxalib.dll" LongName="pgxalib.dll" Name="pgxalib.dll" src="../Release/pgxalib.dll" />
           <File Id="libpq.dll" Name="libpq.dll" src="$(var.PROGRAMFILES)\PostgreSQL\8.1\bin\libpq.dll" KeyPath="yes" />
           
           <!-- Gettext -->
@@ -39,15 +41,25 @@
           
           <!-- Note, installing the driver properly (IE, using ODBCDriver) has proven unreliable -->
           <!--       so we install the registry keys manually ourselves.                         -->
-          <Registry Id="psqlodbc35w.reg.1" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\ODBC Drivers" Name="PostgreSQL" Type="string" Value="Installed" />
-          <Registry Id="psqlodbc35w.reg.2" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL" Name="APILevel" Type="string" Value="1" />
-          <Registry Id="psqlodbc35w.reg.3" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL" Name="ConnectFunctions" Type="string" Value="YYN" />
-          <Registry Id="psqlodbc35w.reg.4" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL" Name="Driver" Type="string" Value="[#psqlodbc35w.dll]" />
-          <Registry Id="psqlodbc35w.reg.5" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL" Name="DriverODBCVer" Type="string" Value="03.51" />
-          <Registry Id="psqlodbc35w.reg.6" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL" Name="FileUsage" Type="string" Value="0" />
-          <Registry Id="psqlodbc35w.reg.7" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL" Name="Setup" Type="string" Value="[#psqlodbc35w.dll]" />
-          <Registry Id="psqlodbc35w.reg.8" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL" Name="SQLLevel" Type="string" Value="1" />
-          <Registry Id="psqlodbc35w.reg.9" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL" Name="UsageCount" Type="integer" Value="1" />
+          <Registry Id="psqlodbc30a.reg.1" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\ODBC Drivers" Name="PostgreSQL ANSI" Type="string" Value="Installed" />
+          <Registry Id="psqlodbc30a.reg.2" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL ANSI" Name="APILevel" Type="string" Value="1" />
+          <Registry Id="psqlodbc30a.reg.3" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL ANSI" Name="ConnectFunctions" Type="string" Value="YYN" />
+          <Registry Id="psqlodbc30a.reg.4" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL ANSI" Name="Driver" Type="string" Value="[#psqlodbc30a.dll]" />
+          <Registry Id="psqlodbc30a.reg.5" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL ANSI" Name="DriverODBCVer" Type="string" Value="03.00" />
+          <Registry Id="psqlodbc30a.reg.6" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL ANSI" Name="FileUsage" Type="string" Value="0" />
+          <Registry Id="psqlodbc30a.reg.7" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL ANSI" Name="Setup" Type="string" Value="[#psqlodbc30a.dll]" />
+          <Registry Id="psqlodbc30a.reg.8" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL ANSI" Name="SQLLevel" Type="string" Value="1" />
+          <Registry Id="psqlodbc30a.reg.9" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL ANSI" Name="UsageCount" Type="integer" Value="1" />
+
+          <Registry Id="psqlodbc35w.reg.1" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\ODBC Drivers" Name="PostgreSQL Unicode" Type="string" Value="Installed" />
+          <Registry Id="psqlodbc35w.reg.2" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL Unicode" Name="APILevel" Type="string" Value="1" />
+          <Registry Id="psqlodbc35w.reg.3" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL Unicode" Name="ConnectFunctions" Type="string" Value="YYN" />
+          <Registry Id="psqlodbc35w.reg.4" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL Unicode" Name="Driver" Type="string" Value="[#psqlodbc35w.dll]" />
+          <Registry Id="psqlodbc35w.reg.5" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL Unicode" Name="DriverODBCVer" Type="string" Value="03.51" />
+          <Registry Id="psqlodbc35w.reg.6" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL Unicode" Name="FileUsage" Type="string" Value="0" />
+          <Registry Id="psqlodbc35w.reg.7" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL Unicode" Name="Setup" Type="string" Value="[#psqlodbc35w.dll]" />
+          <Registry Id="psqlodbc35w.reg.8" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL Unicode" Name="SQLLevel" Type="string" Value="1" />
+          <Registry Id="psqlodbc35w.reg.9" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL Unicode" Name="UsageCount" Type="integer" Value="1" />
         </Component>
       </Directory>
     </Directory>

diff --git a/psqlodbc.rc b/psqlodbc.rc
index 612c2a4b5275a103d49a9b75eb8f394f32cd8c67..3dd4385ca22198552149f16a9f013b45629a3ffa 100644 (file)
--- a/psqlodbc.rc
+++ b/psqlodbc.rc
@@ -347,14 +347,14 @@ BEGIN
 #ifdef UNICODE_SUPPORT
             VALUE "InternalName", "psqlodbc35w\0"
 #else
-            VALUE "InternalName", "psqlodbca\0"
+            VALUE "InternalName", "psqlodbc30a\0"
 #endif
             VALUE "LegalCopyright", "\0"
             VALUE "LegalTrademarks", "ODBC(TM) is a trademark of Microsoft Corporation.  Microsoft\83\87 is a registered trademark of Microsoft Corporation. Windows(TM) is a trademark of Microsoft Corporation.\0"
 #ifdef UNICODE_SUPPORT
             VALUE "OriginalFilename", "psqlodbc35w.dll\0"
 #else
-            VALUE "OriginalFilename", "psqlodbca.dll\0"
+            VALUE "OriginalFilename", "psqlodbc30a.dll\0"
 #endif
             VALUE "PrivateBuild", "for Japanese by Hiroshi Inoue & Hiroshi Saito\0"
             VALUE "ProductName", "PostgreSQL\0"
@@ -693,14 +693,14 @@ BEGIN
 #ifdef UNICODE_SUPPORT
             VALUE "InternalName", "psqlodbc35w\0"
 #else
-            VALUE "InternalName", "psqlodbca\0"
+            VALUE "InternalName", "psqlodbc30a\0"
 #endif
             VALUE "LegalCopyright", "Copyright \0"
             VALUE "LegalTrademarks", "ODBC(TM) is a trademark of Microsoft Corporation.  Microsoft? is a registered trademark of Microsoft Corporation. Windows(TM) is a trademark of Microsoft Corporation.\0"
 #ifdef UNICODE_SUPPORT
             VALUE "OriginalFilename", "psqlodbc35w.dll\0"
 #else
-            VALUE "OriginalFilename", "psqlodbca.dll\0"
+            VALUE "OriginalFilename", "psqlodbc30a.dll\0"
 #endif
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "PostgreSQL\0"

diff --git a/psqlodbc.reg b/psqlodbc.reg
index a2f526f50f2664cbe01e07f0254085405e0ffe89..ce99283750b44b10aa5d4124a6751a83aa7f3453 100644 (file)
--- a/psqlodbc.reg
+++ b/psqlodbc.reg
@@ -3,9 +3,20 @@ REGEDIT4
 [HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI]
 
 [HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\ODBC Drivers]
-"PostgreSQL"="Installed"
+"PostgreSQL ANSI"="Installed"
+"PostgreSQL Unicode"="Installed"
 
-[HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL]
+[HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL ANSI]
+"APILevel"="1"
+"ConnectFunctions"="YYN"
+"Driver"="PSQLODBC30A.DLL"
+"DriverODBCVer"="03.00"
+"FileUsage"="0"
+"Setup"="PSQLODBC30A.DLL"
+"SQLLevel"="1"
+"UsageCount"=dword:00000001
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL Unicode]
 "APILevel"="1"
 "ConnectFunctions"="YYN"
 "Driver"="PSQLODBC35W.DLL"

diff --git a/version.h b/version.h
index 36066b7f2fd363f3b75e62cfabb8914995157d13..374a7e0076ec72f97979853f87a4df219421fd11 100644 (file)
--- a/version.h
+++ b/version.h
@@ -9,8 +9,8 @@
 #ifndef __VERSION_H__
 #define __VERSION_H__
 
-#define POSTGRESDRIVERVERSION      "08.02.0007"
-#define POSTGRES_RESOURCE_VERSION  "08.02.0007\0"
-#define PG_DRVFILE_VERSION     8,2,0,07
+#define POSTGRESDRIVERVERSION      "08.02.0100"
+#define POSTGRES_RESOURCE_VERSION  "08.02.0100\0"
+#define PG_DRVFILE_VERSION     8,2,01,00
 
 #endif

diff --git a/win32.mak b/win32.mak
index 3613b818ae24d191b5712acd196cd9c61c5682de..b29f6518d4a9b41f643a5ff547955648be17145c 100644 (file)
--- a/win32.mak
+++ b/win32.mak
@@ -95,7 +95,7 @@ NULL=nul
 !ENDIF
 
 !IF "$(ANSI_VERSION)" == "yes"
-MAINLIB = psqlodbca
+MAINLIB = psqlodbc30a
 !ELSE
 MAINLIB = psqlodbc35w
 !ENDIF
@@ -149,9 +149,9 @@ CLEAN :
 
 CPP=cl.exe
 !IF  "$(CFG)" == "Release"
-CPP_PROJ=/nologo /MT /W3 /GX /O2 /I "$(PG_INC)" /I "$(SSL_INC)" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PSQLODBC_EXPORTS" /D "WIN_MULTITHREAD_SUPPORT" $(ADD_DEFINES) /Fp"$(INTDIR)\psqlodbc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/nologo /MT /W3 /GX /O2 /I "$(PG_INC)" /I "$(SSL_INC)" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /D "PSQLODBC_EXPORTS" /D "WIN_MULTITHREAD_SUPPORT" $(ADD_DEFINES) /Fp"$(INTDIR)\psqlodbc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 !ELSEIF  "$(CFG)" == "Debug"
-CPP_PROJ=/nologo /MTd /W3 /Gm /GX /ZI /Od /I "$(PG_INC)" /I "$(SSL_INC)" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PSQLODBC_EXPORTS" /D "WIN_MULTITHREAD_SUPPORT" $(ADD_DEFINES) /Fp"$(INTDIR)\psqlodbc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP_PROJ=/nologo /MTd /W3 /Gm /GX /ZI /Od /I "$(PG_INC)" /I "$(SSL_INC)" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /D "PSQLODBC_EXPORTS" /D "WIN_MULTITHREAD_SUPPORT" $(ADD_DEFINES) /Fp"$(INTDIR)\psqlodbc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
 !ENDIF
 
 .c{$(INTDIR)}.obj::