[patch] Fix/improve the FreeTDS-driver

patch-dbd-freetds (text/plain), 15.03 KB, created by Mikhail T. on 2012-08-09 21:16:52 UTC

(hide)

Description: Fix/improve the FreeTDS-driver

Filename:

MIME Type:

Creator: Mikhail T.

Created: 2012-08-09 21:16:52 UTC

Size: 15.03 KB

patch

obsolete

>--- dbd/apr_dbd_freetds.c 2009-02-13 01:04:00.000000000 -0500 >+++ dbd/apr_dbd_freetds.c 2012-08-09 15:04:36.000000000 -0400 >@@ -41,4 +41,5 @@ > #endif > #ifdef HAVE_SYBDB_H >+#include <sybfront.h> > #include <sybdb.h> > #endif >@@ -46,5 +47,4 @@ > #include <stdio.h> > #include <sys/types.h> >-#include <regex.h> > > /* This probably needs to change for different applications */ >@@ -68,4 +68,5 @@ > apr_pool_t *pool; > const char *params; >+ const char *lasterror; > RETCODE err; > }; >@@ -79,20 +80,15 @@ > }; > >-struct apr_dbd_row_t { >- apr_dbd_results_t *res; >- BYTE buf[MAX_COL_LEN]; >-}; >- > struct apr_dbd_prepared_t { > int nargs; >- regex_t **taint; >- int *sz; >- char *fmt; >+ int fmtlen; >+ const char *fmt, *label; >+ apr_dbd_type_e *types; >+ int offsets[]; > }; > >-#define dbd_freetds_is_success(x) (x == SUCCEED) >+const apr_dbd_driver_t apr_dbd_freetds_driver; /* Forward declaration */ > >-static int labelnum = 0; /* FIXME */ >-static regex_t dbd_freetds_find_arg; >+#define dbd_freetds_is_success(x) (x == SUCCEED) > > /* execute a query that doesn't return a result set, mop up, >@@ -103,5 +99,9 @@ > { > /* TBD */ >- RETCODE rv = dbcmd(proc, query); >+ RETCODE rv = dbcmd(proc, >+#ifndef TDS_STATIC_CAST /* if not compiling against FreeTDS, drop const :-( */ >+ (char *) >+#endif >+ query); > if (rv != SUCCEED) { > return rv; >@@ -144,4 +144,5 @@ > */ > >+ sql->lasterror = NULL; > sql->err = freetds_exec(sql->proc, query, 1, NULL); > if (!dbd_freetds_is_success(sql->err)) { >@@ -191,49 +192,36 @@ > return (sql->err == SUCCEED) ? 0 : 1; > } >-static const char *dbd_untaint(apr_pool_t *pool, regex_t *rx, const char *val) >-{ >- regmatch_t match[1]; >- if (rx == NULL) { >- /* no untaint expression */ >- return val; >- } >- if (regexec(rx, val, 1, match, 0) == 0) { >- return apr_pstrndup(pool, val+match[0].rm_so, >- match[0].rm_eo - match[0].rm_so); >- } >- return ""; >-} >+ > static const char *dbd_statement(apr_pool_t *pool, >- apr_dbd_prepared_t *stmt, >- int nargs, const char **args) >+ const apr_dbd_prepared_t *stmt, >+ const char **args) > { > int i; > int len; >- const char *var; > char *ret; >- const char *p_in; >+ const char *p_in, *format; > char *p_out; >- char *q; > >- /* compute upper bound on length (since untaint shrinks) */ >- len = strlen(stmt->fmt) +1; >- for (i=0; i<nargs; ++i) { >- len += strlen(args[i]) - 2; >+ len = stmt->fmtlen; >+ for (i=0; i < stmt->nargs; ++i) { >+ len += strlen(args[i]); >+ switch (stmt->types[i]) { >+ case APR_DBD_TYPE_STRING: len += 2; break; /* For the quotes */ >+ default: break;/* Other types are all taken verbatim at the moment */ >+ } > } >- i = 0; > p_in = stmt->fmt; > p_out = ret = apr_palloc(pool, len); >- /* FIXME silly bug - this'll catch %%s */ >- while (q = strstr(p_in, "%s"), q != NULL) { >- len = q-p_in; >- strncpy(p_out, p_in, len); >+ for (i = 0; i < stmt->nargs; i++) { >+ len = stmt->offsets[i]; >+ switch (stmt->types[i]) { >+ case APR_DBD_TYPE_STRING: >+ format = "%.*s'%s'"; >+ break; >+ default: >+ format = "%.*s%s"; >+ } >+ p_out += sprintf(p_out, format, len, p_in, args[i]); > p_in += len; >- p_out += len; >- var = dbd_untaint(pool, stmt->taint[i], args[i]); >- len = strlen(var); >- strncpy(p_out, var, len); >- p_in += 2; >- p_out += len; >- ++i; > } > strcpy(p_out, p_in); >@@ -245,6 +234,5 @@ > int seek, const char **values) > { >- const char *query = dbd_statement(pool, statement, >- statement->nargs, values); >+ const char *query = dbd_statement(pool, statement, values); > return dbd_freetds_select(pool, sql, results, query, seek); > } >@@ -274,6 +262,5 @@ > const char **values) > { >- const char *query = dbd_statement(pool, statement, >- statement->nargs, values); >+ const char *query = dbd_statement(pool, statement, values); > return dbd_freetds_query(sql, nrows, query); > } >@@ -300,12 +287,8 @@ > { > RETCODE rv = 0; >- apr_dbd_row_t *row = *rowp; > int sequential = ((rownum >= 0) && res->random) ? 0 : 1; >+ apr_dbd_t *sql = (void *)dbgetuserdata(res->proc); > >- if (row == NULL) { >- row = apr_palloc(pool, sizeof(apr_dbd_row_t)); >- *rowp = row; >- row->res = res; >- } >+ *rowp = (void *)res; > /* > else { >@@ -322,4 +305,5 @@ > } > else { >+ /* XXX dbgetrow() only works if DBBUFFER-option is set */ > rv = (rownum >= 0) ? dbgetrow(res->proc, rownum) : NO_MORE_ROWS; > } >@@ -328,10 +312,28 @@ > case REG_ROW: return 0; > case NO_MORE_ROWS: >- apr_pool_cleanup_run(pool, res->proc, clear_result); >+ if (dbisopt(res->proc, DBBUFFER, NULL) || sequential) { >+ sql->lasterror = apr_pstrcat(res->pool, >+ "NO_MORE_ROWS (count: ", apr_itoa(res->pool, DBCOUNT(res->proc)), >+ ", first: ", apr_itoa(res->pool, DBFIRSTROW(res->proc)), >+ ", current: ", apr_itoa(res->pool, DBCURROW(res->proc)), >+ ", last: ", apr_itoa(res->pool, DBLASTROW(res->proc)), >+ ")", NULL);; >+ } else { >+ sql->lasterror = "NO_MORE_ROWS (DBBUFFER option must be on " >+ "for dbgetrow() to work)"; >+ } >+ apr_pool_cleanup_run(res->pool, res->proc, clear_result); > *rowp = NULL; > return -1; >- case FAIL: return 1; >- case BUF_FULL: return 2; /* FIXME */ >- default: return 3; >+ case FAIL: >+ sql->lasterror = "FAIL"; >+ return 1; >+ case BUF_FULL: >+ sql->lasterror = "BUF_FULL"; >+ return 2; /* FIXME */ >+ default: >+ sql->lasterror = apr_pstrcat(res->pool, >+ "Unexpected error number ", apr_itoa(res->pool, rv), NULL); >+ return 3; > } > >@@ -345,11 +347,15 @@ > return (const char*)row->res->vars[n].data; > */ >- DBPROCESS* proc = row->res->proc; >+ apr_dbd_results_t *res = (apr_dbd_results_t *)row; >+ DBPROCESS* proc = res->proc; > BYTE *ptr = dbdata(proc, n+1); > int t = dbcoltype(proc, n+1); >- int l = dbcollen(proc, n+1); >+ int l = dbdatlen(proc, n+1); > if (dbwillconvert(t, SYBCHAR)) { >- dbconvert(proc, t, ptr, l, SYBCHAR, (BYTE *)row->buf, -1); >- return (const char*)row->buf; >+ char *buf; >+ int blen = (t == SYBCHAR ? l + 1 : MAX_COL_LEN); >+ buf = apr_palloc(res->pool, blen); >+ l = dbconvert(proc, t, ptr, l, SYBCHAR, buf, -1); >+ return buf; > } > return (char*)ptr; >@@ -358,5 +364,9 @@ > static const char *dbd_freetds_error(apr_dbd_t *sql, int n) > { >- /* XXX this doesn't seem to exist in the API ??? */ >+ const char *err = sql->lasterror; >+ >+ sql->lasterror = NULL; /* Reset, so we stop appending */ >+ if (err) >+ return err; > return apr_psprintf(sql->pool, "Error %d", sql->err); > } >@@ -368,4 +378,5 @@ > } > *nrows = 0; >+ sql->lasterror = NULL; > sql->err = freetds_exec(sql->proc, query, 0, nrows); > >@@ -385,65 +396,4 @@ > } > >-static apr_status_t freetds_regfree(void *rx) >-{ >- regfree((regex_t*)rx); >- return APR_SUCCESS; >-} >-static int recurse_args(apr_pool_t *pool, int n, const char *query, >- apr_dbd_prepared_t *stmt, int offs) >-{ >- >- /* we only support %s arguments for now */ >- int ret; >- char arg[256]; >- regmatch_t matches[3]; >- if (regexec(&dbd_freetds_find_arg, query, 3, matches, 0) != 0) { >- /* No more args */ >- stmt->nargs = n; >- stmt->taint = apr_palloc(pool, n*sizeof(regex_t*)); >- stmt->sz = apr_palloc(pool, n*sizeof(int)); >- ret = 0; >- } >- else { >- int i; >- int sz = 0; >- int len = matches[1].rm_eo - matches[1].rm_so - 2; >- if (len > 255) { >- return 9999; >- } >- >- ret = recurse_args(pool, n+1, query+matches[0].rm_eo, >- stmt, offs+matches[0].rm_eo); >- >- memmove(stmt->fmt + offs + matches[1].rm_so, >- stmt->fmt + offs + matches[0].rm_eo-1, >- strlen(stmt->fmt+offs+matches[0].rm_eo)+2); >- >- /* compile untaint to a regex if found */ >- if (matches[1].rm_so == -1) { >- stmt->taint[n] = NULL; >- } >- else { >- strncpy(arg, query+matches[1].rm_so+1, >- matches[1].rm_eo - matches[1].rm_so - 2); >- arg[matches[1].rm_eo - matches[1].rm_so - 2] = '\0'; >- stmt->taint[n] = apr_palloc(pool, sizeof(regex_t)); >- if (regcomp(stmt->taint[n], arg, REG_ICASE|REG_EXTENDED) != 0) { >- ++ret; >- } >- else { >- apr_pool_cleanup_register(pool, stmt->taint[n], freetds_regfree, >- apr_pool_cleanup_null); >- } >- } >- >- /* record length if specified */ >- for (i=matches[2].rm_so; i<matches[2].rm_eo; ++i) { >- sz = 10*sz + (query[i]-'\0'); >- } >- } >- return ret; >-} >- > static int dbd_freetds_prepare(apr_pool_t *pool, apr_dbd_t *sql, > const char *query, const char *label, >@@ -451,46 +401,32 @@ > apr_dbd_prepared_t **statement) > { >+ int i; >+ const char *p, *op; > apr_dbd_prepared_t *stmt; > >- if (label == NULL) { >- label = apr_psprintf(pool, "%d", labelnum++); >+ if (!*statement && >+ (*statement = apr_palloc(pool, >+ sizeof(apr_dbd_prepared_t) + nargs*sizeof(int))) == NULL) { >+ return APR_EGENERAL; > } > >- if (!*statement) { >- *statement = apr_palloc(pool, sizeof(apr_dbd_prepared_t)); >- } > stmt = *statement; >+ stmt->nargs = nargs; >+ stmt->fmt = query; >+ stmt->fmtlen = strlen(query) - nargs + 1; >+ stmt->types = types; >+ stmt->label = label; /* XXX Not used anywhere at the moment */ > >-#if 0 >- /* count args */ >- stmt->fmt = apr_pstrdup(pool, query); >- stmt->fmt = recurse_args(pool, 0, query, stmt, stmt->fmt); >- >- /* overestimate by a byte or two to simplify */ >- len = strlen("CREATE PROC apr.") >- + strlen(label) >- + stmt->nargs * strlen(" @arg1 varchar(len1),") >- + strlen(" AS begin ") >- + strlen(stmt->fmt) >- + strlen(" end "); /* extra byte for terminator */ >- >- pquery = apr_pcalloc(pool, len); >- sprintf(pquery, "CREATE PROC apr.%s", label); >- for (i=0; i<stmt->nargs; ++i) { >- sprintf(pquery+strlen(pquery), " @arg%d varchar(%d)", i, stmt->sz[i]); >- if (i < stmt->nargs-1) { >- pquery[strlen(pquery)] = ','; >- } >- } >- strcat(pquery, " AS BEGIN "); >- strcat(pquery, stmt->fmt); >- strcat(pquery, " END"); >- >- return (freetds_exec(sql->proc, pquery, 0, &i) == SUCCEED) ? 0 : 1; >-#else >- stmt->fmt = apr_pstrdup(pool, query); >- return recurse_args(pool, 0, query, stmt, 0); >-#endif >+ /* >+ * Run through the query-template looking for the special character, >+ * which the dbd_prepare inserted into it on our behalf >+ */ >+ for (i = 0, op = query; i < nargs; i++) { >+ p = strchr(op + 1, apr_dbd_freetds_driver.pformat[0]); >+ stmt->offsets[i] = p - op; >+ op = p; >+ } > >+ return APR_SUCCESS; > } > >@@ -542,7 +478,7 @@ > LOGINREC *login; > static const char *delims = " \r\n\t;|,"; >- char *ptr; >- char *key; >- char *value; >+ const char *ptr; >+ const char *key; >+ const char *value; > int vlen; > int klen; >@@ -565,5 +501,5 @@ > for (key = ptr-1; apr_isspace(*key); --key); > klen = 0; >- while (apr_isalpha(*key)) { >+ while (key >= params && apr_isalpha(*key)) { > --key; > ++klen; >@@ -628,8 +564,9 @@ > return NULL; > } >- sql = apr_palloc (pool, sizeof (apr_dbd_t)); >+ sql = apr_pcalloc(pool, sizeof (apr_dbd_t)); > sql->pool = pool; > sql->proc = process; > sql->params = params; >+ dbsetuserdata(process, (BYTE *)sql); > return sql; > } >@@ -687,10 +624,64 @@ > { > dbexit(); >- regfree(&dbd_freetds_find_arg); > return APR_SUCCESS; > } >+ >+static int freetds_msg_handler(DBPROCESS *dbproc, DBINT msgno, int msgstate, >+ int severity, char *msgtext, char *srvname, >+ char *procname, int line) >+{ >+ char *value; >+ apr_dbd_t *sql; >+ >+ if (dbproc == NULL || (sql = (void *)dbgetuserdata(dbproc)) == NULL) { >+ fprintf(stderr, "%s: %s\n", srvname, msgtext); >+ return 0; >+ } >+ >+ value = apr_psprintf(sql->pool, "%s: %s", srvname, msgtext); >+ if (procname && procname[0]) >+ value = apr_pstrcat(sql->pool, value, " In procedure ", >+ procname, NULL); >+ if (line) >+ value = apr_pstrcat(sql->pool, value, >+ procname && procname[0] ? ", line " : " Line ", >+ apr_itoa(sql->pool, line), NULL); >+ >+ if (sql->lasterror) >+ sql->lasterror = apr_pstrcat(sql->pool, sql->lasterror, "\n", value, NULL); >+ else >+ sql->lasterror = value; >+ >+ return 0; >+} >+ > static int freetds_err_handler(DBPROCESS *dbproc, int severity, int dberr, > int oserr, char *dberrstr, char *oserrstr) > { >+ char *value; >+ apr_dbd_t *sql; >+ >+ if (dbproc == NULL || (sql = (void *)dbgetuserdata(dbproc)) == NULL) { >+ fprintf(stderr, "%s\n", dberrstr); >+ return INT_CANCEL; >+ } >+ /* >+ * Do not append the useless "general error", if details >+ * are already recorded (by the msg_handler). Just return. >+ * XXX: this skipping currently only works with Sybase's OpenClient >+ * XXX: because FreeTDS implementation uses bogus dberr values: >+ * XXX: https://sourceforge.net/tracker/?func=detail&aid=3555777&group_id=33106&atid=407806 >+ */ >+ if (dberr == SYBESMSG && sql->lasterror) >+ return INT_CANCEL; >+ >+ value = apr_psprintf(sql->pool, "%d: %s", dberr, dberrstr); >+ if (oserrstr) { >+ value = apr_pstrcat(sql->pool, ". (", oserrstr, ")", NULL); >+ } >+ if (sql->lasterror) >+ sql->lasterror = apr_pstrcat(sql->pool, sql->lasterror, "\n", value, NULL); >+ else >+ sql->lasterror = value; > return INT_CANCEL; /* never exit */ > } >@@ -697,12 +689,7 @@ > static void dbd_freetds_init(apr_pool_t *pool) > { >- int rv = regcomp(&dbd_freetds_find_arg, >- "%(\\{[^}]*\\})?([0-9]*)[A-Za-z]", REG_EXTENDED); >- if (rv != 0) { >- char errmsg[256]; >- regerror(rv, &dbd_freetds_find_arg, errmsg, 256); >- fprintf(stderr, "regcomp failed: %s\n", errmsg); >- } >- dbinit(); >+ if (dbinit() == FAIL) >+ fprintf(stderr, "dbinit() failed\n"); >+ dbmsghandle(freetds_msg_handler); > dberrhandle(freetds_err_handler); > apr_pool_cleanup_register(pool, NULL, freetds_term, apr_pool_cleanup_null); >@@ -788,12 +779,8 @@ > dbd_freetds_pquery, > dbd_freetds_pselect, >- /* this is only implemented to support httpd/2.2 standard usage, >- * as in the original DBD implementation. Everything else is NOTIMPL. >- */ >-#ifdef COMPILE_STUBS > dbd_freetds_get_name, > dbd_freetds_transaction_mode_get, > dbd_freetds_transaction_mode_set, >- "", >+ "\1", /* Would not occur in a real query... */ > dbd_freetds_pvbquery, > dbd_freetds_pvbselect, >@@ -801,5 +788,4 @@ > dbd_freetds_pbselect, > dbd_freetds_datum_get >-#endif > }; > #endif View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]