Remove duplicate lines from previous patch attempt. Trouble with my

 DSL line at home broke things right in the middle of an update. :(

diff --git a/src/interfaces/odbc/convert.c b/src/interfaces/odbc/convert.c
index 6072ffc103d93c9ee9eaff73e607a19dc8d48ced..57bf6b70dfcd418ade5ad4d71ca593419e247948 100644 (file)
--- a/src/interfaces/odbc/convert.c
+++ b/src/interfaces/odbc/convert.c
@@ -99,11 +99,6 @@ char    *mapFuncs[][2] = {
    {"CURRENT_TIMESTAMP", "odbc_timestamp"},
    {"CURRENT_USER", "odbc_current_user"},
    {"SESSION_USER", "odbc_session_user"},
-   {"CURRENT_DATE", "curdate"},
-   {"CURRENT_TIME", "curtime"},
-   {"CURRENT_TIMESTAMP", "odbc_timestamp"},
-   {"CURRENT_USER", "odbc_current_user"},
-   {"SESSION_USER", "odbc_session_user"},
 /* { "CURDATE",     "curdate"    }, */
 /* { "CURTIME",     "curtime"    }, */
 /* { "DAYNAME",     "dayname"    }, */

diff --git a/src/interfaces/odbc/odbc.sql b/src/interfaces/odbc/odbc.sql
index e44618169dce296b1f114713d9f039dbccdc06e0..2c9e96ecc931be0cd637c2edcb6c0eab92d95903 100644 (file)
--- a/src/interfaces/odbc/odbc.sql
+++ b/src/interfaces/odbc/odbc.sql
@@ -1,5 +1,5 @@
 -- PostgreSQL catalog extensions for ODBC compatibility
--- $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/odbc.sql,v 1.5 2001/12/10 00:01:14 thomas Exp $
+-- $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/odbc.sql,v 1.6 2001/12/10 00:11:06 thomas Exp $
 
 -- ODBC functions are described here:
 -- 
@@ -145,10 +145,6 @@ CREATE OR REPLACE FUNCTION odbc_timestamp() RETURNS timestamp with time zone AS
     SELECT current_timestamp;
 ' LANGUAGE SQL;
 
-CREATE OR REPLACE FUNCTION odbc_timestamp() RETURNS timestamp with time zone AS '
-    SELECT current_timestamp;
-' LANGUAGE SQL;
-
 CREATE OR REPLACE FUNCTION dayname(timestamp) RETURNS text AS '
     SELECT to_char($1,''Day'');
 ' LANGUAGE SQL;