Fri Mar 3 10:47:06 CET 2000
- Fixed handling of double quote in C code.
+
+Tue Mar 7 10:58:21 CET 2000
+
+ - More cleanup in ecpglib.
+ - Fixed ecpg.c not not free variable list twice.
- Set library version to 3.1.0.
- Set ecpg version to 2.7.0.
/* print an error message */
void sqlprint(void);
-#ifdef LIBPQ_FE_H
- bool ECPGsetdb(PGconn *);
-#endif
-
-/* Here are some methods used by the lib. */
-/* Returns a pointer to a string containing a simple type name. */
- bool get_data(PGresult *, int, int, int, enum ECPGttype type,
- enum ECPGttype, void *, void *, long, long, bool);
- char *ecpg_alloc(long, int);
- char *ecpg_strdup(const char *, int);
- const char *ECPGtype_name(enum ECPGttype);
- unsigned int ECPGDynamicType(Oid);
-
-/* and some vars */
- extern struct auto_mem *auto_allocs;
-
/* define this for simplicity as well as compatibility */
#define SQLCODE sqlca.sqlcode
}
#endif
-
-#include
#define IS_SIMPLE_TYPE(type) ((type) >= ECPGt_char && (type) <= ECPGt_varchar2)
- /* A generic varchar type. */
- struct ECPGgeneric_varchar
- {
- int len;
- char arr[1];
- };
-
-/* keep a list of memory we allocated for the user */
- struct auto_mem
- {
- void *pointer;
- struct auto_mem *next;
- };
-
-/* structure to store one statement */
- struct statement
- {
- int lineno;
- char *command;
- struct connection *connection;
- struct variable *inlist;
- struct variable *outlist;
- };
-
-
-/* define this for simplicity as well as compatibility */
-
#ifdef __cplusplus
}
# Copyright (c) 1994, Regents of the University of California
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/Makefile.in,v 1.61 2000/02/25 11:11:15 meskes Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/Makefile.in,v 1.62 2000/03/07 15:10:52 meskes Exp $
#
#-------------------------------------------------------------------------
CFLAGS+= $(KRBFLAGS)
endif
-OBJS= ecpglib.o typename.o descriptor.o data.o error.o prepare.o memory.o
+OBJS= execute.o typename.o descriptor.o data.o error.o prepare.o memory.o \
+ connect.o misc.o
SHLIB_LINK= -L../../libpq -lpq
--- /dev/null
+#include
+#include
+#include
+#include "extern.h"
+#include
+
+static struct connection *all_connections = NULL, *actual_connection = NULL;
+
+struct connection *
+get_connection(const char *connection_name)
+{
+ struct connection *con = all_connections;
+
+ if (connection_name == NULL || strcmp(connection_name, "CURRENT") == 0)
+ return actual_connection;
+
+ for (; con && strcmp(connection_name, con->name) != 0; con = con->next);
+ if (con)
+ return con;
+ else
+ return NULL;
+}
+
+static void
+ecpg_finish(struct connection * act)
+{
+ if (act != NULL)
+ {
+ ECPGlog("ecpg_finish: finishing %s.\n", act->name);
+ PQfinish(act->connection);
+
+ /* remove act from the list */
+ if (act == all_connections)
+ all_connections = act->next;
+ else
+ {
+ struct connection *con;
+
+ for (con = all_connections; con->next && con->next != act; con = con->next);
+ if (con->next)
+ con->next = act->next;
+ }
+
+ if (actual_connection == act)
+ actual_connection = all_connections;
+
+ free(act->name);
+ free(act);
+ }
+ else
+ ECPGlog("ecpg_finish: called an extra time.\n");
+}
+
+bool
+ECPGsetcommit(int lineno, const char *mode, const char *connection_name)
+{
+ struct connection *con = get_connection(connection_name);
+ PGresult *results;
+
+ if (!ecpg_init(con, connection_name, lineno))
+ return(false);
+
+ ECPGlog("ECPGsetcommit line %d action = %s connection = %s\n", lineno, mode, con->name);
+
+ if (con->autocommit == true && strncmp(mode, "off", strlen("off")) == 0)
+ {
+ if (con->committed)
+ {
+ if ((results = PQexec(con->connection, "begin transaction")) == NULL)
+ {
+ ECPGraise(lineno, ECPG_TRANS, NULL);
+ return false;
+ }
+ PQclear(results);
+ con->committed = false;
+ }
+ con->autocommit = false;
+ }
+ else if (con->autocommit == false && strncmp(mode, "on", strlen("on")) == 0)
+ {
+ if (!con->committed)
+ {
+ if ((results = PQexec(con->connection, "commit")) == NULL)
+ {
+ ECPGraise(lineno, ECPG_TRANS, NULL);
+ return false;
+ }
+ PQclear(results);
+ con->committed = true;
+ }
+ con->autocommit = true;
+ }
+
+ return true;
+}
+
+bool
+ECPGsetconn(int lineno, const char *connection_name)
+{
+ struct connection *con = get_connection(connection_name);
+
+ if (!ecpg_init(con, connection_name, lineno))
+ return(false);
+
+ actual_connection = con;
+ return true;
+}
+
+bool
+ECPGconnect(int lineno, const char *dbname, const char *user, const char *passwd, const char *connection_name, int autocommit)
+{
+ struct connection *this;
+
+ init_sqlca();
+
+ if ((this = (struct connection *) ecpg_alloc(sizeof(struct connection), lineno)) == NULL)
+ return false;
+
+ if (dbname == NULL && connection_name == NULL)
+ connection_name = "DEFAULT";
+
+ /* add connection to our list */
+ if (connection_name != NULL)
+ this->name = ecpg_strdup(connection_name, lineno);
+ else
+ this->name = ecpg_strdup(dbname, lineno);
+
+ if (all_connections == NULL)
+ this->next = NULL;
+ else
+ this->next = all_connections;
+
+ actual_connection = all_connections = this;
+
+ ECPGlog("ECPGconnect: opening database %s %s%s\n", dbname ? dbname : "", user ? "for user " : "", user ? user : "");
+
+ this->connection = PQsetdbLogin(NULL, NULL, NULL, NULL, dbname, user, passwd);
+
+ if (PQstatus(this->connection) == CONNECTION_BAD)
+ {
+ ecpg_finish(this);
+ ECPGlog("connect: could not open database %s %s%s in line %d\n", dbname ? dbname : "", user ? "for user " : "", user ? user : "", lineno);
+ ECPGraise(lineno, ECPG_CONNECT, dbname ? dbname : "");
+ return false;
+ }
+
+ this->committed = true;
+ this->autocommit = autocommit;
+
+ return true;
+}
+
+bool
+ECPGdisconnect(int lineno, const char *connection_name)
+{
+ struct connection *con;
+
+ if (strcmp(connection_name, "ALL") == 0)
+ {
+ init_sqlca();
+ for (con = all_connections; con;)
+ {
+ struct connection *f = con;
+
+ con = con->next;
+ ecpg_finish(f);
+ }
+ }
+ else
+ {
+ con = get_connection(connection_name);
+
+ if (!ecpg_init(con, connection_name, lineno))
+ return(false);
+ else
+ ecpg_finish(con);
+ }
+
+ return true;
+}
#include
-#include
#include
#include
+#include
+#include "extern.h"
#include
bool
#include
#include
-
+#include
+#include "extern.h"
#include
struct descriptor
#include
#include
#include
+#include "extern.h"
#include
void
ECPGraise(int line, int code, const char *str)
{
- struct auto_mem *am;
-
sqlca.sqlcode = code;
switch (code)
{
sqlca.sqlerrm.sqlerrml = strlen(sqlca.sqlerrm.sqlerrmc);
/* free all memory we have allocated for the user */
- for (am = auto_allocs; am;)
- {
- struct auto_mem *act = am;
-
- am = am->next;
- free(act->pointer);
- free(act);
- }
+ free_auto_mem();
}
/* print out an error message */
on Feb. 5th, 1998 */
#include
-#include
-#include
-#include
-#include
-#include
#include
-#include
#include
#include
+#include
+#include "extern.h"
#include
#include
/* variables visible to the programs */
-static struct sqlca sqlca_init =
-{
- {'S', 'Q', 'L', 'C', 'A', ' ', ' ', ' '},
- sizeof(struct sqlca),
- 0,
- {0, {0}},
- {'N', 'O', 'T', ' ', 'S', 'E', 'T', ' '},
- {0, 0, 0, 0, 0, 0},
- {0, 0, 0, 0, 0, 0, 0, 0},
- {0, 0, 0, 0, 0, 0, 0, 0}
-};
-
struct sqlca sqlca =
{
{'S', 'Q', 'L', 'C', 'A', ' ', ' ', ' '},
{0, 0, 0, 0, 0, 0, 0, 0}
};
-static struct connection
-{
- char *name;
- PGconn *connection;
- bool committed;
- int autocommit;
- struct connection *next;
-} *all_connections = NULL, *actual_connection = NULL;
-
struct variable
{
enum ECPGttype type;
struct variable *next;
};
-struct auto_mem *auto_allocs;
-
-static int simple_debug = 0;
-static FILE *debugstream = NULL;
-
-static struct connection *
-get_connection(const char *connection_name)
-{
- struct connection *con = all_connections;
-
- if (connection_name == NULL || strcmp(connection_name, "CURRENT") == 0)
- return actual_connection;
-
- for (; con && strcmp(connection_name, con->name) != 0; con = con->next);
- if (con)
- return con;
- else
- return NULL;
-}
-
-static bool
-ecpg_init(const struct connection *con, const char * connection_name, const int lineno)
-{
- memcpy((char *) &sqlca, (char *) &sqlca_init, sizeof(sqlca));
- if (con == NULL)
- {
- ECPGraise(lineno, ECPG_NO_CONN, connection_name ? connection_name : "NULL");
- return (false);
- }
-
- auto_allocs = NULL;
-
- return (true);
-}
-
-static void
-ecpg_finish(struct connection * act)
+/* keep a list of memory we allocated for the user */
+static struct auto_mem
{
- if (act != NULL)
- {
- ECPGlog("ecpg_finish: finishing %s.\n", act->name);
- PQfinish(act->connection);
- /* remove act from the list */
- if (act == all_connections)
- all_connections = act->next;
- else
- {
- struct connection *con;
-
- for (con = all_connections; con->next && con->next != act; con = con->next);
- if (con->next)
- con->next = act->next;
- }
-
- if (actual_connection == act)
- actual_connection = all_connections;
-
- free(act->name);
- free(act);
- }
- else
- ECPGlog("ecpg_finish: called an extra time.\n");
-}
+ void *pointer;
+ struct auto_mem *next;
+} *auto_allocs = NULL;
static void
add_mem(void *ptr, int lineno)
auto_allocs = am;
}
+void free_auto_mem(void)
+{
+ struct auto_mem *am;
+
+ /* free all memory we have allocated for the user */
+ for (am = auto_allocs; am;)
+ {
+ struct auto_mem *act = am;
+
+ am = am->next;
+ free(act->pointer);
+ free(act);
+ }
+
+ auto_allocs = NULL;
+}
+
/* This function returns a newly malloced string that has the \
in the argument quoted with \ and the ' quote with ' as SQL92 says.
*/
return (status);
}
-bool
-ECPGstatus(int lineno, const char *connection_name)
-{
- struct connection *con = get_connection(connection_name);
-
- if (!ecpg_init(con, connection_name, lineno))
- return(false);
-
- /* are we connected? */
- if (con->connection == NULL)
- {
- ECPGlog("ECPGdo: not connected to %s\n", con->name);
- ECPGraise(lineno, ECPG_NOT_CONN, NULL);
- return false;
- }
-
- return (true);
-}
-
-bool
-ECPGtrans(int lineno, const char *connection_name, const char *transaction)
-{
- PGresult *res;
- struct connection *con = get_connection(connection_name);
-
- if (!ecpg_init(con, connection_name, lineno))
- return(false);
-
- ECPGlog("ECPGtrans line %d action = %s connection = %s\n", lineno, transaction, con->name);
-
- /* if we have no connection we just simulate the command */
- if (con && con->connection)
- {
- if ((res = PQexec(con->connection, transaction)) == NULL)
- {
- ECPGraise(lineno, ECPG_TRANS, NULL);
- return FALSE;
- }
- PQclear(res);
- }
-
- if (strcmp(transaction, "commit") == 0 || strcmp(transaction, "rollback") == 0)
- {
- con->committed = true;
-
- /* deallocate all prepared statements */
- if (!ECPGdeallocate_all(lineno))
- return false;
- }
-
- return true;
-}
-
-bool
-ECPGsetcommit(int lineno, const char *mode, const char *connection_name)
-{
- struct connection *con = get_connection(connection_name);
- PGresult *results;
-
- if (!ecpg_init(con, connection_name, lineno))
- return(false);
-
- ECPGlog("ECPGsetcommit line %d action = %s connection = %s\n", lineno, mode, con->name);
-
- if (con->autocommit == true && strncmp(mode, "off", strlen("off")) == 0)
- {
- if (con->committed)
- {
- if ((results = PQexec(con->connection, "begin transaction")) == NULL)
- {
- ECPGraise(lineno, ECPG_TRANS, NULL);
- return false;
- }
- PQclear(results);
- con->committed = false;
- }
- con->autocommit = false;
- }
- else if (con->autocommit == false && strncmp(mode, "on", strlen("on")) == 0)
- {
- if (!con->committed)
- {
- if ((results = PQexec(con->connection, "commit")) == NULL)
- {
- ECPGraise(lineno, ECPG_TRANS, NULL);
- return false;
- }
- PQclear(results);
- con->committed = true;
- }
- con->autocommit = true;
- }
-
- return true;
-}
-
-bool
-ECPGsetconn(int lineno, const char *connection_name)
-{
- struct connection *con = get_connection(connection_name);
-
- if (!ecpg_init(con, connection_name, lineno))
- return(false);
-
- actual_connection = con;
- return true;
-}
-
-bool
-ECPGconnect(int lineno, const char *dbname, const char *user, const char *passwd, const char *connection_name, int autocommit)
-{
- struct connection *this;
-
-
- memcpy((char *) &sqlca, (char *) &sqlca_init, sizeof(sqlca));
-
- if ((this = (struct connection *) ecpg_alloc(sizeof(struct connection), lineno)) == NULL)
- return false;
-
- if (dbname == NULL && connection_name == NULL)
- connection_name = "DEFAULT";
-
- /* add connection to our list */
- if (connection_name != NULL)
- this->name = ecpg_strdup(connection_name, lineno);
- else
- this->name = ecpg_strdup(dbname, lineno);
-
- if (all_connections == NULL)
- this->next = NULL;
- else
- this->next = all_connections;
-
- actual_connection = all_connections = this;
-
- ECPGlog("ECPGconnect: opening database %s %s%s\n", dbname ? dbname : "", user ? "for user " : "", user ? user : "");
-
- this->connection = PQsetdbLogin(NULL, NULL, NULL, NULL, dbname, user, passwd);
-
- if (PQstatus(this->connection) == CONNECTION_BAD)
- {
- ecpg_finish(this);
- ECPGlog("connect: could not open database %s %s%s in line %d\n", dbname ? dbname : "", user ? "for user " : "", user ? user : "", lineno);
- ECPGraise(lineno, ECPG_CONNECT, dbname ? dbname : "");
- return false;
- }
-
- this->committed = true;
- this->autocommit = autocommit;
-
- return true;
-}
-
-bool
-ECPGdisconnect(int lineno, const char *connection_name)
-{
- struct connection *con;
-
- if (strcmp(connection_name, "ALL") == 0)
- {
- memcpy((char *) &sqlca, (char *) &sqlca_init, sizeof(sqlca));
- for (con = all_connections; con;)
- {
- struct connection *f = con;
-
- con = con->next;
- ecpg_finish(f);
- }
- }
- else
- {
- con = get_connection(connection_name);
-
- if (!ecpg_init(con, connection_name, lineno))
- return(false);
- else
- ecpg_finish(con);
- }
-
- return true;
-}
-
-void
-ECPGdebug(int n, FILE *dbgs)
-{
- simple_debug = n;
- debugstream = dbgs;
- ECPGlog("ECPGdebug: set to %d\n", simple_debug);
-}
-
-void
-ECPGlog(const char *format,...)
-{
- va_list ap;
-
- if (simple_debug)
- {
- char *f = (char *) malloc(strlen(format) + 100);
-
- if (!f)
- return;
-
- sprintf(f, "[%d]: %s", (int) getpid(), format);
-
- va_start(ap, format);
- vfprintf(debugstream, f, ap);
- va_end(ap);
-
- free(f);
- }
-}
-
/* dynamic SQL support routines
*
* Copyright (c) 2000, Christof Petig
*
- * $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/ecpglib.c,v 1.62 2000/03/03 14:39:26 meskes Exp $
+ * $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/execute.c,v 1.1 2000/03/07 15:10:56 meskes Exp $
*/
PGconn *ECPG_internal_get_connection(char *name);
--- /dev/null
+#include
+
+/* Here are some methods used by the lib. */
+/* Returns a pointer to a string containing a simple type name. */
+void free_auto_mem(void);
+bool get_data(PGresult *, int, int, int, enum ECPGttype type,
+ enum ECPGttype, void *, void *, long, long, bool);
+struct connection *get_connection(const char *);
+void init_sqlca(void);
+char *ecpg_alloc(long, int);
+bool ecpg_init(const struct connection *, const char *, const int);
+char *ecpg_strdup(const char *, int);
+const char *ECPGtype_name(enum ECPGttype);
+unsigned int ECPGDynamicType(Oid);
+
+/* A generic varchar type. */
+struct ECPGgeneric_varchar
+{
+ int len;
+ char arr[1];
+};
+
+/* structure to store one statement */
+struct statement
+{
+ int lineno;
+ char *command;
+ struct connection *connection;
+ struct variable *inlist;
+ struct variable *outlist;
+};
+
+/* structure to store connections */
+struct connection
+{
+ char *name;
+ PGconn *connection;
+ bool committed;
+ int autocommit;
+ struct connection *next;
+};
+
#include
#include
+#include
+#include "extern.h"
char *
ecpg_alloc(long size, int lineno)
--- /dev/null
+#include
+#include
+#include
+#include
+#include "extern.h"
+#include
+
+static struct sqlca sqlca_init =
+{
+ {'S', 'Q', 'L', 'C', 'A', ' ', ' ', ' '},
+ sizeof(struct sqlca),
+ 0,
+ {0, {0}},
+ {'N', 'O', 'T', ' ', 'S', 'E', 'T', ' '},
+ {0, 0, 0, 0, 0, 0},
+ {0, 0, 0, 0, 0, 0, 0, 0},
+ {0, 0, 0, 0, 0, 0, 0, 0}
+};
+
+static int simple_debug = 0;
+static FILE *debugstream = NULL;
+
+void
+init_sqlca(void)
+{
+ memcpy((char *) &sqlca, (char *) &sqlca_init, sizeof(sqlca));
+}
+
+bool
+ecpg_init(const struct connection *con, const char * connection_name, const int lineno)
+{
+ init_sqlca();
+ if (con == NULL)
+ {
+ ECPGraise(lineno, ECPG_NO_CONN, connection_name ? connection_name : "NULL");
+ return (false);
+ }
+
+ return (true);
+}
+
+bool
+ECPGstatus(int lineno, const char *connection_name)
+{
+ struct connection *con = get_connection(connection_name);
+
+ if (!ecpg_init(con, connection_name, lineno))
+ return(false);
+
+ /* are we connected? */
+ if (con->connection == NULL)
+ {
+ ECPGlog("ECPGdo: not connected to %s\n", con->name);
+ ECPGraise(lineno, ECPG_NOT_CONN, NULL);
+ return false;
+ }
+
+ return (true);
+}
+
+bool
+ECPGtrans(int lineno, const char *connection_name, const char *transaction)
+{
+ PGresult *res;
+ struct connection *con = get_connection(connection_name);
+
+ if (!ecpg_init(con, connection_name, lineno))
+ return(false);
+
+ ECPGlog("ECPGtrans line %d action = %s connection = %s\n", lineno, transaction, con->name);
+
+ /* if we have no connection we just simulate the command */
+ if (con && con->connection)
+ {
+ if ((res = PQexec(con->connection, transaction)) == NULL)
+ {
+ ECPGraise(lineno, ECPG_TRANS, NULL);
+ return FALSE;
+ }
+ PQclear(res);
+ }
+
+ if (strcmp(transaction, "commit") == 0 || strcmp(transaction, "rollback") == 0)
+ {
+ con->committed = true;
+
+ /* deallocate all prepared statements */
+ if (!ECPGdeallocate_all(lineno))
+ return false;
+ }
+
+ return true;
+}
+
+
+void
+ECPGdebug(int n, FILE *dbgs)
+{
+ simple_debug = n;
+ debugstream = dbgs;
+ ECPGlog("ECPGdebug: set to %d\n", simple_debug);
+}
+
+void
+ECPGlog(const char *format,...)
+{
+ va_list ap;
+
+ if (simple_debug)
+ {
+ char *f = (char *) malloc(strlen(format) + 100);
+
+ if (!f)
+ return;
+
+ sprintf(f, "[%d]: %s", (int) getpid(), format);
+
+ va_start(ap, format);
+ vfprintf(debugstream, f, ap);
+ va_end(ap);
+
+ free(f);
+ }
+}
#include
#include
+#include
+#include "extern.h"
#include
static struct prepared_statement
#include
#include
#include
+#include "extern.h"
#include
/*
lex_init();
/* we need two includes */
- fprintf(yyout, "/* Processed by ecpg (%d.%d.%d) */\n/* These two include files are added by the preprocessor */\n#include \n#include .h>\n#line 1 \"%s\"\n", MAJOR_VERSION, MINOR_VERSION, PATCHLEVEL, input_filename);
+ fprintf(yyout, "/* Processed by ecpg (%d.%d.%d) */\n/* These three include files are added by the preprocessor */\n#include \n#include \n#include .h>\n#line 1 \"%s\"\n", MAJOR_VERSION, MINOR_VERSION, PATCHLEVEL, input_filename);
/* and parse the source */
yyparse();
extern void lex_init(void);
extern char *make_str(const char *);
extern void output_line_number(void);
-extern void output_statement(char *, int, char *, char *, struct arguments *, struct arguments *);
+extern void output_statement(char *, int, char *, char *);
extern void output_simple_statement(char *);
extern char *hashline_number(void);
extern int yyparse(void);
}
void
-output_statement(char * stmt, int mode, char *descriptor,
- char *con, struct arguments *insert, struct arguments *result)
+output_statement(char * stmt, int mode, char *descriptor, char *con)
{
int i, j = strlen(stmt);
fputs("\", ", yyout);
/* dump variables to C file */
- dump_variables(insert, 1);
+ dump_variables(argsinsert, 1);
fputs("ECPGt_EOIT, ", yyout);
- dump_variables(result, 1);
+ dump_variables(argsresult, 1);
fputs("ECPGt_EORT);", yyout);
+ reset_variables();
}
else
fputs("\");", yyout);
opt_at: SQL_AT connection_target { connection = $2; }
-stmt: AlterTableStmt { output_statement($1, 0, NULL, connection, argsinsert, argsresult); }
- | AlterGroupStmt { output_statement($1, 0, NULL, connection, argsinsert, argsresult); }
- | AlterUserStmt { output_statement($1, 0, NULL, connection, argsinsert, argsresult); }
- | ClosePortalStmt { output_statement($1, 0, NULL, connection, argsinsert, argsresult); }
- | CommentStmt { output_statement($1, 0, NULL, connection, argsinsert, argsresult); }
- | CopyStmt { output_statement($1, 0, NULL, connection, argsinsert, argsresult); }
- | CreateStmt { output_statement($1, 0, NULL, connection, argsinsert, argsresult); }
- | CreateAsStmt { output_statement($1, 0, NULL, connection, argsinsert, argsresult); }
- | CreateGroupStmt { output_statement($1, 0, NULL, connection, argsinsert, argsresult); }
- | CreateSeqStmt { output_statement($1, 0, NULL, connection, argsinsert, argsresult); }
- | CreatePLangStmt { output_statement($1, 0, NULL, connection, argsinsert, argsresult); }
- | CreateTrigStmt { output_statement($1, 0, NULL, connection, argsinsert, argsresult); }
- | CreateUserStmt { output_statement($1, 0, NULL, connection, argsinsert, argsresult); }
- | ClusterStmt { output_statement($1, 0, NULL, connection, argsinsert, argsresult); }
- | DefineStmt { output_statement($1, 0, NULL, connection, argsinsert, argsresult); }
- | DropStmt { output_statement($1, 0, NULL, connection, argsinsert, argsresult); }
- | TruncateStmt { output_statement($1, 0, NULL, connection, argsinsert, argsresult); }
- | DropGroupStmt { output_statement($1, 0, NULL, connection, argsinsert, argsresult); }
- | DropPLangStmt { output_statement($1, 0, NULL, connection, argsinsert, argsresult); }
- | DropTrigStmt { output_statement($1, 0, NULL, connection, argsinsert, argsresult); }
- | DropUserStmt { output_statement($1, 0, NULL, connection, argsinsert, argsresult); }
- | ExtendStmt { output_statement($1, 0, NULL, connection, argsinsert, argsresult); }
- | ExplainStmt { output_statement($1, 0, NULL, connection, argsinsert, argsresult); }
- | FetchStmt { output_statement($1, 1, NULL, connection, argsinsert, argsresult); }
- | GrantStmt { output_statement($1, 0, NULL, connection, argsinsert, argsresult); }
- | IndexStmt { output_statement($1, 0, NULL, connection, argsinsert, argsresult); }
- | ListenStmt { output_statement($1, 0, NULL, connection, argsinsert, argsresult); }
- | UnlistenStmt { output_statement($1, 0, NULL, connection, argsinsert, argsresult); }
- | LockStmt { output_statement($1, 0, NULL, connection, argsinsert, argsresult); }
- | ProcedureStmt { output_statement($1, 0, NULL, connection, argsinsert, argsresult); }
- | ReindexStmt { output_statement($1, 0, NULL, connection, argsinsert, argsresult); }
- | RemoveAggrStmt { output_statement($1, 0, NULL, connection, argsinsert, argsresult); }
- | RemoveOperStmt { output_statement($1, 0, NULL, connection, argsinsert, argsresult); }
- | RemoveFuncStmt { output_statement($1, 0, NULL, connection, argsinsert, argsresult); }
- | RemoveStmt { output_statement($1, 0, NULL, connection, argsinsert, argsresult); }
- | RenameStmt { output_statement($1, 0, NULL, connection, argsinsert, argsresult); }
- | RevokeStmt { output_statement($1, 0, NULL, connection, argsinsert, argsresult); }
+stmt: AlterTableStmt { output_statement($1, 0, NULL, connection); }
+ | AlterGroupStmt { output_statement($1, 0, NULL, connection); }
+ | AlterUserStmt { output_statement($1, 0, NULL, connection); }
+ | ClosePortalStmt { output_statement($1, 0, NULL, connection); }
+ | CommentStmt { output_statement($1, 0, NULL, connection); }
+ | CopyStmt { output_statement($1, 0, NULL, connection); }
+ | CreateStmt { output_statement($1, 0, NULL, connection); }
+ | CreateAsStmt { output_statement($1, 0, NULL, connection); }
+ | CreateGroupStmt { output_statement($1, 0, NULL, connection); }
+ | CreateSeqStmt { output_statement($1, 0, NULL, connection); }
+ | CreatePLangStmt { output_statement($1, 0, NULL, connection); }
+ | CreateTrigStmt { output_statement($1, 0, NULL, connection); }
+ | CreateUserStmt { output_statement($1, 0, NULL, connection); }
+ | ClusterStmt { output_statement($1, 0, NULL, connection); }
+ | DefineStmt { output_statement($1, 0, NULL, connection); }
+ | DropStmt { output_statement($1, 0, NULL, connection); }
+ | TruncateStmt { output_statement($1, 0, NULL, connection); }
+ | DropGroupStmt { output_statement($1, 0, NULL, connection); }
+ | DropPLangStmt { output_statement($1, 0, NULL, connection); }
+ | DropTrigStmt { output_statement($1, 0, NULL, connection); }
+ | DropUserStmt { output_statement($1, 0, NULL, connection); }
+ | ExtendStmt { output_statement($1, 0, NULL, connection); }
+ | ExplainStmt { output_statement($1, 0, NULL, connection); }
+ | FetchStmt { output_statement($1, 1, NULL, connection); }
+ | GrantStmt { output_statement($1, 0, NULL, connection); }
+ | IndexStmt { output_statement($1, 0, NULL, connection); }
+ | ListenStmt { output_statement($1, 0, NULL, connection); }
+ | UnlistenStmt { output_statement($1, 0, NULL, connection); }
+ | LockStmt { output_statement($1, 0, NULL, connection); }
+ | ProcedureStmt { output_statement($1, 0, NULL, connection); }
+ | ReindexStmt { output_statement($1, 0, NULL, connection); }
+ | RemoveAggrStmt { output_statement($1, 0, NULL, connection); }
+ | RemoveOperStmt { output_statement($1, 0, NULL, connection); }
+ | RemoveFuncStmt { output_statement($1, 0, NULL, connection); }
+ | RemoveStmt { output_statement($1, 0, NULL, connection); }
+ | RenameStmt { output_statement($1, 0, NULL, connection); }
+ | RevokeStmt { output_statement($1, 0, NULL, connection); }
| OptimizableStmt {
if (strncmp($1, "/* " , sizeof("/* ")-1) == 0)
output_simple_statement($1);
else
- output_statement($1, 1, NULL, connection, argsinsert, argsresult);
+ output_statement($1, 1, NULL, connection);
}
- | RuleStmt { output_statement($1, 0, NULL, connection, argsinsert, argsresult); }
+ | RuleStmt { output_statement($1, 0, NULL, connection); }
| TransactionStmt {
fprintf(yyout, "{ ECPGtrans(__LINE__, %s, \"%s\");", connection ? connection : "NULL", $1);
whenever_action(2);
free($1);
}
- | ViewStmt { output_statement($1, 0, NULL, connection, argsinsert, argsresult); }
- | LoadStmt { output_statement($1, 0, NULL, connection, argsinsert, argsresult); }
- | CreatedbStmt { output_statement($1, 0, NULL, connection, argsinsert, argsresult); }
- | DropdbStmt { output_statement($1, 0, NULL, connection, argsinsert, argsresult); }
- | VacuumStmt { output_statement($1, 0, NULL, connection, argsinsert, argsresult); }
- | VariableSetStmt { output_statement($1, 0, NULL, connection, argsinsert, argsresult); }
- | VariableShowStmt { output_statement($1, 0, NULL, connection, argsinsert, argsresult); }
- | VariableResetStmt { output_statement($1, 0, NULL, connection, argsinsert, argsresult); }
- | ConstraintsSetStmt { output_statement($1, 0, NULL, connection, argsinsert, argsresult); }
+ | ViewStmt { output_statement($1, 0, NULL, connection); }
+ | LoadStmt { output_statement($1, 0, NULL, connection); }
+ | CreatedbStmt { output_statement($1, 0, NULL, connection); }
+ | DropdbStmt { output_statement($1, 0, NULL, connection); }
+ | VacuumStmt { output_statement($1, 0, NULL, connection); }
+ | VariableSetStmt { output_statement($1, 0, NULL, connection); }
+ | VariableShowStmt { output_statement($1, 0, NULL, connection); }
+ | VariableResetStmt { output_statement($1, 0, NULL, connection); }
+ | ConstraintsSetStmt { output_statement($1, 0, NULL, connection); }
| ECPGAllocateDescr { fprintf(yyout,"ECPGallocate_desc(__LINE__, \"%s\");",$1);
whenever_action(0);
free($1);
whenever_action(2);
free($1);
}
- | ECPGExecute { output_statement($1, 0, NULL, connection, argsinsert, argsresult); }
- | ECPGFetchDescStmt { output_statement($1.str, 1, $1.name, connection, argsinsert, argsresult); }
+ | ECPGExecute { output_statement($1, 0, NULL, connection); }
+ | ECPGFetchDescStmt { output_statement($1.str, 1, $1.name, connection); }
| ECPGFree {
fprintf(yyout, "{ ECPGdeallocate(__LINE__, \"%s\");", $1);
else
argsinsert = ptr->argsinsert;
- output_statement(ptr->command, 0, NULL, ptr->connection, argsinsert, ptr->argsresult);
+ argsresult = ptr->argsresult;
+
+ output_statement(ptr->command, 0, NULL, ptr->connection);
}
| ECPGPrepare {
if (connection)
argsresult = NULL;
}
-
/* Add a variable to a request. */
void
add_variable(struct arguments ** list, struct variable * var, struct variable * ind)
projects / postgresql.git / commitdiff