database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-24 10:47:04 +03:00
Code

Added ECPGget_PGconn() function to ecpglib, courtesy of Mike Aubury.

Browse Source 
Removed one include file from connect-test1.
This commit is contained in:
Michael Meskes 2008-03-20 16:29:45 +00:00
parent 15364ea09d
commit f9e083fd30
5 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/interfaces/ecpg/ChangeLog
View File

@ -2331,4 +2331,9 @@ Sun, 02 Mar 2008 11:50:48 +0100
Thu, 20 Mar 2008 16:54:27 +0100 Thu, 20 Mar 2008 16:54:27 +0100
- Changed statement escaping to not escape continuation line markers. - Changed statement escaping to not escape continuation line markers.
- Added ECPGget_PGconn() function to ecpglib, courtesy of Mike Aubury.
- Set pgtypes library version to 3.1.
- Set compat library version to 3.1.
- Set ecpg library version to 6.2.
- Set ecpg version to 4.5.

4
src/interfaces/ecpg/ecpglib/Makefile
View File

@ -5,7 +5,7 @@
# Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group # Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California # Portions Copyright (c) 1994, Regents of the University of California
# #
# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.56 2008/02/26 06:41:24 petere Exp $ # $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.57 2008/03/20 16:29:44 meskes Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -15,7 +15,7 @@ include $(top_builddir)/src/Makefile.global
NAME= ecpg NAME= ecpg
SO_MAJOR_VERSION= 6 SO_MAJOR_VERSION= 6
SO_MINOR_VERSION= 1 SO_MINOR_VERSION= 2
DLTYPE= library DLTYPE= library
override CPPFLAGS := -I../include -I$(top_srcdir)/src/interfaces/ecpg/include \ override CPPFLAGS := -I../include -I$(top_srcdir)/src/interfaces/ecpg/include \

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

@ -1,4 +1,4 @@
/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/connect.c,v 1.48 2007/11/15 21:14:45 momjian Exp $ */ /* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/connect.c,v 1.49 2008/03/20 16:29:44 meskes Exp $ */
#define POSTGRES_ECPG_INTERNAL #define POSTGRES_ECPG_INTERNAL
#include "postgres_fe.h" #include "postgres_fe.h"
@ -565,3 +565,13 @@ ECPGdisconnect(int lineno, const char *connection_name)
return true; return true;
} }
PGconn* ECPGget_PGconn(const char *connection_name)
{
struct connection * con;
con=ecpg_get_connection(connection_name);
if (con==NULL) return NULL;
return con->connection;
}

25
src/interfaces/ecpg/include/ecpglib.h
View File

@ -1,7 +1,7 @@
/* /*
* this is a small part of c.h since we don't want to leak all postgres * this is a small part of c.h since we don't want to leak all postgres
* definitions into ecpg programs * definitions into ecpg programs
* $PostgreSQL: pgsql/src/interfaces/ecpg/include/ecpglib.h,v 1.75 2008/02/14 12:22:36 meskes Exp $ * $PostgreSQL: pgsql/src/interfaces/ecpg/include/ecpglib.h,v 1.76 2008/03/20 16:29:45 meskes Exp $
*/ */
#ifndef _ECPGLIB_H #ifndef _ECPGLIB_H
@ -47,11 +47,13 @@ bool ECPGdo(const int, const int, const int, const char *, const bool, const in
bool ECPGtrans(int, const char *, const char *); bool ECPGtrans(int, const char *, const char *);
bool ECPGdisconnect(int, const char *); bool ECPGdisconnect(int, const char *);
bool ECPGprepare(int, const char *, const int, const char *, const char *); bool ECPGprepare(int, const char *, const int, const char *, const char *);
bool ECPGdeallocate(int, int, const char *connection_name, const char *name); bool ECPGdeallocate(int, int, const char *, const char *);
bool ECPGdeallocate_all(int, int, const char *connection_name); bool ECPGdeallocate_all(int, int, const char *);
char *ECPGprepared_statement(const char *connection_name, const char *name, int); char *ECPGprepared_statement(const char *, const char *, int);
PGconn *ECPGget_PGconn(const char *);
char *ECPGerrmsg(void);
char *ECPGerrmsg(void);
/* print an error message */ /* print an error message */
void sqlprint(void); void sqlprint(void);
@ -63,18 +65,17 @@ void sqlprint(void);
/* dynamic SQL */ /* dynamic SQL */
bool ECPGdo_descriptor(int line, const char *connection, bool ECPGdo_descriptor(int, const char *, const char *, const char *);
const char *descriptor, const char *query); bool ECPGdeallocate_desc(int, const char *);
bool ECPGdeallocate_desc(int line, const char *name); bool ECPGallocate_desc(int, const char *);
bool ECPGallocate_desc(int line, const char *name);
bool ECPGget_desc_header(int, const char *, int *); bool ECPGget_desc_header(int, const char *, int *);
bool ECPGget_desc(int, const char *, int,...); bool ECPGget_desc(int, const char *, int, ...);
bool ECPGset_desc_header(int, const char *, int); bool ECPGset_desc_header(int, const char *, int);
bool ECPGset_desc(int, const char *, int,...); bool ECPGset_desc(int, const char *, int, ...);
void ECPGset_noind_null(enum ECPGttype, void *); void ECPGset_noind_null(enum ECPGttype, void *);
bool ECPGis_noind_null(enum ECPGttype, void *); bool ECPGis_noind_null(enum ECPGttype, void *);
bool ECPGdescribe(int, bool, const char *,...); bool ECPGdescribe(int, bool, const char *, ...);
/* dynamic result allocation */ /* dynamic result allocation */
void ECPGfree_auto_mem(void); void ECPGfree_auto_mem(void);

1
src/interfaces/ecpg/test/expected/connect-test1.c.in
View File

@ -1,6 +1,5 @@
/* Processed by ecpg (regression mode) */ /* Processed by ecpg (regression mode) */
/* These include files are added by the preprocessor */ /* These include files are added by the preprocessor */
#include <ecpgtype.h>
#include <ecpglib.h> #include <ecpglib.h>
#include <ecpgerrno.h> #include <ecpgerrno.h>
#include <sqlca.h> #include <sqlca.h>