Allow optional () after current_user, session_user, user, current_time,

current_timestamp, current_date for ODBC compatibility.

Add more functions to odbc.sql catalog extension, use new CREATE OR
REPLACE FUNCTION.

Document iODBC/unixODBC build options.

2 files changed, 93 insertions, 47 deletions

diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml
index 27949d0931a..aaf2c0e4c02 100644
--- a/doc/src/sgml/installation.sgml
+++ b/doc/src/sgml/installation.sgml
@@ -1,4 +1,4 @@
-<!-- $Header: /cvsroot/pgsql/doc/src/sgml/installation.sgml,v 1.60 2001/10/09 18:46:00 petere Exp $ -->
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/installation.sgml,v 1.61 2001/10/09 22:32:32 petere Exp $ -->
 
 <chapter id="installation">
  <title><![%standalone-include[<productname>PostgreSQL</>]]>
@@ -696,7 +696,25 @@ su - postgres
        <term><option>--enable-odbc</option></term>
        <listitem>
         <para>
-         Build the ODBC driver package.
+         Build the ODBC driver.
+        </para>
+       </listitem>
+      </varlistentry>
+
+      <varlistentry>
+       <term><option>--with-iodbc</option></term>
+       <listitem>
+        <para>
+         Build the ODBC driver for use with <productname>iODBC</>.
+        </para>
+       </listitem>
+      </varlistentry>
+
+      <varlistentry>
+       <term><option>--with-unixodbc</option></term>
+       <listitem>
+        <para>
+         Build the ODBC driver for use with <productname>unixODBC</>.
         </para>
        </listitem>
       </varlistentry>
@@ -708,10 +726,16 @@ su - postgres
          Specifies the directory where the ODBC driver will expect its
          <filename>odbcinst.ini</> configuration file. The default is
          <filename>/usr/local/pgsql/etc</filename> or whatever you
-         specified as <option>--sysconfdir</option>. A default file
-         will be installed there. If you intend to share the
-         <filename>odbcinst.ini</> file between several ODBC drivers
-         then you may want to use this option.
+         specified as <option>--sysconfdir</option>. It should be
+         arranged that the driver reads the same file as the driver
+         manager.
+        </para>
+
+        <para>
+         If either the option <option>--with-iodbc</option> or the
+         option <option>--with-unixodbc</option> is used, this option
+         will be ignored because in that case the driver manager
+         handles the location of the configuration file.
         </para>
        </listitem>
       </varlistentry>
diff --git a/doc/src/sgml/odbc.sgml b/doc/src/sgml/odbc.sgml
index 95e0a5092fd..06ffedef40a 100644
--- a/doc/src/sgml/odbc.sgml
+++ b/doc/src/sgml/odbc.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/Attic/odbc.sgml,v 1.24 2001/09/13 15:55:23 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/odbc.sgml,v 1.25 2001/10/09 22:32:32 petere Exp $
 -->
 
  <chapter id="odbc">
@@ -80,39 +80,69 @@ $Header: /cvsroot/pgsql/doc/src/sgml/Attic/odbc.sgml,v 1.24 2001/09/13 15:55:23
    <title>Installation</title>
 
    <para>
-    The first thing to note about the <productname>psqlODBC</> driver
-    (or any <acronym>ODBC</> driver) is that there must exist a
-    <firstterm>driver manager</> on the system where the
-    <acronym>ODBC</> driver is to be used. There exists a free
-    <acronym>ODBC</> driver for Unix called
-    <indexterm><primary>iODBC</primary></indexterm>
-    <productname>iODBC</> which can be obtained via <ulink
-    url="http://www.iodbc.org">http://www.iodbc.org</ulink>.
-    Instructions for installing <productname>iODBC</> are contained in
-    the <productname>iODBC</> distribution. Having said that, any
-    driver manager that you can find for your platform should support
-    the <productname>psqlODBC</> driver, or any other <acronym>ODBC</>
-    driver for that matter.
+    In order to make use of an <acronym>ODBC</> driver there must
+    exist a <firstterm>driver manager</> on the system where the
+    <acronym>ODBC</> driver is to be used.  There are two free
+    <acronym>ODBC</> driver managers for Unix-like operating systems
+    known to us: <indexterm><primary>iODBC</primary></indexterm>
+    <ulink url="http://www.iodbc.org"><productname>iODBC</></ulink>
+    and <indexterm><primary>unixODBC</primary></indexterm> <ulink
+    url="http://www.unixodbc.org"><productname>unixODBC</></ulink>.
+    Instructions for installing these driver managers are to be found
+    in the respective distribution.  Software that provides database
+    access through <acronym>ODBC</acronym> should provide its own
+    driver manager (which may well be one of these two).  Having said
+    that, any driver manager that you can find for your platform
+    should support the <productname>PostgreSQL</> <acronym>ODBC</>
+    driver, or any other <acronym>ODBC</> driver for that matter.
+   </para>
+
+   <note>
+    <para>
+     The <productname>unixODBC</> distribution ships with a
+     <productname>PostgreSQL</> <acronym>ODBC</> driver of its own,
+     which is similar to the one contained in the
+     <productname>PostgreSQL</> distribution.  It is up to you which
+     one you want to use.  We plan to coordinate the development of
+     both drivers better in the future.
+    </para>
+   </note>
+
+   <para>
+    To install the <acronym>ODBC</> you simply need to supply the
+    <option>--enable-odbc</> option to the <filename>configure</>
+    script when you are building the entire <productname>PostgreSQL</>
+    distribution. The library will then automatically be built and
+    installed with the rest of the programs. If you forget that option
+    or want to build the ODBC driver later you can change into the
+    directory <filename>src/interfaces/odbc</> and do <literal>make</>
+    and <literal>make install</> there.
    </para>
 
    <para>
-    To install <productname>psqlODBC</> you simply need to supply the
-    <option>--enable-odbc</> option to the <filename>configure</> script when you are
-    building the entire <productname>PostgreSQL</> distribution. The library
-    and header files will then automatically be built and installed with the
-    rest of the programs. If you forget that option or want to build the ODBC
-    driver later you can change into the directory <filename>src/interfaces/odbc</>
-    and do <literal>make</> and <literal>make install</> there.
+    It is also possible to build the driver to be specifically tuned
+    for use with <productname>iODBC</> or <productname>unixODBC</>.
+    This means in particular that the driver will use the driver
+    manager's routines to process the configuration files, which is
+    probably desirable since it creates a more consistent
+    <acronym>ODBC</> environment on your system.  If you want to do
+    that, then supply the <filename>configure</> options
+    <option>--with-iodbc</> or <option>--with-unixodbc</> (but not
+    both).
    </para>
 
    <para>
-    The installation-wide configuration file <filename>odbcinst.ini</> will be
-    installed into the directory <filename>/usr/local/pgsql/etc/</>, or equivalent,
-    depending on what <option>--prefix</> and/or <option>--sysconfdir</> options
-    you supplied to <filename>configure</>. Since this file can also be shared
-    between different <acronym>ODBC</> drivers you can also install it in a shared
-    location. To do that, override the location of this file with the
-    <option>--with-odbcinst</> option.
+    If you build a <quote>stand-alone</quote> driver (not tied to
+    <productname>iODBC</> or <productname>unixODBC</>), then you can
+    specify where the driver should look for the configuration file
+    <filename>odbcinst.ini</>.  By default it will be the directory
+    <filename>/usr/local/pgsql/etc/</>, or equivalent, depending on
+    what <option>--prefix</> and/or <option>--sysconfdir</> options
+    you supplied to <filename>configure</>.  To select a specific
+    location outside the <productname>PostgreSQL</> installation
+    layout, use the <option>--with-odbcinst</> option.  To be most
+    useful, it should be arranged that the driver and the driver
+    manager read the same configuration file.
    </para>
 
    <para>
@@ -125,20 +155,12 @@ $Header: /cvsroot/pgsql/doc/src/sgml/Attic/odbc.sgml,v 1.24 2001/09/13 15:55:23
 psql -d template1 -f <replaceable>LOCATION</>/odbc.sql
 </programlisting>
     where specifying <literal>template1</literal> as the target
-    database will ensure that all subsequent new databases will
-    have these same definitions.
+    database will ensure that all subsequent new databases will have
+    these same definitions.  If for any reason you want to remove
+    these functions again, run the file
+    <filename>odbc-drop.sql</filename> through
+    <command>psql</command>.
    </para>
-
-   <sect2>
-    <title>Supported Platforms</title>
-    <para>
-     <productname>psqlODBC</productname> has been built and tested
-     on <systemitem class="osname">Linux</>. There have been reports of success
-     with <systemitem class="osname">FreeBSD</> and with <systemitem class="osname">Solaris</>. There are no known restrictions
-     on the basic code for other platforms which already support
-     <productname>Postgres</productname>.
-    </para>
-   </sect2>
   </sect1>
 
   <sect1 id="odbc-config">