ci->drivers.ksqo,
ci->drivers.unique_index,
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.unknowns_as_longvarchar,
- ci->drivers.bools_as_char);
+ ci->drivers.bools_as_char,
+ MAX_TABLE_LEN);
#ifdef MULTIBYTE
encoding = check_client_encoding(ci->conn_settings);
SOCK_put_int(sock, htonl(4 + sizeof(StartupPacket6_2)), 4);
sp62.authtype = htonl(NO_AUTHENTICATION);
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_flush_output(sock);
}
#define NO_AUTHENTICATION 7
#define PATH_SIZE 64
#define ARGV_SIZE 64
-#define NAMEDATALEN 16
+#define USRNAMEDATALEN 16
typedef unsigned int ProtocolVersion;
{
unsigned int authtype;
char database[PATH_SIZE];
- char user[NAMEDATALEN];
+ char user[USRNAMEDATALEN];
char options[ARGV_SIZE];
char execfile[ARGV_SIZE];
char tty[PATH_SIZE];
*
* 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 $
*
*/
#define ODBCVER 0x0250
#endif /* ODBCVER_REP */
+#ifndef NAMEDATALEN
+#define NAMEDATALEN 32
+#endif /* NAMEDATALEN */
+
#if defined(WIN32) || defined(WITH_UNIXODBC) || defined(WITH_IODBC)
#include <sql.h>
#define BYTELEN 8
#define VARHDRSZ sizeof(Int4)
-#define MAX_SCHEMA_LEN 32
-#define MAX_TABLE_LEN 32
-#define MAX_COLUMN_LEN 32
+#define MAX_SCHEMA_LEN NAMEDATALEN
+#define MAX_TABLE_LEN NAMEDATALEN
+#define MAX_COLUMN_LEN NAMEDATALEN
#define MAX_CURSOR_LEN 32
/* Registry length limits */
#define TEXT_FIELD_SIZE 8190 /* size of text fields
* (not including null
* 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
* including null term) */