database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-09-02 04:21:28 +03:00
Code Activity

Fixed double definition of ecpg_compat_mode.

Browse Source
This commit is contained in:
Michael Meskes
2003-05-02 14:43:25 +00:00
parent 9e9d8d54e3
commit f7d836212a
4 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/interfaces/ecpg/ecpglib/connect.c
View File

@@ -1,4 +1,4 @@
/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/ecpglib/connect.c,v 1.3 2003/04/08 12:34:25 meskes Exp $ */
/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/ecpglib/connect.c,v 1.4 2003/05/02 14:43:25 meskes Exp $ */
#include "postgres_fe.h"
@@ -11,8 +11,6 @@
static struct connection *all_connections = NULL,
*actual_connection = NULL;
extern enum COMPAT_MODE ecpg_compat_mode;
struct connection *
ECPGget_connection(const char *connection_name)
{
@@ -259,6 +257,20 @@ ECPGnoticeProcessor(void *arg, const char *message)
sqlca.sqlwarn[0] = 'W';
}
/* this contains some quick hacks, needs to be cleaned up, but it works */
bool
ECPGconnect_informix(int lineno, const char *name, const char *user, const char *passwd, const char *connection_name, int autocommit)
{
char *informix_name = (char *)name, *envname;
/* Informix uses an environment variable DBPATH that overrides
* the connection parameters given here */
envname = getenv("DBPATH");
if (envname)
informix_name = envname;
return (ECPGconnect(lineno, informix_name, user, passwd, connection_name, autocommit));
}
/* this contains some quick hacks, needs to be cleaned up, but it works */
bool
ECPGconnect(int lineno, const char *name, const char *user, const char *passwd, const char *connection_name, int autocommit)
@@ -269,26 +281,13 @@ ECPGconnect(int lineno, const char *name, const char *user, const char *passwd,
*tmp,
*port = NULL,
*realname = NULL,
*options = NULL,
*envname;
*options = NULL;
ECPGinit_sqlca();
if ((this = (struct connection *) ECPGalloc(sizeof(struct connection), lineno)) == NULL)
return false;
if (ecpg_compat_mode == ECPG_COMPAT_INFORMIX)
{
/* Informix uses an environment variable DBPATH that overrides
* the connection parameters given here */
envname = getenv("DBPATH");
if (envname)
{
free(dbname);
dbname=strdup(envname);
}
}
if (dbname == NULL && connection_name == NULL)
connection_name = "DEFAULT";