aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas G. Lockhart <lockhart@fourpalms.org>2001-12-10 00:11:06 +0000
committerThomas G. Lockhart <lockhart@fourpalms.org>2001-12-10 00:11:06 +0000
commit9ed2ac291b50a210f804a72039f3e238317d4af1 (patch)
tree3b2126270eb7bc51a4465390b94e79de0062bdcc
parentabbd64cddf6e2cf871d576dea28e80365ac28e79 (diff)
downloadpostgresql-9ed2ac291b50a210f804a72039f3e238317d4af1.tar.gz
postgresql-9ed2ac291b50a210f804a72039f3e238317d4af1.zip
Remove duplicate lines from previous patch attempt. Trouble with my
DSL line at home broke things right in the middle of an update. :(
-rw-r--r--src/interfaces/odbc/convert.c5
-rw-r--r--src/interfaces/odbc/odbc.sql6
2 files changed, 1 insertions, 10 deletions
diff --git a/src/interfaces/odbc/convert.c b/src/interfaces/odbc/convert.c
index 6072ffc103d..57bf6b70dfc 100644
--- 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 e44618169dc..2c9e96ecc93 100644
--- 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:
-- <http://msdn.microsoft.com/library/en-us/odbc/htm/odbcscalar_functions.asp>
@@ -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;