From 32cfc4aa00f19750b1786430d5cffad5ec7887ac Mon Sep 17 00:00:00 2001
From: "Marc G. Fournier" <scrappy@hub.org>
Date: Tue, 25 Aug 1998 11:57:06 +0000
Subject: [PATCH] From: Michael Meskes <meskes@online-club.de>
+
+ Fri Aug 14 12:44:21 CEST 1998
+
+ - Added EXEC SQL DEFINE statement
+ - Set version to 2.4.0
+
+ Tue Aug 18 09:24:15 CEST 1998
+
+ - Removed keyword IS from DEFINE statement
+ - Added latest changes from gram.y
+ - Removed duplicate symbols from preproc.y
+ - Initialize sqlca structure
+ - Added check for connection to ecpglib
+ - Set version to 2.4.1
+
+ Thu Aug 20 15:31:29 CEST 1998
+
+ - Cleaned up memory allocation in ecpglib.c
+ - Set library version to 2.6
+
---
src/interfaces/ecpg/ChangeLog | 20 ++++++++++++++++++++
src/interfaces/ecpg/TODO | 1 -
src/interfaces/ecpg/include/ecpgerrno.h | 13 ++++++++-----
src/interfaces/ecpg/include/ecpglib.h | 2 ++
src/interfaces/ecpg/include/sqlca.h | 4 +++-
5 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog
index 6ac03ff234f..0e76101b7dd 100644
--- a/src/interfaces/ecpg/ChangeLog
+++ b/src/interfaces/ecpg/ChangeLog
@@ -277,3 +277,23 @@ Fri Aug 7 12:38:50 CEST 1998
- Added support for variables in cursor
- Set version to 2.3.6
- Set library version to 2.5
+
+Fri Aug 14 12:44:21 CEST 1998
+
+ - Added EXEC SQL DEFINE statement
+ - Set version to 2.4.0
+
+Tue Aug 18 09:24:15 CEST 1998
+
+ - Removed keyword IS from DEFINE statement
+ - Added latest changes from gram.y
+ - Removed duplicate symbols from preproc.y
+ - Initialize sqlca structure
+ - Added check for connection to ecpglib
+ - Set version to 2.4.1
+
+Thu Aug 20 15:31:29 CEST 1998
+
+ - Cleaned up memory allocation in ecpglib.c
+ - Set library version to 2.6
+
diff --git a/src/interfaces/ecpg/TODO b/src/interfaces/ecpg/TODO
index 908ec619270..cac4f67056a 100644
--- a/src/interfaces/ecpg/TODO
+++ b/src/interfaces/ecpg/TODO
@@ -13,7 +13,6 @@ it would be nice to be able to use :var[:index] as cvariable
Missing statements:
- exec sql type
- - exec sql define
- exec sql prepare
- exec sql allocate
- exqc sql free
diff --git a/src/interfaces/ecpg/include/ecpgerrno.h b/src/interfaces/ecpg/include/ecpgerrno.h
index f9373557e9b..2303f2a2154 100644
--- a/src/interfaces/ecpg/include/ecpgerrno.h
+++ b/src/interfaces/ecpg/include/ecpgerrno.h
@@ -22,12 +22,15 @@
#define ECPG_FLOAT_FORMAT -206
#define ECPG_CONVERT_BOOL -207
#define ECPG_EMPTY -208
-#define ECPG_NO_CONN -209
+
#define ECPG_UNDECLARED_CURSOR -210
-/* finally the backend error messages, they start at 300 */
-#define ECPG_PGSQL -300
-#define ECPG_TRANS -301
-#define ECPG_CONNECT -302
+#define ECPG_NO_CONN -220
+#define ECPG_NOT_CONN -221
+
+/* finally the backend error messages, they start at 400 */
+#define ECPG_PGSQL -400
+#define ECPG_TRANS -401
+#define ECPG_CONNECT -402
#endif /* !_ECPG_ERROR_H */
diff --git a/src/interfaces/ecpg/include/ecpglib.h b/src/interfaces/ecpg/include/ecpglib.h
index 83f2e6efb86..0f0bd2b38c0 100644
--- a/src/interfaces/ecpg/include/ecpglib.h
+++ b/src/interfaces/ecpg/include/ecpglib.h
@@ -37,6 +37,8 @@ struct cursor { const char *name;
struct cursor *next;
};
+extern int no_auto_trans;
+
/* define this for simplicity as well as compatibility */
#define SQLCODE sqlca.sqlcode
diff --git a/src/interfaces/ecpg/include/sqlca.h b/src/interfaces/ecpg/include/sqlca.h
index 7d6c9994349..f96067d9744 100644
--- a/src/interfaces/ecpg/include/sqlca.h
+++ b/src/interfaces/ecpg/include/sqlca.h
@@ -38,8 +38,10 @@ struct sqlca
/* 7: empty */
char sqlext[8];
-} sqlca;
+};
+extern struct sqlca sqlca;
+
#endif
#ifdef __cplusplus
--
GitLab