database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-03 01:21:48 +03:00
Code

Make NAMEDATALEN changeable at compile time.

Browse Source
This commit is contained in:
Hiroshi Inoue 2002-07-11 01:52:46 +00:00
parent 87c963658c
commit 263db2e586
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/interfaces/odbc/connection.c
View File

@ -645,10 +645,11 @@ CC_connect(ConnectionClass *self, char password_req, char *salt_para)
ci->drivers.ksqo, ci->drivers.ksqo,
ci->drivers.unique_index, ci->drivers.unique_index,
ci->drivers.use_declarefetch); ci->drivers.use_declarefetch);
qlog(" text_as_longvarchar=%d, unknowns_as_longvarchar=%d, bools_as_char=%d\n", qlog(" text_as_longvarchar=%d, unknowns_as_longvarchar=%d, bools_as_char=%d NAMEDATALEN=%d\n",
ci->drivers.text_as_longvarchar, ci->drivers.text_as_longvarchar,
ci->drivers.unknowns_as_longvarchar, ci->drivers.unknowns_as_longvarchar,
ci->drivers.bools_as_char); ci->drivers.bools_as_char,
MAX_TABLE_LEN);
#ifdef MULTIBYTE #ifdef MULTIBYTE
encoding = check_client_encoding(ci->conn_settings); encoding = check_client_encoding(ci->conn_settings);
@ -728,7 +729,7 @@ another_version_retry:
SOCK_put_int(sock, htonl(4 + sizeof(StartupPacket6_2)), 4); SOCK_put_int(sock, htonl(4 + sizeof(StartupPacket6_2)), 4);
sp62.authtype = htonl(NO_AUTHENTICATION); sp62.authtype = htonl(NO_AUTHENTICATION);
strncpy(sp62.database, ci->database, PATH_SIZE); strncpy(sp62.database, ci->database, PATH_SIZE);
strncpy(sp62.user, ci->username, NAMEDATALEN); strncpy(sp62.user, ci->username, USRNAMEDATALEN);
SOCK_put_n_char(sock, (char *) &sp62, sizeof(StartupPacket6_2)); SOCK_put_n_char(sock, (char *) &sp62, sizeof(StartupPacket6_2));
SOCK_flush_output(sock); SOCK_flush_output(sock);
} }

4
src/interfaces/odbc/connection.h
View File

@ -94,7 +94,7 @@ typedef enum
#define NO_AUTHENTICATION 7 #define NO_AUTHENTICATION 7
#define PATH_SIZE 64 #define PATH_SIZE 64
#define ARGV_SIZE 64 #define ARGV_SIZE 64
#define NAMEDATALEN 16 #define USRNAMEDATALEN 16
typedef unsigned int ProtocolVersion; typedef unsigned int ProtocolVersion;
@ -120,7 +120,7 @@ typedef struct _StartupPacket6_2
{ {
unsigned int authtype; unsigned int authtype;
char database[PATH_SIZE]; char database[PATH_SIZE];
char user[NAMEDATALEN]; char user[USRNAMEDATALEN];
char options[ARGV_SIZE]; char options[ARGV_SIZE];
char execfile[ARGV_SIZE]; char execfile[ARGV_SIZE];
char tty[PATH_SIZE]; char tty[PATH_SIZE];

14
src/interfaces/odbc/psqlodbc.h
View File

@ -5,7 +5,7 @@
* *
* Comments: See "notice.txt" for copyright and license information. * Comments: See "notice.txt" for copyright and license information.
* *
* $Id: psqlodbc.h,v 1.68 2002/06/28 02:44:15 inoue Exp $ * $Id: psqlodbc.h,v 1.69 2002/07/11 01:52:46 inoue Exp $
* *
*/ */
@ -27,6 +27,10 @@
#define ODBCVER 0x0250 #define ODBCVER 0x0250
#endif /* ODBCVER_REP */ #endif /* ODBCVER_REP */
#ifndef NAMEDATALEN
#define NAMEDATALEN 32
#endif /* NAMEDATALEN */
#if defined(WIN32) || defined(WITH_UNIXODBC) || defined(WITH_IODBC) #if defined(WIN32) || defined(WITH_UNIXODBC) || defined(WITH_IODBC)
#include <sql.h> #include <sql.h>
@ -124,9 +128,9 @@ typedef UInt4 Oid;
#define BYTELEN 8 #define BYTELEN 8
#define VARHDRSZ sizeof(Int4) #define VARHDRSZ sizeof(Int4)
#define MAX_SCHEMA_LEN 32 #define MAX_SCHEMA_LEN NAMEDATALEN
#define MAX_TABLE_LEN 32 #define MAX_TABLE_LEN NAMEDATALEN
#define MAX_COLUMN_LEN 32 #define MAX_COLUMN_LEN NAMEDATALEN
#define MAX_CURSOR_LEN 32 #define MAX_CURSOR_LEN 32
/* Registry length limits */ /* Registry length limits */
@ -239,7 +243,7 @@ void logs_on_off(int cnopen, int, int);
#define TEXT_FIELD_SIZE 8190 /* size of text fields #define TEXT_FIELD_SIZE 8190 /* size of text fields
* (not including null * (not including null
* term) */ * term) */
#define NAME_FIELD_SIZE 32 /* size of name fields */ #define NAME_FIELD_SIZE NAMEDATALEN /* size of name fields */
#define MAX_VARCHAR_SIZE 254 /* maximum size of a varchar (not #define MAX_VARCHAR_SIZE 254 /* maximum size of a varchar (not
* including null term) */ * including null term) */