Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitf9e083f

Browse files
author
Michael Meskes
committed
Added ECPGget_PGconn() function to ecpglib, courtesy of Mike Aubury.
Removed one include file from connect-test1.
1 parent15364ea commitf9e083f

File tree

5 files changed

+31
-16
lines changed

5 files changed

+31
-16
lines changed

‎src/interfaces/ecpg/ChangeLog

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2331,4 +2331,9 @@ Sun, 02 Mar 2008 11:50:48 +0100
23312331
Thu, 20 Mar 2008 16:54:27 +0100
23322332

23332333
- Changed statement escaping to not escape continuation line markers.
2334+
- Added ECPGget_PGconn() function to ecpglib, courtesy of Mike Aubury.
2335+
- Set pgtypes library version to 3.1.
2336+
- Set compat library version to 3.1.
2337+
- Set ecpg library version to 6.2.
2338+
- Set ecpg version to 4.5.
23342339

‎src/interfaces/ecpg/ecpglib/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
66
# Portions Copyright (c) 1994, Regents of the University of California
77
#
8-
# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.56 2008/02/26 06:41:24 petere Exp $
8+
# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.57 2008/03/20 16:29:44 meskes Exp $
99
#
1010
#-------------------------------------------------------------------------
1111

@@ -15,7 +15,7 @@ include $(top_builddir)/src/Makefile.global
1515

1616
NAME= ecpg
1717
SO_MAJOR_VERSION= 6
18-
SO_MINOR_VERSION=1
18+
SO_MINOR_VERSION=2
1919
DLTYPE= library
2020

2121
overrideCPPFLAGS := -I../include -I$(top_srcdir)/src/interfaces/ecpg/include\

‎src/interfaces/ecpg/ecpglib/connect.c

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/connect.c,v 1.48 2007/11/15 21:14:45 momjian Exp $ */
1+
/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/connect.c,v 1.49 2008/03/20 16:29:44 meskes Exp $ */
22

33
#definePOSTGRES_ECPG_INTERNAL
44
#include"postgres_fe.h"
@@ -565,3 +565,13 @@ ECPGdisconnect(int lineno, const char *connection_name)
565565

566566
return true;
567567
}
568+
569+
PGconn*ECPGget_PGconn(constchar*connection_name)
570+
{
571+
structconnection*con;
572+
573+
con=ecpg_get_connection(connection_name);
574+
if (con==NULL)returnNULL;
575+
576+
returncon->connection;
577+
}

‎src/interfaces/ecpg/include/ecpglib.h

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* this is a small part of c.h since we don't want to leak all postgres
33
* definitions into ecpg programs
4-
* $PostgreSQL: pgsql/src/interfaces/ecpg/include/ecpglib.h,v 1.75 2008/02/14 12:22:36 meskes Exp $
4+
* $PostgreSQL: pgsql/src/interfaces/ecpg/include/ecpglib.h,v 1.76 2008/03/20 16:29:45 meskes Exp $
55
*/
66

77
#ifndef_ECPGLIB_H
@@ -47,11 +47,13 @@ boolECPGdo(const int, const int, const int, const char *, const bool, const in
4747
boolECPGtrans(int,constchar*,constchar*);
4848
boolECPGdisconnect(int,constchar*);
4949
boolECPGprepare(int,constchar*,constint,constchar*,constchar*);
50-
boolECPGdeallocate(int,int,constchar*connection_name,constchar*name);
51-
boolECPGdeallocate_all(int,int,constchar*connection_name);
52-
char*ECPGprepared_statement(constchar*connection_name,constchar*name,int);
50+
boolECPGdeallocate(int,int,constchar*,constchar*);
51+
boolECPGdeallocate_all(int,int,constchar*);
52+
char*ECPGprepared_statement(constchar*,constchar*,int);
53+
PGconn*ECPGget_PGconn(constchar*);
5354

54-
char*ECPGerrmsg(void);
55+
56+
char*ECPGerrmsg(void);
5557

5658
/* print an error message */
5759
voidsqlprint(void);
@@ -63,18 +65,17 @@ voidsqlprint(void);
6365

6466
/* dynamic SQL */
6567

66-
boolECPGdo_descriptor(intline,constchar*connection,
67-
constchar*descriptor,constchar*query);
68-
boolECPGdeallocate_desc(intline,constchar*name);
69-
boolECPGallocate_desc(intline,constchar*name);
68+
boolECPGdo_descriptor(int,constchar*,constchar*,constchar*);
69+
boolECPGdeallocate_desc(int,constchar*);
70+
boolECPGallocate_desc(int,constchar*);
7071
boolECPGget_desc_header(int,constchar*,int*);
71-
boolECPGget_desc(int,constchar*,int,...);
72+
boolECPGget_desc(int,constchar*,int,...);
7273
boolECPGset_desc_header(int,constchar*,int);
73-
boolECPGset_desc(int,constchar*,int,...);
74+
boolECPGset_desc(int,constchar*,int,...);
7475

7576
voidECPGset_noind_null(enumECPGttype,void*);
7677
boolECPGis_noind_null(enumECPGttype,void*);
77-
boolECPGdescribe(int,bool,constchar*,...);
78+
boolECPGdescribe(int,bool,constchar*,...);
7879

7980
/* dynamic result allocation */
8081
voidECPGfree_auto_mem(void);

‎src/interfaces/ecpg/test/expected/connect-test1.c.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/* Processed by ecpg (regression mode) */
22
/* These include files are added by the preprocessor */
3-
#include <ecpgtype.h>
43
#include <ecpglib.h>
54
#include <ecpgerrno.h>
65
#include <sqlca.h>

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp