From 46bb23ac016714065711cf2a780e080c7310d66e Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Tue, 13 Aug 2002 20:40:44 +0000 Subject: Change NAMEDATALEN to 64, INDEX_MAX_KEYS/MAX_FUNC_ARGS to 32, per discussion on hackers. --- src/bin/psql/command.c | 4 +- src/include/catalog/catversion.h | 4 +- src/include/pg_config.h.in | 4 +- src/include/postgres_ext.h | 4 +- .../jdbc/org/postgresql/errors.properties | 2 +- .../jdbc/org/postgresql/util/Serialize.java | 12 +-- src/test/regress/expected/name.out | 88 +++++++++++----------- src/test/regress/sql/name.sql | 18 ++--- 8 files changed, 69 insertions(+), 67 deletions(-) (limited to 'src') diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c index 9be47a90c91..e483863bbb0 100644 --- a/src/bin/psql/command.c +++ b/src/bin/psql/command.c @@ -3,7 +3,7 @@ * * Copyright 2000-2002 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.75 2002/08/10 03:56:23 tgl Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.76 2002/08/13 20:40:44 momjian Exp $ */ #include "postgres_fe.h" #include "command.h" @@ -1513,7 +1513,7 @@ editFile(const char *fname) sys = malloc(strlen(editorName) + strlen(fname) + 32 + 1); if (!sys) return false; - sprintf(sys, "exec %s %s", editorName, fname); + snprintf(sys, 32, "exec %s %s", editorName, fname); result = system(sys); if (result == -1) psql_error("could not start editor %s\n", editorName); diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h index 792b2858f1d..8f06566e77c 100644 --- a/src/include/catalog/catversion.h +++ b/src/include/catalog/catversion.h @@ -37,7 +37,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: catversion.h,v 1.147 2002/08/09 16:45:14 tgl Exp $ + * $Id: catversion.h,v 1.148 2002/08/13 20:40:44 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -53,6 +53,6 @@ */ /* yyyymmddN */ -#define CATALOG_VERSION_NO 200208091 +#define CATALOG_VERSION_NO 200208131 #endif diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in index 01d5465ad84..ea91f79e324 100644 --- a/src/include/pg_config.h.in +++ b/src/include/pg_config.h.in @@ -8,7 +8,7 @@ * or in pg_config.h afterwards. Of course, if you edit pg_config.h, then your * changes will be overwritten the next time you run configure. * - * $Id: pg_config.h.in,v 1.26 2002/07/31 17:19:54 tgl Exp $ + * $Id: pg_config.h.in,v 1.27 2002/08/13 20:40:44 momjian Exp $ */ #ifndef PG_CONFIG_H @@ -162,7 +162,7 @@ * switch statement in fmgr_oldstyle() in src/backend/utils/fmgr/fmgr.c. * But consider converting such functions to new-style instead... */ -#define INDEX_MAX_KEYS 16 +#define INDEX_MAX_KEYS 32 #define FUNC_MAX_ARGS INDEX_MAX_KEYS /* diff --git a/src/include/postgres_ext.h b/src/include/postgres_ext.h index 3249ce4350b..d4e5b4ebbfa 100644 --- a/src/include/postgres_ext.h +++ b/src/include/postgres_ext.h @@ -15,7 +15,7 @@ * use header files that are otherwise internal to Postgres to interface * with the backend. * - * $Id: postgres_ext.h,v 1.10 2002/04/30 19:53:03 tgl Exp $ + * $Id: postgres_ext.h,v 1.11 2002/08/13 20:40:44 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -41,6 +41,6 @@ typedef unsigned int Oid; * * NOTE that databases with different NAMEDATALEN's cannot interoperate! */ -#define NAMEDATALEN 32 +#define NAMEDATALEN 64 #endif diff --git a/src/interfaces/jdbc/org/postgresql/errors.properties b/src/interfaces/jdbc/org/postgresql/errors.properties index 26ff2f724b2..d03673351b1 100644 --- a/src/interfaces/jdbc/org/postgresql/errors.properties +++ b/src/interfaces/jdbc/org/postgresql/errors.properties @@ -61,7 +61,7 @@ postgresql.res.colname:The column name {0} not found. postgresql.res.colrange:The column index is out of range. postgresql.res.nextrequired:Result set not positioned properly, perhaps you need to call next(). postgresql.serial.interface:You cannot serialize an interface. -postgresql.serial.namelength:Class & Package name length cannot be longer than 32 characters. {0} is {1} characters. +postgresql.serial.namelength:Class & Package name length cannot be longer than 64 characters. {0} is {1} characters. postgresql.serial.noclass:No class found for {0} postgresql.serial.table:The table for {0} is not in the database. Contact the DBA, as the database is in an inconsistent state. postgresql.serial.underscore:Class names may not have _ in them. You supplied {0}. diff --git a/src/interfaces/jdbc/org/postgresql/util/Serialize.java b/src/interfaces/jdbc/org/postgresql/util/Serialize.java index f1f12520baa..8898e1ecf4e 100644 --- a/src/interfaces/jdbc/org/postgresql/util/Serialize.java +++ b/src/interfaces/jdbc/org/postgresql/util/Serialize.java @@ -57,7 +57,7 @@ import java.sql.*; * There are a number of limitations placed on the java class to be * used by Serialize: *