OSDN Git Service

Remove long-unused and broken TCL_ARRAYS.
authorAlvaro Herrera <alvherre@alvh.no-ip.org>
Fri, 29 Feb 2008 20:58:33 +0000 (20:58 +0000)
committerAlvaro Herrera <alvherre@alvh.no-ip.org>
Fri, 29 Feb 2008 20:58:33 +0000 (20:58 +0000)
src/backend/utils/adt/arrayfuncs.c
src/include/pg_config_manual.h

index 8b058cb..b2beb18 100644 (file)
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.140 2008/01/01 19:45:52 momjian Exp $
+ *       $PostgreSQL: pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.141 2008/02/29 20:58:33 alvherre Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1030,9 +1030,7 @@ array_out(PG_FUNCTION_ARGS)
                                if (ch == '"' || ch == '\\')
                                {
                                        needquote = true;
-#ifndef TCL_ARRAYS
                                        overall_length += 1;
-#endif
                                }
                                else if (ch == '{' || ch == '}' || ch == typdelim ||
                                                 isspace((unsigned char) ch))
@@ -1103,7 +1101,6 @@ array_out(PG_FUNCTION_ARGS)
                if (needquotes[k])
                {
                        APPENDCHAR('"');
-#ifndef TCL_ARRAYS
                        for (tmp = values[k]; *tmp; tmp++)
                        {
                                char            ch = *tmp;
@@ -1113,9 +1110,6 @@ array_out(PG_FUNCTION_ARGS)
                                *p++ = ch;
                        }
                        *p = '\0';
-#else
-                       APPENDSTR(values[k]);
-#endif
                        APPENDCHAR('"');
                }
                else
index 354a3d3..0a1e823 100644 (file)
@@ -6,7 +6,7 @@
  * for developers.     If you edit any of these, be sure to do a *full*
  * rebuild (and an initdb if noted).
  *
- * $PostgreSQL: pgsql/src/include/pg_config_manual.h,v 1.27 2007/06/08 18:23:53 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/pg_config_manual.h,v 1.28 2008/02/29 20:58:33 alvherre Exp $
  *------------------------------------------------------------------------
  */
 
 #define NUM_USER_DEFINED_LWLOCKS       4
 
 /*
- * Define this to make libpgtcl's "pg_result -assign" command process
- * C-style backslash sequences in returned tuple data and convert
- * PostgreSQL array values into Tcl lists.     CAUTION: This conversion
- * is *wrong* unless you install the routines in
- * contrib/string/string_io to make the server produce C-style
- * backslash sequences in the first place.
- */
-/* #define TCL_ARRAYS */
-
-/*
  * Define this if you want psql to _always_ ask for a username and a
  * password for password authentication.
  */