Update registry files to promote the ODBC3 driver to the default, and demote the...

diff --git a/psqlodbc.h b/psqlodbc.h
index a00e220504a1dfa726395714f5e1c254411be417..22ed32b44c1f342c47fe1267fe2ac9adaf6929c1 100644 (file)
--- a/psqlodbc.h
+++ b/psqlodbc.h
@@ -5,7 +5,7 @@
  *
  * Comments:       See "notice.txt" for copyright and license information.
  *
- * $Id: psqlodbc.h,v 1.76 2003/04/23 09:49:47 hinoue Exp $
+ * $Id: psqlodbc.h,v 1.77 2003/05/14 18:16:16 dpage Exp $
  *
  */
 
@@ -93,13 +93,13 @@ typedef UInt4 Oid;
 #if (ODBCVER >= 0x0300)
 #define DRIVER_ODBC_VER                "03.00"
 #ifdef UNICODE_SUPPORT
-#define DBMS_NAME              "PostgreSQL+ Unicode (Beta)"
+#define DBMS_NAME              "PostgreSQL Unicode (Beta)"
 #else
-#define DBMS_NAME              "PostgreSQL+ (Beta)"
+#define DBMS_NAME              "PostgreSQL"
 #endif /* UNICODE_SUPPORT */
 #else
 #define DRIVER_ODBC_VER                "02.50"
-#define DBMS_NAME              "PostgreSQL"
+#define DBMS_NAME              "PostgreSQL Legacy"
 #endif   /* ODBCVER */
 
 #ifdef WIN32

diff --git a/psqlodbc.reg b/psqlodbc.reg
index 71155f50a170fec62378787472d6fa05374c8750..b2d2aeddd09bb1c53f8b48857a3d33d41a355fb4 100644 (file)
--- a/psqlodbc.reg
+++ b/psqlodbc.reg
@@ -1,16 +1,16 @@
-REGEDIT4\r
-\r
-[HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI]\r
-\r
-[HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\ODBC Drivers]\r
-"PostgreSQL"="Installed"\r
-\r
-[HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL]\r
-"APILevel"="1"\r
-"ConnectFunctions"="YYN"\r
-"Driver"="PSQLODBC.DLL"\r
-"DriverODBCVer"="02.50"\r
-"FileUsage"="0"\r
-"Setup"="PSQLODBC.DLL"\r
-"SQLLevel"="1"\r
-"UsageCount"=dword:00000001\r
+REGEDIT4
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI]
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\ODBC Drivers]
+"PostgreSQL Legacy"="Installed"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL Legacy]
+"APILevel"="1"
+"ConnectFunctions"="YYN"
+"Driver"="PSQLODBC.DLL"
+"DriverODBCVer"="02.50"
+"FileUsage"="0"
+"Setup"="PSQLODBC.DLL"
+"SQLLevel"="1"
+"UsageCount"=dword:00000001

diff --git a/psqlodbc30.reg b/psqlodbc30.reg
index 79a63effff1c88ba84b6177e967e131f3794c44f..ae2b9f00da642033e6232094470a575fb22ae29d 100644 (file)
--- a/psqlodbc30.reg
+++ b/psqlodbc30.reg
@@ -1,16 +1,16 @@
-REGEDIT4\r
-\r
-[HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI]\r
-\r
-[HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\ODBC Drivers]\r
-"PostgreSQL+ (Beta)"="Installed"\r
-\r
-[HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL+ (Beta)]\r
-"APILevel"="1"\r
-"ConnectFunctions"="YYN"\r
-"Driver"="PSQLODBC30.DLL"\r
-"DriverODBCVer"="03.00"\r
-"FileUsage"="0"\r
-"Setup"="PSQLODBC30.DLL"\r
-"SQLLevel"="1"\r
-"UsageCount"=dword:00000001\r
+REGEDIT4
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI]
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\ODBC Drivers]
+"PostgreSQL"="Installed"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL]
+"APILevel"="1"
+"ConnectFunctions"="YYN"
+"Driver"="PSQLODBC30.DLL"
+"DriverODBCVer"="03.00"
+"FileUsage"="0"
+"Setup"="PSQLODBC30.DLL"
+"SQLLevel"="1"
+"UsageCount"=dword:00000001

diff --git a/psqlodbc30w.reg b/psqlodbc30w.reg
index ffeac51418819e10f1bfdea25029772d2cdeeb30..415c0ef1e50981dc0496809da379717c08583157 100644 (file)
--- a/psqlodbc30w.reg
+++ b/psqlodbc30w.reg
@@ -1,16 +1,18 @@
-REGEDIT4\r
-\r
-[HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI]\r
-\r
-[HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\ODBC Drivers]\r
-"PostgreSQL+ Unicode (Beta)"="Installed"\r
-\r
-[HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL+ Unicode (Beta)]\r
-"APILevel"="1"\r
-"ConnectFunctions"="YYN"\r
-"Driver"="PSQLODBC30W.DLL"\r
-"DriverODBCVer"="03.00"\r
-"FileUsage"="0"\r
-"Setup"="PSQLODBC30W.DLL"\r
-"SQLLevel"="1"\r
-"UsageCount"=dword:00000001\r
+REGEDIT4
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI]
+
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\ODBC Drivers]
+"PostgreSQL Unicode (Beta)"="Installed"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL Unicode (Beta)]
+"APILevel"="1"
+"ConnectFunctions"="YYN"
+"Driver"="PSQLODBC30W.DLL"
+"DriverODBCVer"="03.00"
+"FileUsage"="0"
+"Setup"="PSQLODBC30W.DLL"
+"SQLLevel"="1"
+"UsageCount"=dword:00000001
+