diff options
Diffstat (limited to 'src/interfaces/libpgtcl/pgtclCmds.c')
| -rw-r--r-- | src/interfaces/libpgtcl/pgtclCmds.c | 2054 |
1 files changed, 1106 insertions, 948 deletions
diff --git a/src/interfaces/libpgtcl/pgtclCmds.c b/src/interfaces/libpgtcl/pgtclCmds.c index 6ad9ca17673..834938487d4 100644 --- a/src/interfaces/libpgtcl/pgtclCmds.c +++ b/src/interfaces/libpgtcl/pgtclCmds.c @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------- * * pgtclCmds.c-- - * C functions which implement pg_* tcl commands + * C functions which implement pg_* tcl commands * * Copyright (c) 1994, Regents of the University of California * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclCmds.c,v 1.13 1997/04/02 18:16:49 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclCmds.c,v 1.14 1997/09/07 05:03:10 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -25,8 +25,8 @@ #include "pgtclId.h" #ifdef TCL_ARRAYS -#define ISOCTAL(c) (((c) >= '0') && ((c) <= '7')) -#define DIGIT(c) ((c) - '0') +#define ISOCTAL(c) (((c) >= '0') && ((c) <= '7')) +#define DIGIT(c) ((c) - '0') /* * translate_escape() -- @@ -38,97 +38,107 @@ * just before the rest of the buffer). */ -static inline char* +static inline char * translate_escape(char *p, int isArray) { - register char c, *q, *s; + register char c, + *q, + *s; #ifdef TCL_ARRAYS_DEBUG_ESCAPE - printf(" escape = '%s'\n", p); + printf(" escape = '%s'\n", p); #endif - /* Address of the first character after the escape sequence */ - s = p+2; - switch (c = *(p+1)) { - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - c = DIGIT(c); - if (ISOCTAL(*s)) { - c = (c<<3) + DIGIT(*s++); - } - if (ISOCTAL(*s)) { - c = (c<<3) + DIGIT(*s++); - } - *p = c; - break; - case 'b': - *p = '\b'; - break; - case 'f': - *p = '\f'; - break; - case 'n': - *p = '\n'; - break; - case 'r': - *p = '\r'; - break; - case 't': - *p = '\t'; - break; - case 'v': - *p = '\v'; - break; - case '\\': - case '{': - case '}': - case '"': - /* - * Backslahes, curly braces and double-quotes are left - * escaped if they appear inside an array. They will be - * unescaped by Tcl in Tcl_AppendElement. - * The buffer position is advanced by 1 so that the this - * character is not processed again by the caller. - */ - if (isArray) { - return p+1; - } else { - *p = c; + /* Address of the first character after the escape sequence */ + s = p + 2; + switch (c = *(p + 1)) + { + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + c = DIGIT(c); + if (ISOCTAL(*s)) + { + c = (c << 3) + DIGIT(*s++); + } + if (ISOCTAL(*s)) + { + c = (c << 3) + DIGIT(*s++); + } + *p = c; + break; + case 'b': + *p = '\b'; + break; + case 'f': + *p = '\f'; + break; + case 'n': + *p = '\n'; + break; + case 'r': + *p = '\r'; + break; + case 't': + *p = '\t'; + break; + case 'v': + *p = '\v'; + break; + case '\\': + case '{': + case '}': + case '"': + + /* + * Backslahes, curly braces and double-quotes are left escaped if + * they appear inside an array. They will be unescaped by Tcl in + * Tcl_AppendElement. The buffer position is advanced by 1 so that + * the this character is not processed again by the caller. + */ + if (isArray) + { + return p + 1; + } + else + { + *p = c; + } + break; + case '\0': + + /* + * This means a backslash at the end of the string. It should + * never happen but in that case replace the \ with a \0 but don't + * shift the rest of the buffer so that the caller can see the end + * of the string and terminate. + */ + *p = c; + return p; + break; + default: + + /* + * Default case, store the escaped character over the backslash + * and shift the buffer over itself. + */ + *p = c; } - break; - case '\0': - /* - * This means a backslash at the end of the string. - * It should never happen but in that case replace - * the \ with a \0 but don't shift the rest of the - * buffer so that the caller can see the end of the - * string and terminate. - */ - *p = c; - return p; - break; - default: - /* - * Default case, store the escaped character over the backslash - * and shift the buffer over itself. - */ - *p = c; - } - /* Shift the rest of the buffer over itself after the current char */ - q = p+1; - for ( ; *s ; ) { - *q++ = *s++; - } - *q = '\0'; + /* Shift the rest of the buffer over itself after the current char */ + q = p + 1; + for (; *s;) + { + *q++ = *s++; + } + *q = '\0'; #ifdef TCL_ARRAYS_DEBUG_ESCAPE - printf(" after = '%s'\n", p); + printf(" after = '%s'\n", p); #endif - return p; + return p; } /* @@ -139,299 +149,339 @@ translate_escape(char *p, int isArray) * representation of a postgres array. */ -static char * -tcl_value (char *value) +static char * +tcl_value(char *value) { - int literal, last; - register char *p; + int literal, + last; + register char *p; - if (!value) { - return ((char *) NULL); - } + if (!value) + { + return ((char *) NULL); + } #ifdef TCL_ARRAYS_DEBUG - printf("pq_value = '%s'\n", value); + printf("pq_value = '%s'\n", value); #endif - last = strlen(value)-1; - if ((last >= 1) && (value[0] == '{') && (value[last] == '}')) { - /* Looks like an array, replace ',' with spaces */ - /* Remove the outer pair of { }, the last first! */ - value[last] = '\0'; - value++; - literal = 0; - for (p=value; *p; p++) { - if (!literal) { - /* We are at the list level, look for ',' and '"' */ - switch (*p) { - case '"': /* beginning of literal */ - literal = 1; - break; - case ',': /* replace the ',' with space */ - *p = ' '; - break; - } - } else { - /* We are inside a C string */ - switch (*p) { - case '"': /* end of literal */ - literal = 0; - break; - case '\\': - /* - * escape sequence, translate it - */ - p = translate_escape(p,1); - break; + last = strlen(value) - 1; + if ((last >= 1) && (value[0] == '{') && (value[last] == '}')) + { + /* Looks like an array, replace ',' with spaces */ + /* Remove the outer pair of { }, the last first! */ + value[last] = '\0'; + value++; + literal = 0; + for (p = value; *p; p++) + { + if (!literal) + { + /* We are at the list level, look for ',' and '"' */ + switch (*p) + { + case '"': /* beginning of literal */ + literal = 1; + break; + case ',': /* replace the ',' with space */ + *p = ' '; + break; + } + } + else + { + /* We are inside a C string */ + switch (*p) + { + case '"': /* end of literal */ + literal = 0; + break; + case '\\': + + /* + * escape sequence, translate it + */ + p = translate_escape(p, 1); + break; + } + } + if (!*p) + { + break; + } } - } - if (!*p) { - break; - } } - } else { - /* Looks like a normal scalar value */ - for (p=value; *p; p++) { - if (*p == '\\') { - /* - * escape sequence, translate it - */ - p = translate_escape(p,0); - } - if (!*p) { - break; - } + else + { + /* Looks like a normal scalar value */ + for (p = value; *p; p++) + { + if (*p == '\\') + { + + /* + * escape sequence, translate it + */ + p = translate_escape(p, 0); + } + if (!*p) + { + break; + } + } } - } #ifdef TCL_ARRAYS_DEBUG - printf("tcl_value = '%s'\n\n", value); + printf("tcl_value = '%s'\n\n", value); #endif - return (value); + return (value); } #endif /********************************** * pg_conndefaults - + syntax: pg_conndefaults - + the return result is a list describing the possible options and their current default values for a call to pg_connect with the new -conninfo syntax. Each entry in the list is a sublist of the format: - {optname label dispchar dispsize value} - + {optname label dispchar dispsize value} + **********************************/ int -Pg_conndefaults(ClientData cData, Tcl_Interp *interp, int argc, char **argv) +Pg_conndefaults(ClientData cData, Tcl_Interp * interp, int argc, char **argv) { - PQconninfoOption *option; - char buf[8192]; - - Tcl_ResetResult(interp); - for(option = PQconndefaults(); option->keyword != NULL; option++) { - if(option->val == NULL) { - option->val = ""; - } - sprintf(buf, "{%s} {%s} {%s} %d {%s}", - option->keyword, - option->label, - option->dispchar, - option->dispsize, - option->val); - Tcl_AppendElement(interp, buf); - } - - return TCL_OK; + PQconninfoOption *option; + char buf[8192]; + + Tcl_ResetResult(interp); + for (option = PQconndefaults(); option->keyword != NULL; option++) + { + if (option->val == NULL) + { + option->val = ""; + } + sprintf(buf, "{%s} {%s} {%s} %d {%s}", + option->keyword, + option->label, + option->dispchar, + option->dispsize, + option->val); + Tcl_AppendElement(interp, buf); + } + + return TCL_OK; } /********************************** * pg_connect - make a connection to a backend. - + make a connection to a backend. + syntax: pg_connect dbName [-host hostName] [-port portNumber] [-tty pqtty]] - + the return result is either an error message or a handle for a database connection. Handles start with the prefix "pgp" - + **********************************/ int -Pg_connect(ClientData cData, Tcl_Interp *interp, int argc, char* argv[]) +Pg_connect(ClientData cData, Tcl_Interp * interp, int argc, char *argv[]) { - Pg_clientData *cd = (Pg_clientData *)cData; - char *pghost = NULL; - char *pgtty = NULL; - char *pgport = NULL; - char *pgoptions = NULL; - char *dbName; - int i; - PGconn *conn; - - if (argc == 1) { - Tcl_AppendResult(interp, "pg_connect: database name missing\n", 0); - Tcl_AppendResult(interp, "pg_connect databaseName [-host hostName] [-port portNumber] [-tty pgtty]]\n", 0); - Tcl_AppendResult(interp, "pg_connect -conninfo <conninfo-string>", 0); - return TCL_ERROR; - - } + Pg_clientData *cd = (Pg_clientData *) cData; + char *pghost = NULL; + char *pgtty = NULL; + char *pgport = NULL; + char *pgoptions = NULL; + char *dbName; + int i; + PGconn *conn; + + if (argc == 1) + { + Tcl_AppendResult(interp, "pg_connect: database name missing\n", 0); + Tcl_AppendResult(interp, "pg_connect databaseName [-host hostName] [-port portNumber] [-tty pgtty]]\n", 0); + Tcl_AppendResult(interp, "pg_connect -conninfo <conninfo-string>", 0); + return TCL_ERROR; - if (!strcmp("-conninfo", argv[1])) { - /* - * Establish a connection using the new PQconnectdb() interface - */ - if (argc != 3) { - Tcl_AppendResult(interp, "pg_connect: syntax error\n", 0); - Tcl_AppendResult(interp, "pg_connect -conninfo <conninfo-string>", 0); - return TCL_ERROR; } - conn = PQconnectdb(argv[2]); - } else { - /* - * Establish a connection using the old PQsetdb() interface - */ - if (argc > 2) { - /* parse for pg environment settings */ - i = 2; - while (i+1 < argc) { - if (strcmp(argv[i], "-host") == 0) { - pghost = argv[i+1]; - i += 2; + + if (!strcmp("-conninfo", argv[1])) + { + + /* + * Establish a connection using the new PQconnectdb() interface + */ + if (argc != 3) + { + Tcl_AppendResult(interp, "pg_connect: syntax error\n", 0); + Tcl_AppendResult(interp, "pg_connect -conninfo <conninfo-string>", 0); + return TCL_ERROR; } - else - if (strcmp(argv[i], "-port") == 0) { - pgport = argv[i+1]; - i += 2; - } - else - if (strcmp(argv[i], "-tty") == 0) { - pgtty = argv[i+1]; - i += 2; - } - else if (strcmp(argv[i], "-options") == 0) { - pgoptions = argv[i+1]; - i += 2; - } - else { - Tcl_AppendResult(interp, "Bad option to pg_connect : \n", - argv[i], 0); - Tcl_AppendResult(interp, "pg_connect databaseName [-host hostName] [-port portNumber] [-tty pgtty]]",0); - return TCL_ERROR; + conn = PQconnectdb(argv[2]); + } + else + { + + /* + * Establish a connection using the old PQsetdb() interface + */ + if (argc > 2) + { + /* parse for pg environment settings */ + i = 2; + while (i + 1 < argc) + { + if (strcmp(argv[i], "-host") == 0) + { + pghost = argv[i + 1]; + i += 2; + } + else if (strcmp(argv[i], "-port") == 0) + { + pgport = argv[i + 1]; + i += 2; + } + else if (strcmp(argv[i], "-tty") == 0) + { + pgtty = argv[i + 1]; + i += 2; + } + else if (strcmp(argv[i], "-options") == 0) + { + pgoptions = argv[i + 1]; + i += 2; + } + else + { + Tcl_AppendResult(interp, "Bad option to pg_connect : \n", + argv[i], 0); + Tcl_AppendResult(interp, "pg_connect databaseName [-host hostName] [-port portNumber] [-tty pgtty]]", 0); + return TCL_ERROR; + } + } /* while */ + if ((i % 2 != 0) || i != argc) + { + Tcl_AppendResult(interp, "wrong # of arguments to pg_connect\n", argv[i], 0); + Tcl_AppendResult(interp, "pg_connect databaseName [-host hostName] [-port portNumber] [-tty pgtty]]", 0); + return TCL_ERROR; } - } /* while */ - if ((i % 2 != 0) || i != argc) { - Tcl_AppendResult(interp, "wrong # of arguments to pg_connect\n", argv[i],0); - Tcl_AppendResult(interp, "pg_connect databaseName [-host hostName] [-port portNumber] [-tty pgtty]]",0); - return TCL_ERROR; - } + } + dbName = argv[1]; + conn = PQsetdb(pghost, pgport, pgoptions, pgtty, dbName); } - dbName = argv[1]; - conn = PQsetdb(pghost, pgport, pgoptions, pgtty, dbName); - } - if (conn->status == CONNECTION_OK) { - PgSetConnectionId(cd, interp->result, conn); - return TCL_OK; - } - else { - Tcl_AppendResult(interp, "Connection to database failed\n", 0); - Tcl_AppendResult(interp, conn->errorMessage, 0); - PQfinish(conn); - return TCL_ERROR; - } + if (conn->status == CONNECTION_OK) + { + PgSetConnectionId(cd, interp->result, conn); + return TCL_OK; + } + else + { + Tcl_AppendResult(interp, "Connection to database failed\n", 0); + Tcl_AppendResult(interp, conn->errorMessage, 0); + PQfinish(conn); + return TCL_ERROR; + } } /********************************** * pg_disconnect close a backend connection - + syntax: pg_disconnect connection - + The argument passed in must be a connection pointer. - + **********************************/ int -Pg_disconnect(ClientData cData, Tcl_Interp *interp, int argc, char* argv[]) +Pg_disconnect(ClientData cData, Tcl_Interp * interp, int argc, char *argv[]) { - Pg_clientData *cd = (Pg_clientData *)cData; - PGconn *conn; + Pg_clientData *cd = (Pg_clientData *) cData; + PGconn *conn; - if (argc != 2) { - Tcl_AppendResult(interp, "Wrong # of arguments\n", "pg_disconnect connection", 0); - return TCL_ERROR; - } + if (argc != 2) + { + Tcl_AppendResult(interp, "Wrong # of arguments\n", "pg_disconnect connection", 0); + return TCL_ERROR; + } - conn = PgGetConnectionId(cd, argv[1]); - if (conn == (PGconn *)NULL) { - Tcl_AppendResult(interp, "First argument is not a valid connection\n", 0); - return TCL_ERROR; - } - - PgDelConnectionId(cd, argv[1]); - PQfinish(conn); - return TCL_OK; + conn = PgGetConnectionId(cd, argv[1]); + if (conn == (PGconn *) NULL) + { + Tcl_AppendResult(interp, "First argument is not a valid connection\n", 0); + return TCL_ERROR; + } + + PgDelConnectionId(cd, argv[1]); + PQfinish(conn); + return TCL_OK; } /********************************** * pg_exec send a query string to the backend connection - + syntax: pg_exec connection query - + the return result is either an error message or a handle for a query result. Handles start with the prefix "pgp" **********************************/ int -Pg_exec(ClientData cData, Tcl_Interp *interp, int argc, char* argv[]) +Pg_exec(ClientData cData, Tcl_Interp * interp, int argc, char *argv[]) { - Pg_clientData *cd = (Pg_clientData *)cData; - PGconn *conn; - PGresult *result; + Pg_clientData *cd = (Pg_clientData *) cData; + PGconn *conn; + PGresult *result; - if (argc != 3) { - Tcl_AppendResult(interp, "Wrong # of arguments\n", - "pg_exec connection queryString", 0); - return TCL_ERROR; - } + if (argc != 3) + { + Tcl_AppendResult(interp, "Wrong # of arguments\n", + "pg_exec connection queryString", 0); + return TCL_ERROR; + } - conn = PgGetConnectionId(cd, argv[1]); - if (conn == (PGconn *)NULL) { - Tcl_AppendResult(interp, "First argument is not a valid connection\n", 0); - return TCL_ERROR; - } - - result = PQexec(conn, argv[2]); - if (result) { - PgSetResultId(cd, interp->result, argv[1], result); + conn = PgGetConnectionId(cd, argv[1]); + if (conn == (PGconn *) NULL) + { + Tcl_AppendResult(interp, "First argument is not a valid connection\n", 0); + return TCL_ERROR; + } + + result = PQexec(conn, argv[2]); + if (result) + { + PgSetResultId(cd, interp->result, argv[1], result); + return TCL_OK; + } + else + { + /* error occurred during the query */ + Tcl_SetResult(interp, conn->errorMessage, TCL_STATIC); + return TCL_ERROR; + } + /* check return status of result */ return TCL_OK; - } - else { - /* error occurred during the query */ - Tcl_SetResult(interp, conn->errorMessage, TCL_STATIC); - return TCL_ERROR; - } - /* check return status of result */ - return TCL_OK; } /********************************** * pg_result get information about the results of a query - + syntax: - pg_result result ?option? - + pg_result result ?option? + the options are: - -status + -status the status of the result -conn the connection that produced the result @@ -451,291 +501,333 @@ Pg_exec(ClientData cData, Tcl_Interp *interp, int argc, char* argv[]) returns the number of attributes returned by the query -getTuple tupleNumber returns the values of the tuple in a list - -clear + -clear clear the result buffer. Do not reuse after this **********************************/ int -Pg_result(ClientData cData, Tcl_Interp *interp, int argc, char* argv[]) +Pg_result(ClientData cData, Tcl_Interp * interp, int argc, char *argv[]) { - Pg_clientData *cd = (Pg_clientData *)cData; - PGresult *result; - char *opt; - int i; - int tupno; - char prearrayInd[MAX_MESSAGE_LEN]; - char arrayInd[MAX_MESSAGE_LEN]; - char *appendstr; - char *arrVar; - - if (argc != 3 && argc != 4 && argc != 5) { - Tcl_AppendResult(interp, "Wrong # of arguments\n",0); - goto Pg_result_errReturn; - } - - result = PgGetResultId(cd, argv[1]); - if (result == (PGresult *)NULL) { - Tcl_AppendResult(interp, "First argument is not a valid query result\n", 0); - return TCL_ERROR; - } + Pg_clientData *cd = (Pg_clientData *) cData; + PGresult *result; + char *opt; + int i; + int tupno; + char prearrayInd[MAX_MESSAGE_LEN]; + char arrayInd[MAX_MESSAGE_LEN]; + char *appendstr; + char *arrVar; + + if (argc != 3 && argc != 4 && argc != 5) + { + Tcl_AppendResult(interp, "Wrong # of arguments\n", 0); + goto Pg_result_errReturn; + } + + result = PgGetResultId(cd, argv[1]); + if (result == (PGresult *) NULL) + { + Tcl_AppendResult(interp, "First argument is not a valid query result\n", 0); + return TCL_ERROR; + } - opt = argv[2]; + opt = argv[2]; - if (strcmp(opt, "-status") == 0) { - Tcl_AppendResult(interp, pgresStatus[PQresultStatus(result)], 0); - return TCL_OK; - } - else if (strcmp(opt, "-oid") == 0) { - Tcl_AppendResult(interp, PQoidStatus(result), 0); - return TCL_OK; - } - else if (strcmp(opt, "-conn") == 0) { - PgGetConnByResultId(cd, interp->result, argv[1]); - return TCL_OK; - } - else if (strcmp(opt, "-clear") == 0) { - PgDelResultId(cd, argv[1]); - PQclear(result); - return TCL_OK; - } - else if (strcmp(opt, "-numTuples") == 0) { - sprintf(interp->result, "%d", PQntuples(result)); - return TCL_OK; - } - else if (strcmp(opt, "-assign") == 0) { - if (argc != 4) { - Tcl_AppendResult(interp, "-assign option must be followed by a variable name",0); - return TCL_ERROR; - } - arrVar = argv[3]; - /* this assignment assigns the table of result tuples into a giant - array with the name given in the argument, - the indices of the array or (tupno,attrName)*/ - for (tupno = 0; tupno<PQntuples(result); tupno++) { - for (i=0;i<PQnfields(result);i++) { - sprintf(arrayInd, "%d,%s", tupno, PQfname(result,i)); - Tcl_SetVar2(interp, arrVar, arrayInd, + if (strcmp(opt, "-status") == 0) + { + Tcl_AppendResult(interp, pgresStatus[PQresultStatus(result)], 0); + return TCL_OK; + } + else if (strcmp(opt, "-oid") == 0) + { + Tcl_AppendResult(interp, PQoidStatus(result), 0); + return TCL_OK; + } + else if (strcmp(opt, "-conn") == 0) + { + PgGetConnByResultId(cd, interp->result, argv[1]); + return TCL_OK; + } + else if (strcmp(opt, "-clear") == 0) + { + PgDelResultId(cd, argv[1]); + PQclear(result); + return TCL_OK; + } + else if (strcmp(opt, "-numTuples") == 0) + { + sprintf(interp->result, "%d", PQntuples(result)); + return TCL_OK; + } + else if (strcmp(opt, "-assign") == 0) + { + if (argc != 4) + { + Tcl_AppendResult(interp, "-assign option must be followed by a variable name", 0); + return TCL_ERROR; + } + arrVar = argv[3]; + + /* + * this assignment assigns the table of result tuples into a giant + * array with the name given in the argument, the indices of the + * array or (tupno,attrName) + */ + for (tupno = 0; tupno < PQntuples(result); tupno++) + { + for (i = 0; i < PQnfields(result); i++) + { + sprintf(arrayInd, "%d,%s", tupno, PQfname(result, i)); + Tcl_SetVar2(interp, arrVar, arrayInd, #ifdef TCL_ARRAYS - tcl_value(PQgetvalue(result,tupno,i)), + tcl_value(PQgetvalue(result, tupno, i)), #else - PQgetvalue(result,tupno,i), + PQgetvalue(result, tupno, i), #endif - TCL_LEAVE_ERR_MSG); - } + TCL_LEAVE_ERR_MSG); + } + } + Tcl_AppendResult(interp, arrVar, 0); + return TCL_OK; } - Tcl_AppendResult(interp, arrVar, 0); - return TCL_OK; - } - else if (strcmp(opt, "-assignbyidx") == 0) { - if (argc !=4 && argc != 5) { - Tcl_AppendResult(interp, "-assignbyidx requires the array name and takes one optional argument as an append string",0); - return TCL_ERROR; - } - arrVar = argv[3]; - /* this assignment assigns the table of result tuples into a giant - array with the name given in the argument, - the indices of the array or (tupno,attrName)*/ - if (argc == 5) { - appendstr = argv[4]; - } else { - appendstr = ""; - } - for (tupno = 0; tupno<PQntuples(result); tupno++) { - sprintf(prearrayInd,"%s",PQgetvalue(result,tupno,0)); - for (i=1;i<PQnfields(result);i++) { - sprintf(arrayInd, "%s,%s%s", prearrayInd, PQfname(result,i), - appendstr); - Tcl_SetVar2(interp, arrVar, arrayInd, - PQgetvalue(result,tupno,i), - TCL_LEAVE_ERR_MSG); - } - } - Tcl_AppendResult(interp, arrVar, 0); - return TCL_OK; - } - else if (strcmp(opt, "-getTuple") == 0) { - if (argc != 4) { - Tcl_AppendResult(interp, "-getTuple option must be followed by a tuple number",0); - return TCL_ERROR; - } - tupno = atoi(argv[3]); - - if (tupno >= PQntuples(result)) { - Tcl_AppendResult(interp, "argument to getTuple cannot exceed number of tuples - 1",0); - return TCL_ERROR; + else if (strcmp(opt, "-assignbyidx") == 0) + { + if (argc != 4 && argc != 5) + { + Tcl_AppendResult(interp, "-assignbyidx requires the array name and takes one optional argument as an append string", 0); + return TCL_ERROR; + } + arrVar = argv[3]; + + /* + * this assignment assigns the table of result tuples into a giant + * array with the name given in the argument, the indices of the + * array or (tupno,attrName) + */ + if (argc == 5) + { + appendstr = argv[4]; + } + else + { + appendstr = ""; + } + for (tupno = 0; tupno < PQntuples(result); tupno++) + { + sprintf(prearrayInd, "%s", PQgetvalue(result, tupno, 0)); + for (i = 1; i < PQnfields(result); i++) + { + sprintf(arrayInd, "%s,%s%s", prearrayInd, PQfname(result, i), + appendstr); + Tcl_SetVar2(interp, arrVar, arrayInd, + PQgetvalue(result, tupno, i), + TCL_LEAVE_ERR_MSG); + } + } + Tcl_AppendResult(interp, arrVar, 0); + return TCL_OK; } + else if (strcmp(opt, "-getTuple") == 0) + { + if (argc != 4) + { + Tcl_AppendResult(interp, "-getTuple option must be followed by a tuple number", 0); + return TCL_ERROR; + } + tupno = atoi(argv[3]); + + if (tupno >= PQntuples(result)) + { + Tcl_AppendResult(interp, "argument to getTuple cannot exceed number of tuples - 1", 0); + return TCL_ERROR; + } #ifdef TCL_ARRAYS - for (i=0; i<PQnfields(result); i++) { - Tcl_AppendElement(interp, tcl_value(PQgetvalue(result,tupno,i))); - } + for (i = 0; i < PQnfields(result); i++) + { + Tcl_AppendElement(interp, tcl_value(PQgetvalue(result, tupno, i))); + } #else -/* Tcl_AppendResult(interp, PQgetvalue(result,tupno,0),NULL); */ - Tcl_AppendElement(interp, PQgetvalue(result,tupno,0)); - for (i=1;i<PQnfields(result);i++) { -/* Tcl_AppendResult(interp, " ", PQgetvalue(result,tupno,i),NULL);*/ - Tcl_AppendElement(interp, PQgetvalue(result,tupno,i)); - } +/* Tcl_AppendResult(interp, PQgetvalue(result,tupno,0),NULL); */ + Tcl_AppendElement(interp, PQgetvalue(result, tupno, 0)); + for (i = 1; i < PQnfields(result); i++) + { +/* Tcl_AppendResult(interp, " ", PQgetvalue(result,tupno,i),NULL);*/ + Tcl_AppendElement(interp, PQgetvalue(result, tupno, i)); + } #endif - return TCL_OK; - } - else if (strcmp(opt, "-attributes") == 0) { - Tcl_AppendResult(interp, PQfname(result,0),NULL); - for (i=1;i<PQnfields(result);i++) { - Tcl_AppendResult(interp, " ", PQfname(result,i), NULL); - } - return TCL_OK; - } - else if (strcmp(opt, "-lAttributes") == 0) { - char buf[512]; - Tcl_ResetResult(interp); - for (i = 0; i < PQnfields(result); i++) { - sprintf(buf, "{%s} %ld %d", PQfname(result, i), - (long) PQftype(result, i), - PQfsize(result, i)); - Tcl_AppendElement(interp, buf); - } - return TCL_OK; - } - else if (strcmp(opt, "-numAttrs") == 0) { - sprintf(interp->result, "%d", PQnfields(result)); - return TCL_OK; - } - else { - Tcl_AppendResult(interp, "Invalid option",0); - goto Pg_result_errReturn; - } - - - Pg_result_errReturn: - Tcl_AppendResult(interp, - "pg_result result ?option? where ?option is\n", - "\t-status\n", - "\t-conn\n", - "\t-assign arrayVarName\n", - "\t-assignbyidx arrayVarName ?appendstr?\n", - "\t-numTuples\n", - "\t-attributes\n" - "\t-lAttributes\n" - "\t-numAttrs\n" - "\t-getTuple tupleNumber\n", - "\t-clear\n", - "\t-oid\n", - 0); - return TCL_ERROR; - + return TCL_OK; + } + else if (strcmp(opt, "-attributes") == 0) + { + Tcl_AppendResult(interp, PQfname(result, 0), NULL); + for (i = 1; i < PQnfields(result); i++) + { + Tcl_AppendResult(interp, " ", PQfname(result, i), NULL); + } + return TCL_OK; + } + else if (strcmp(opt, "-lAttributes") == 0) + { + char buf[512]; + + Tcl_ResetResult(interp); + for (i = 0; i < PQnfields(result); i++) + { + sprintf(buf, "{%s} %ld %d", PQfname(result, i), + (long) PQftype(result, i), + PQfsize(result, i)); + Tcl_AppendElement(interp, buf); + } + return TCL_OK; + } + else if (strcmp(opt, "-numAttrs") == 0) + { + sprintf(interp->result, "%d", PQnfields(result)); + return TCL_OK; + } + else + { + Tcl_AppendResult(interp, "Invalid option", 0); + goto Pg_result_errReturn; + } + + +Pg_result_errReturn: + Tcl_AppendResult(interp, + "pg_result result ?option? where ?option is\n", + "\t-status\n", + "\t-conn\n", + "\t-assign arrayVarName\n", + "\t-assignbyidx arrayVarName ?appendstr?\n", + "\t-numTuples\n", + "\t-attributes\n" + "\t-lAttributes\n" + "\t-numAttrs\n" + "\t-getTuple tupleNumber\n", + "\t-clear\n", + "\t-oid\n", + 0); + return TCL_ERROR; + } /********************************** * pg_lo_open - open a large object - + open a large object + syntax: - pg_lo_open conn objOid mode + pg_lo_open conn objOid mode where mode can be either 'r', 'w', or 'rw' **********************/ int -Pg_lo_open(ClientData cData, Tcl_Interp *interp, int argc, char* argv[]) +Pg_lo_open(ClientData cData, Tcl_Interp * interp, int argc, char *argv[]) { - Pg_clientData *cd = (Pg_clientData *)cData; - PGconn *conn; - int lobjId; - int mode; - int fd; - - if (argc != 4) { - Tcl_AppendResult(interp, "Wrong # of arguments\n", - "pg_lo_open connection lobjOid mode", 0); - return TCL_ERROR; - } - - conn = PgGetConnectionId(cd, argv[1]); - if (conn == (PGconn *)NULL) { - Tcl_AppendResult(interp, "First argument is not a valid connection\n", 0); - return TCL_ERROR; - } - - lobjId = atoi(argv[2]); - if (strlen(argv[3]) < 1 || - strlen(argv[3]) > 2) - { - Tcl_AppendResult(interp,"mode argument must be 'r', 'w', or 'rw'",0); - return TCL_ERROR; - } - switch (argv[3][0]) { - case 'r': - case 'R': - mode = INV_READ; - break; - case 'w': - case 'W': - mode = INV_WRITE; - break; - default: - Tcl_AppendResult(interp,"mode argument must be 'r', 'w', or 'rw'",0); - return TCL_ERROR; - } - switch (argv[3][1]) { - case '\0': - break; - case 'r': - case 'R': - mode = mode & INV_READ; - break; - case 'w': - case 'W': - mode = mode & INV_WRITE; - break; - default: - Tcl_AppendResult(interp,"mode argument must be 'r', 'w', or 'rw'",0); - return TCL_ERROR; - } - - fd = lo_open(conn,lobjId,mode); - sprintf(interp->result,"%d",fd); - return TCL_OK; + Pg_clientData *cd = (Pg_clientData *) cData; + PGconn *conn; + int lobjId; + int mode; + int fd; + + if (argc != 4) + { + Tcl_AppendResult(interp, "Wrong # of arguments\n", + "pg_lo_open connection lobjOid mode", 0); + return TCL_ERROR; + } + + conn = PgGetConnectionId(cd, argv[1]); + if (conn == (PGconn *) NULL) + { + Tcl_AppendResult(interp, "First argument is not a valid connection\n", 0); + return TCL_ERROR; + } + + lobjId = atoi(argv[2]); + if (strlen(argv[3]) < 1 || + strlen(argv[3]) > 2) + { + Tcl_AppendResult(interp, "mode argument must be 'r', 'w', or 'rw'", 0); + return TCL_ERROR; + } + switch (argv[3][0]) + { + case 'r': + case 'R': + mode = INV_READ; + break; + case 'w': + case 'W': + mode = INV_WRITE; + break; + default: + Tcl_AppendResult(interp, "mode argument must be 'r', 'w', or 'rw'", 0); + return TCL_ERROR; + } + switch (argv[3][1]) + { + case '\0': + break; + case 'r': + case 'R': + mode = mode & INV_READ; + break; + case 'w': + case 'W': + mode = mode & INV_WRITE; + break; + default: + Tcl_AppendResult(interp, "mode argument must be 'r', 'w', or 'rw'", 0); + return TCL_ERROR; + } + + fd = lo_open(conn, lobjId, mode); + sprintf(interp->result, "%d", fd); + return TCL_OK; } /********************************** * pg_lo_close - close a large object - + close a large object + syntax: - pg_lo_close conn fd + pg_lo_close conn fd **********************/ int -Pg_lo_close(ClientData cData, Tcl_Interp *interp, int argc, char* argv[]) +Pg_lo_close(ClientData cData, Tcl_Interp * interp, int argc, char *argv[]) { - Pg_clientData *cd = (Pg_clientData *)cData; - PGconn *conn; - int fd; + Pg_clientData *cd = (Pg_clientData *) cData; + PGconn *conn; + int fd; - if (argc != 3) { - Tcl_AppendResult(interp, "Wrong # of arguments\n", - "pg_lo_close connection fd", 0); - return TCL_ERROR; - } + if (argc != 3) + { + Tcl_AppendResult(interp, "Wrong # of arguments\n", + "pg_lo_close connection fd", 0); + return TCL_ERROR; + } - conn = PgGetConnectionId(cd, argv[1]); - if (conn == (PGconn *)NULL) { - Tcl_AppendResult(interp, "First argument is not a valid connection\n", 0); - return TCL_ERROR; - } - - fd = atoi(argv[2]); - sprintf(interp->result,"%d",lo_close(conn,fd)); - return TCL_OK; + conn = PgGetConnectionId(cd, argv[1]); + if (conn == (PGconn *) NULL) + { + Tcl_AppendResult(interp, "First argument is not a valid connection\n", 0); + return TCL_ERROR; + } + + fd = atoi(argv[2]); + sprintf(interp->result, "%d", lo_close(conn, fd)); + return TCL_OK; } /********************************** * pg_lo_read - reads at most len bytes from a large object into a variable named + reads at most len bytes from a large object into a variable named bufVar - + syntax: pg_lo_read conn fd bufVar len @@ -743,98 +835,104 @@ Pg_lo_close(ClientData cData, Tcl_Interp *interp, int argc, char* argv[]) **********************/ int -Pg_lo_read(ClientData cData, Tcl_Interp *interp, int argc, char* argv[]) +Pg_lo_read(ClientData cData, Tcl_Interp * interp, int argc, char *argv[]) { - Pg_clientData *cd = (Pg_clientData *)cData; - PGconn *conn; - int fd; - int nbytes = 0; - char *buf; - char *bufVar; - int len; - - if (argc != 5) { - Tcl_AppendResult(interp, "Wrong # of arguments\n", - " pg_lo_read conn fd bufVar len", 0); - return TCL_ERROR; - } + Pg_clientData *cd = (Pg_clientData *) cData; + PGconn *conn; + int fd; + int nbytes = 0; + char *buf; + char *bufVar; + int len; - conn = PgGetConnectionId(cd, argv[1]); - if (conn == (PGconn *)NULL) { - Tcl_AppendResult(interp, "First argument is not a valid connection\n", 0); - return TCL_ERROR; - } - - fd = atoi(argv[2]); + if (argc != 5) + { + Tcl_AppendResult(interp, "Wrong # of arguments\n", + " pg_lo_read conn fd bufVar len", 0); + return TCL_ERROR; + } + + conn = PgGetConnectionId(cd, argv[1]); + if (conn == (PGconn *) NULL) + { + Tcl_AppendResult(interp, "First argument is not a valid connection\n", 0); + return TCL_ERROR; + } - bufVar = argv[3]; + fd = atoi(argv[2]); - len = atoi(argv[4]); + bufVar = argv[3]; - if (len <= 0) { - sprintf(interp->result,"%d",nbytes); - return TCL_OK; - } - buf = malloc(sizeof(len+1)); + len = atoi(argv[4]); + + if (len <= 0) + { + sprintf(interp->result, "%d", nbytes); + return TCL_OK; + } + buf = malloc(sizeof(len + 1)); - nbytes = lo_read(conn,fd,buf,len); + nbytes = lo_read(conn, fd, buf, len); + + Tcl_SetVar(interp, bufVar, buf, TCL_LEAVE_ERR_MSG); + sprintf(interp->result, "%d", nbytes); + free(buf); + return TCL_OK; - Tcl_SetVar(interp,bufVar,buf,TCL_LEAVE_ERR_MSG); - sprintf(interp->result,"%d",nbytes); - free(buf); - return TCL_OK; - } /*********************************** Pg_lo_write - write at most len bytes to a large object + write at most len bytes to a large object syntax: pg_lo_write conn fd buf len ***********************************/ int -Pg_lo_write(ClientData cData, Tcl_Interp *interp, int argc, char* argv[]) +Pg_lo_write(ClientData cData, Tcl_Interp * interp, int argc, char *argv[]) { - Pg_clientData *cd = (Pg_clientData *)cData; - PGconn *conn; - char *buf; - int fd; - int nbytes = 0; - int len; - - if (argc != 5) { - Tcl_AppendResult(interp, "Wrong # of arguments\n", - "pg_lo_write conn fd buf len", 0); - return TCL_ERROR; - } + Pg_clientData *cd = (Pg_clientData *) cData; + PGconn *conn; + char *buf; + int fd; + int nbytes = 0; + int len; - conn = PgGetConnectionId(cd, argv[1]); - if (conn == (PGconn *)NULL) { - Tcl_AppendResult(interp, "First argument is not a valid connection\n", 0); - return TCL_ERROR; - } - - fd = atoi(argv[2]); + if (argc != 5) + { + Tcl_AppendResult(interp, "Wrong # of arguments\n", + "pg_lo_write conn fd buf len", 0); + return TCL_ERROR; + } + + conn = PgGetConnectionId(cd, argv[1]); + if (conn == (PGconn *) NULL) + { + Tcl_AppendResult(interp, "First argument is not a valid connection\n", 0); + return TCL_ERROR; + } - buf = argv[3]; + fd = atoi(argv[2]); - len = atoi(argv[4]); + buf = argv[3]; - if (len <= 0) { - sprintf(interp->result,"%d",nbytes); - return TCL_OK; - } + len = atoi(argv[4]); - nbytes = lo_write(conn,fd,buf,len); - sprintf(interp->result,"%d",nbytes); - return TCL_OK; + if (len <= 0) + { + sprintf(interp->result, "%d", nbytes); + return TCL_OK; + } + + nbytes = lo_write(conn, fd, buf, len); + sprintf(interp->result, "%d", nbytes); + return TCL_OK; } /*********************************** Pg_lo_lseek - seek to a certain position in a large object + seek to a certain position in a large object syntax pg_lo_lseek conn fd offset whence @@ -843,44 +941,54 @@ whence can be either "SEEK_CUR", "SEEK_END", or "SEEK_SET" ***********************************/ int -Pg_lo_lseek(ClientData cData, Tcl_Interp *interp, int argc, char* argv[]) +Pg_lo_lseek(ClientData cData, Tcl_Interp * interp, int argc, char *argv[]) { - Pg_clientData *cd = (Pg_clientData *)cData; - PGconn *conn; - int fd; - char *whenceStr; - int offset, whence; - - if (argc != 5) { - Tcl_AppendResult(interp, "Wrong # of arguments\n", - "pg_lo_lseek conn fd offset whence", 0); - return TCL_ERROR; - } + Pg_clientData *cd = (Pg_clientData *) cData; + PGconn *conn; + int fd; + char *whenceStr; + int offset, + whence; - conn = PgGetConnectionId(cd, argv[1]); - if (conn == (PGconn *)NULL) { - Tcl_AppendResult(interp, "First argument is not a valid connection\n", 0); - return TCL_ERROR; - } - - fd = atoi(argv[2]); - - offset = atoi(argv[3]); - - whenceStr = argv[4]; - if (strcmp(whenceStr,"SEEK_SET") == 0) { - whence = SEEK_SET; - } else if (strcmp(whenceStr,"SEEK_CUR") == 0) { - whence = SEEK_CUR; - } else if (strcmp(whenceStr,"SEEK_END") == 0) { - whence = SEEK_END; - } else { - Tcl_AppendResult(interp, "the whence argument to Pg_lo_lseek must be SEEK_SET, SEEK_CUR or SEEK_END",0); - return TCL_ERROR; - } - - sprintf(interp->result,"%d",lo_lseek(conn,fd,offset,whence)); - return TCL_OK; + if (argc != 5) + { + Tcl_AppendResult(interp, "Wrong # of arguments\n", + "pg_lo_lseek conn fd offset whence", 0); + return TCL_ERROR; + } + + conn = PgGetConnectionId(cd, argv[1]); + if (conn == (PGconn *) NULL) + { + Tcl_AppendResult(interp, "First argument is not a valid connection\n", 0); + return TCL_ERROR; + } + + fd = atoi(argv[2]); + + offset = atoi(argv[3]); + + whenceStr = argv[4]; + if (strcmp(whenceStr, "SEEK_SET") == 0) + { + whence = SEEK_SET; + } + else if (strcmp(whenceStr, "SEEK_CUR") == 0) + { + whence = SEEK_CUR; + } + else if (strcmp(whenceStr, "SEEK_END") == 0) + { + whence = SEEK_END; + } + else + { + Tcl_AppendResult(interp, "the whence argument to Pg_lo_lseek must be SEEK_SET, SEEK_CUR or SEEK_END", 0); + return TCL_ERROR; + } + + sprintf(interp->result, "%d", lo_lseek(conn, fd, offset, whence)); + return TCL_OK; } @@ -896,97 +1004,116 @@ for now, we don't support any additional storage managers. ***********************************/ int -Pg_lo_creat(ClientData cData, Tcl_Interp *interp, int argc, char* argv[]) +Pg_lo_creat(ClientData cData, Tcl_Interp * interp, int argc, char *argv[]) { - Pg_clientData *cd = (Pg_clientData *)cData; - PGconn *conn; - char *modeStr; - char *modeWord; - int mode; - - if (argc != 3) { - Tcl_AppendResult(interp, "Wrong # of arguments\n", - "pg_lo_creat conn mode", 0); - return TCL_ERROR; - } + Pg_clientData *cd = (Pg_clientData *) cData; + PGconn *conn; + char *modeStr; + char *modeWord; + int mode; - conn = PgGetConnectionId(cd, argv[1]); - if (conn == (PGconn *)NULL) { - Tcl_AppendResult(interp, "First argument is not a valid connection\n", 0); - return TCL_ERROR; - } - - modeStr = argv[2]; - - modeWord = strtok(modeStr,"|"); - if (strcmp(modeWord,"INV_READ") == 0) { - mode = INV_READ; - } else if (strcmp(modeWord,"INV_WRITE") == 0) { - mode = INV_WRITE; - } else if (strcmp(modeWord,"INV_ARCHIVE") == 0) { - mode = INV_ARCHIVE; - } else { - Tcl_AppendResult(interp, - "invalid mode argument to Pg_lo_creat\nmode argument must be some OR'd combination of INV_READ, INV_WRITE, and INV_ARCHIVE", - 0); - return TCL_ERROR; - } - - while ( (modeWord = strtok((char*)NULL, "|")) != NULL) { - if (strcmp(modeWord,"INV_READ") == 0) { - mode |= INV_READ; - } else if (strcmp(modeWord,"INV_WRITE") == 0) { - mode |= INV_WRITE; - } else if (strcmp(modeWord,"INV_ARCHIVE") == 0) { - mode |= INV_ARCHIVE; - } else { - Tcl_AppendResult(interp, - "invalid mode argument to Pg_lo_creat\nmode argument must be some OR'd combination of INV_READ, INV_WRITE, and INV_ARCHIVE", - 0); - return TCL_ERROR; - } - } - sprintf(interp->result,"%d",lo_creat(conn,mode)); - return TCL_OK; + if (argc != 3) + { + Tcl_AppendResult(interp, "Wrong # of arguments\n", + "pg_lo_creat conn mode", 0); + return TCL_ERROR; + } + + conn = PgGetConnectionId(cd, argv[1]); + if (conn == (PGconn *) NULL) + { + Tcl_AppendResult(interp, "First argument is not a valid connection\n", 0); + return TCL_ERROR; + } + + modeStr = argv[2]; + + modeWord = strtok(modeStr, "|"); + if (strcmp(modeWord, "INV_READ") == 0) + { + mode = INV_READ; + } + else if (strcmp(modeWord, "INV_WRITE") == 0) + { + mode = INV_WRITE; + } + else if (strcmp(modeWord, "INV_ARCHIVE") == 0) + { + mode = INV_ARCHIVE; + } + else + { + Tcl_AppendResult(interp, + "invalid mode argument to Pg_lo_creat\nmode argument must be some OR'd combination of INV_READ, INV_WRITE, and INV_ARCHIVE", + 0); + return TCL_ERROR; + } + + while ((modeWord = strtok((char *) NULL, "|")) != NULL) + { + if (strcmp(modeWord, "INV_READ") == 0) + { + mode |= INV_READ; + } + else if (strcmp(modeWord, "INV_WRITE") == 0) + { + mode |= INV_WRITE; + } + else if (strcmp(modeWord, "INV_ARCHIVE") == 0) + { + mode |= INV_ARCHIVE; + } + else + { + Tcl_AppendResult(interp, + "invalid mode argument to Pg_lo_creat\nmode argument must be some OR'd combination of INV_READ, INV_WRITE, and INV_ARCHIVE", + 0); + return TCL_ERROR; + } + } + sprintf(interp->result, "%d", lo_creat(conn, mode)); + return TCL_OK; } /*********************************** Pg_lo_tell - returns the current seek location of the large object + returns the current seek location of the large object syntax: pg_lo_tell conn fd ***********************************/ int -Pg_lo_tell(ClientData cData, Tcl_Interp *interp, int argc, char* argv[]) +Pg_lo_tell(ClientData cData, Tcl_Interp * interp, int argc, char *argv[]) { - Pg_clientData *cd = (Pg_clientData *)cData; - PGconn *conn; - int fd; + Pg_clientData *cd = (Pg_clientData *) cData; + PGconn *conn; + int fd; - if (argc != 3) { - Tcl_AppendResult(interp, "Wrong # of arguments\n", - "pg_lo_tell conn fd", 0); - return TCL_ERROR; - } + if (argc != 3) + { + Tcl_AppendResult(interp, "Wrong # of arguments\n", + "pg_lo_tell conn fd", 0); + return TCL_ERROR; + } - conn = PgGetConnectionId(cd, argv[1]); - if (conn == (PGconn *)NULL) { - Tcl_AppendResult(interp, "First argument is not a valid connection\n", 0); - return TCL_ERROR; - } - - fd = atoi(argv[2]); + conn = PgGetConnectionId(cd, argv[1]); + if (conn == (PGconn *) NULL) + { + Tcl_AppendResult(interp, "First argument is not a valid connection\n", 0); + return TCL_ERROR; + } - sprintf(interp->result,"%d",lo_tell(conn,fd)); - return TCL_OK; + fd = atoi(argv[2]); + + sprintf(interp->result, "%d", lo_tell(conn, fd)); + return TCL_OK; } /*********************************** Pg_lo_unlink - unlink a file based on lobject id + unlink a file based on lobject id syntax: pg_lo_unlink conn lobjId @@ -994,40 +1121,43 @@ Pg_lo_unlink ***********************************/ int -Pg_lo_unlink(ClientData cData, Tcl_Interp *interp, int argc, char* argv[]) +Pg_lo_unlink(ClientData cData, Tcl_Interp * interp, int argc, char *argv[]) { - Pg_clientData *cd = (Pg_clientData *)cData; - PGconn *conn; - int lobjId; - int retval; - - if (argc != 3) { - Tcl_AppendResult(interp, "Wrong # of arguments\n", - "pg_lo_tell conn fd", 0); - return TCL_ERROR; - } + Pg_clientData *cd = (Pg_clientData *) cData; + PGconn *conn; + int lobjId; + int retval; - conn = PgGetConnectionId(cd, argv[1]); - if (conn == (PGconn *)NULL) { - Tcl_AppendResult(interp, "First argument is not a valid connection\n", 0); - return TCL_ERROR; - } - - lobjId = atoi(argv[2]); + if (argc != 3) + { + Tcl_AppendResult(interp, "Wrong # of arguments\n", + "pg_lo_tell conn fd", 0); + return TCL_ERROR; + } - retval = lo_unlink(conn,lobjId); - if (retval == -1) { - sprintf(interp->result,"Pg_lo_unlink of '%d' failed",lobjId); - return TCL_ERROR; - } - - sprintf(interp->result,"%d",retval); - return TCL_OK; + conn = PgGetConnectionId(cd, argv[1]); + if (conn == (PGconn *) NULL) + { + Tcl_AppendResult(interp, "First argument is not a valid connection\n", 0); + return TCL_ERROR; + } + + lobjId = atoi(argv[2]); + + retval = lo_unlink(conn, lobjId); + if (retval == -1) + { + sprintf(interp->result, "Pg_lo_unlink of '%d' failed", lobjId); + return TCL_ERROR; + } + + sprintf(interp->result, "%d", retval); + return TCL_OK; } /*********************************** Pg_lo_import - import a Unix file into an (inversion) large objct + import a Unix file into an (inversion) large objct returns the oid of that object upon success returns InvalidOid upon failure @@ -1037,81 +1167,87 @@ Pg_lo_import ***********************************/ int -Pg_lo_import(ClientData cData, Tcl_Interp *interp, int argc, char* argv[]) +Pg_lo_import(ClientData cData, Tcl_Interp * interp, int argc, char *argv[]) { - Pg_clientData *cd = (Pg_clientData *)cData; - PGconn *conn; - char* filename; - Oid lobjId; - - if (argc != 3) { - Tcl_AppendResult(interp, "Wrong # of arguments\n", - "pg_lo_import conn filename", 0); - return TCL_ERROR; - } + Pg_clientData *cd = (Pg_clientData *) cData; + PGconn *conn; + char *filename; + Oid lobjId; - conn = PgGetConnectionId(cd, argv[1]); - if (conn == (PGconn *)NULL) { - Tcl_AppendResult(interp, "First argument is not a valid connection\n", 0); - return TCL_ERROR; - } - - filename = argv[2]; + if (argc != 3) + { + Tcl_AppendResult(interp, "Wrong # of arguments\n", + "pg_lo_import conn filename", 0); + return TCL_ERROR; + } - lobjId = lo_import(conn,filename); - if (lobjId == InvalidOid) { - sprintf(interp->result, "Pg_lo_import of '%s' failed",filename); - return TCL_ERROR; - } - sprintf(interp->result,"%d",lobjId); - return TCL_OK; + conn = PgGetConnectionId(cd, argv[1]); + if (conn == (PGconn *) NULL) + { + Tcl_AppendResult(interp, "First argument is not a valid connection\n", 0); + return TCL_ERROR; + } + + filename = argv[2]; + + lobjId = lo_import(conn, filename); + if (lobjId == InvalidOid) + { + sprintf(interp->result, "Pg_lo_import of '%s' failed", filename); + return TCL_ERROR; + } + sprintf(interp->result, "%d", lobjId); + return TCL_OK; } /*********************************** Pg_lo_export - export an Inversion large object to a Unix file - + export an Inversion large object to a Unix file + syntax: pg_lo_export conn lobjId filename ***********************************/ int -Pg_lo_export(ClientData cData, Tcl_Interp *interp, int argc, char* argv[]) +Pg_lo_export(ClientData cData, Tcl_Interp * interp, int argc, char *argv[]) { - Pg_clientData *cd = (Pg_clientData *)cData; - PGconn *conn; - char* filename; - Oid lobjId; - int retval; - - if (argc != 4) { - Tcl_AppendResult(interp, "Wrong # of arguments\n", - "pg_lo_export conn lobjId filename", 0); - return TCL_ERROR; - } + Pg_clientData *cd = (Pg_clientData *) cData; + PGconn *conn; + char *filename; + Oid lobjId; + int retval; - conn = PgGetConnectionId(cd, argv[1]); - if (conn == (PGconn *)NULL) { - Tcl_AppendResult(interp, "First argument is not a valid connection\n", 0); - return TCL_ERROR; - } - - lobjId = atoi(argv[2]); - filename = argv[3]; - - retval = lo_export(conn,lobjId,filename); - if (retval == -1) { - sprintf(interp->result, "Pg_lo_export %d %s failed",lobjId, filename); - return TCL_ERROR; - } - return TCL_OK; + if (argc != 4) + { + Tcl_AppendResult(interp, "Wrong # of arguments\n", + "pg_lo_export conn lobjId filename", 0); + return TCL_ERROR; + } + + conn = PgGetConnectionId(cd, argv[1]); + if (conn == (PGconn *) NULL) + { + Tcl_AppendResult(interp, "First argument is not a valid connection\n", 0); + return TCL_ERROR; + } + + lobjId = atoi(argv[2]); + filename = argv[3]; + + retval = lo_export(conn, lobjId, filename); + if (retval == -1) + { + sprintf(interp->result, "Pg_lo_export %d %s failed", lobjId, filename); + return TCL_ERROR; + } + return TCL_OK; } /********************************** * pg_select send a select query string to the backend connection - + syntax: pg_select connection query var proc @@ -1121,7 +1257,7 @@ Pg_lo_export(ClientData cData, Tcl_Interp *interp, int argc, char* argv[]) Originally I was also going to update changes but that has turned out to be not so simple. Instead, the caller should get the OID of any - table they want to update and update it themself in the loop. I may + table they want to update and update it themself in the loop. I may try to write a simplified table lookup and update function to make that task a little easier. @@ -1130,41 +1266,45 @@ Pg_lo_export(ClientData cData, Tcl_Interp *interp, int argc, char* argv[]) **********************************/ int -Pg_select(ClientData cData, Tcl_Interp *interp, int argc, char **argv) +Pg_select(ClientData cData, Tcl_Interp * interp, int argc, char **argv) { - Pg_clientData *cd = (Pg_clientData *)cData; - PGconn *conn; - PGresult *result; - int r; - size_t tupno, column, ncols; - Tcl_DString headers; - char buffer[2048]; - struct { - char *cname; - int change; - } *info; + Pg_clientData *cd = (Pg_clientData *) cData; + PGconn *conn; + PGresult *result; + int r; + size_t tupno, + column, + ncols; + Tcl_DString headers; + char buffer[2048]; + struct + { + char *cname; + int change; + } *info; if (argc != 5) { Tcl_AppendResult(interp, "Wrong # of arguments\n", - "pg_select connection queryString var proc", 0); + "pg_select connection queryString var proc", 0); + return TCL_ERROR; + } + + conn = PgGetConnectionId(cd, argv[1]); + if (conn == (PGconn *) NULL) + { + Tcl_AppendResult(interp, "First argument is not a valid connection\n", 0); return TCL_ERROR; } - conn = PgGetConnectionId(cd, argv[1]); - if (conn == (PGconn *)NULL) { - Tcl_AppendResult(interp, "First argument is not a valid connection\n", 0); - return TCL_ERROR; - } - if ((result = PQexec(conn, argv[2])) == 0) - { + { /* error occurred during the query */ Tcl_SetResult(interp, conn->errorMessage, TCL_STATIC); return TCL_ERROR; - } + } - if ((info = malloc(sizeof(*info) * (ncols = PQnfields(result)))) == NULL) + if ((info = malloc(sizeof(*info) * (ncols = PQnfields(result)))) == NULL) { Tcl_AppendResult(interp, "Not enough memory", 0); return TCL_ERROR; @@ -1203,10 +1343,10 @@ Pg_select(ClientData cData, Tcl_Interp *interp, int argc, char **argv) if (r == TCL_ERROR) { - char msg[60]; + char msg[60]; sprintf(msg, "\n (\"pg_select\" body line %d)", - interp->errorLine); + interp->errorLine); Tcl_AddErrorInfo(interp, msg); } @@ -1221,142 +1361,160 @@ Pg_select(ClientData cData, Tcl_Interp *interp, int argc, char **argv) } int -Pg_listen(ClientData cData, Tcl_Interp *interp, int argc, char* argv[]) +Pg_listen(ClientData cData, Tcl_Interp * interp, int argc, char *argv[]) { - Pg_clientData *cd = (Pg_clientData *)cData; - int new; - char *relname; - char *callback = NULL; - Tcl_HashEntry *entry; - PGconn *conn; - PGresult *result; - - if ((argc < 3) || (argc > 4)) { - Tcl_AppendResult(interp, "wrong # args, should be \"", - argv[0], " connection relname ?callback?\"", 0); - return TCL_ERROR; - } - - /* - * Get the command arguments. Note that relname will copied by - * Tcl_CreateHashEntry while callback must be allocated. - */ - conn = (PGconn*)PgGetConnectionId(cd, argv[1]); - if (conn == (PGconn *)NULL) { - Tcl_AppendResult(interp, "First argument is not a valid connection\n", 0); - return TCL_ERROR; - } - relname = argv[2]; - if ((argc > 3) && *argv[3]) { - callback = (char *) ckalloc((unsigned) (strlen(argv[3])+1)); - strcpy(callback, argv[3]); - } - - /* - * Set or update a callback for a relation; - */ - if (callback) { - entry = Tcl_CreateHashEntry(&(cd->notify_hash), relname, &new); - if (new) { - /* New callback, execute a listen command on the relation */ - char *cmd = (char *) ckalloc((unsigned) (strlen(argv[2])+8)); - sprintf(cmd, "LISTEN %s", relname); - result = PQexec(conn, cmd); - ckfree(cmd); - if (!result || (result->resultStatus != PGRES_COMMAND_OK)) { - /* Error occurred during the execution of command */ - if (result) PQclear(result); - ckfree(callback); - Tcl_DeleteHashEntry(entry); - Tcl_SetResult(interp, conn->errorMessage, TCL_STATIC); + Pg_clientData *cd = (Pg_clientData *) cData; + int new; + char *relname; + char *callback = NULL; + Tcl_HashEntry *entry; + PGconn *conn; + PGresult *result; + + if ((argc < 3) || (argc > 4)) + { + Tcl_AppendResult(interp, "wrong # args, should be \"", + argv[0], " connection relname ?callback?\"", 0); + return TCL_ERROR; + } + + /* + * Get the command arguments. Note that relname will copied by + * Tcl_CreateHashEntry while callback must be allocated. + */ + conn = (PGconn *) PgGetConnectionId(cd, argv[1]); + if (conn == (PGconn *) NULL) + { + Tcl_AppendResult(interp, "First argument is not a valid connection\n", 0); return TCL_ERROR; - } - PQclear(result); - } else { - /* Free the old callback string */ - ckfree((char *) Tcl_GetHashValue(entry)); - } - /* Store the new callback command */ - Tcl_SetHashValue(entry, callback); - } - - /* - * Remove a callback for a relation. There is no way to - * un-listen a relation, simply remove the callback from - * the notify hash table. - */ - if (callback == NULL) { - entry = Tcl_FindHashEntry(&(cd->notify_hash), relname); - if (entry == NULL) { - Tcl_AppendResult(interp, "not listening on ", relname, 0); - return TCL_ERROR; - } - ckfree((char *) Tcl_GetHashValue(entry)); - Tcl_DeleteHashEntry(entry); - } - - return TCL_OK; + } + relname = argv[2]; + if ((argc > 3) && *argv[3]) + { + callback = (char *) ckalloc((unsigned) (strlen(argv[3]) + 1)); + strcpy(callback, argv[3]); + } + + /* + * Set or update a callback for a relation; + */ + if (callback) + { + entry = Tcl_CreateHashEntry(&(cd->notify_hash), relname, &new); + if (new) + { + /* New callback, execute a listen command on the relation */ + char *cmd = (char *) ckalloc((unsigned) (strlen(argv[2]) + 8)); + + sprintf(cmd, "LISTEN %s", relname); + result = PQexec(conn, cmd); + ckfree(cmd); + if (!result || (result->resultStatus != PGRES_COMMAND_OK)) + { + /* Error occurred during the execution of command */ + if (result) + PQclear(result); + ckfree(callback); + Tcl_DeleteHashEntry(entry); + Tcl_SetResult(interp, conn->errorMessage, TCL_STATIC); + return TCL_ERROR; + } + PQclear(result); + } + else + { + /* Free the old callback string */ + ckfree((char *) Tcl_GetHashValue(entry)); + } + /* Store the new callback command */ + Tcl_SetHashValue(entry, callback); + } + + /* + * Remove a callback for a relation. There is no way to un-listen a + * relation, simply remove the callback from the notify hash table. + */ + if (callback == NULL) + { + entry = Tcl_FindHashEntry(&(cd->notify_hash), relname); + if (entry == NULL) + { + Tcl_AppendResult(interp, "not listening on ", relname, 0); + return TCL_ERROR; + } + ckfree((char *) Tcl_GetHashValue(entry)); + Tcl_DeleteHashEntry(entry); + } + + return TCL_OK; } int -Pg_notifies(ClientData cData, Tcl_Interp *interp, int argc, char* argv[]) +Pg_notifies(ClientData cData, Tcl_Interp * interp, int argc, char *argv[]) { - Pg_clientData *cd = (Pg_clientData *)cData; - int count; - char buff[12]; - char *callback; - Tcl_HashEntry *entry; - PGconn *conn; - PGresult *result; - PGnotify *notify; - - if (argc != 2) { - Tcl_AppendResult(interp, "wrong # args, should be \"", - argv[0], " connection\"", 0); - return TCL_ERROR; - } - - /* - * Get the connection argument. - */ - conn = (PGconn*)PgGetConnectionId(cd, argv[1]); - if (conn == (PGconn *)NULL) { - Tcl_AppendResult(interp, "First argument is not a valid connection\n", 0); - return TCL_ERROR; - } - - /* Execute an empty command to retrieve asynchronous notifications */ - result = PQexec(conn, " "); - if (result == NULL) { - /* Error occurred during the execution of command */ - Tcl_SetResult(interp, conn->errorMessage, TCL_STATIC); - return TCL_ERROR; - } - PQclear(result); - - /* - * Loop while there are pending notifies. - */ - for (count=0; count < 999; count++) { - /* See if there is a pending notification */ - notify = PQnotifies(conn); - if (notify == NULL) { - break; - } - entry = Tcl_FindHashEntry(&(cd->notify_hash), notify->relname); - if (entry != NULL) { - callback = Tcl_GetHashValue(entry); - if (callback) { - Tcl_Eval(interp, callback); - } - } - free(notify); - } - - /* - * Return the number of notifications processed. - */ - sprintf(buff, "%d", count); - Tcl_SetResult(interp, buff, TCL_VOLATILE); - return TCL_OK; + Pg_clientData *cd = (Pg_clientData *) cData; + int count; + char buff[12]; + char *callback; + Tcl_HashEntry *entry; + PGconn *conn; + PGresult *result; + PGnotify *notify; + + if (argc != 2) + { + Tcl_AppendResult(interp, "wrong # args, should be \"", + argv[0], " connection\"", 0); + return TCL_ERROR; + } + + /* + * Get the connection argument. + */ + conn = (PGconn *) PgGetConnectionId(cd, argv[1]); + if (conn == (PGconn *) NULL) + { + Tcl_AppendResult(interp, "First argument is not a valid connection\n", 0); + return TCL_ERROR; + } + + /* Execute an empty command to retrieve asynchronous notifications */ + result = PQexec(conn, " "); + if (result == NULL) + { + /* Error occurred during the execution of command */ + Tcl_SetResult(interp, conn->errorMessage, TCL_STATIC); + return TCL_ERROR; + } + PQclear(result); + + /* + * Loop while there are pending notifies. + */ + for (count = 0; count < 999; count++) + { + /* See if there is a pending notification */ + notify = PQnotifies(conn); + if (notify == NULL) + { + break; + } + entry = Tcl_FindHashEntry(&(cd->notify_hash), notify->relname); + if (entry != NULL) + { + callback = Tcl_GetHashValue(entry); + if (callback) + { + Tcl_Eval(interp, callback); + } + } + free(notify); + } + + /* + * Return the number of notifications processed. + */ + sprintf(buff, "%d", count); + Tcl_SetResult(interp, buff, TCL_VOLATILE); + return TCL_OK; } |