diff options
| author | Jeff Trawick <trawick@apache.org> | 2011-03-23 19:19:25 +0000 |
|---|---|---|
| committer | Jeff Trawick <trawick@apache.org> | 2011-03-23 19:19:25 +0000 |
| commit | f2dbab1e3e87c43f3fc5d4722da5859e88a012e0 (patch) | |
| tree | 55b15011a33574f101e04ceb0dcabef5705d328a /dbd | |
| parent | c332f437df3b663b67097920c666894a31e43237 (diff) | |
| download | apr-f2dbab1e3e87c43f3fc5d4722da5859e88a012e0.tar.gz | |
small simplification to the fix in r1065258: just use the Oracle
datatype for the type field
(http://download.oracle.com/docs/cd/B28359_01/appdev.111/b28395/ociaahan.htm#sthref5358)
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1084681 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'dbd')
| -rw-r--r-- | dbd/apr_dbd_oracle.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/dbd/apr_dbd_oracle.c b/dbd/apr_dbd_oracle.c index 832677d90..a851e1f92 100644 --- a/dbd/apr_dbd_oracle.c +++ b/dbd/apr_dbd_oracle.c @@ -178,7 +178,7 @@ struct apr_dbd_prepared_t { define_arg *out; apr_dbd_t *handle; apr_pool_t *pool; - int type; + ub2 type; }; /* AFAICT from the docs, the OCIEnv thingey can be used async @@ -860,7 +860,6 @@ static int dbd_oracle_prepare(apr_pool_t *pool, apr_dbd_t *sql, int ret = 0; int i; apr_dbd_prepared_t *stmt ; - apr_int16_t type; if (*statement == NULL) { *statement = apr_pcalloc(pool, sizeof(apr_dbd_prepared_t)); @@ -896,12 +895,11 @@ static int dbd_oracle_prepare(apr_pool_t *pool, apr_dbd_t *sql, apr_pool_cleanup_null); /* Perl gets statement type here */ - sql->status = OCIAttrGet(stmt->stmt, OCI_HTYPE_STMT, &type, 0, + sql->status = OCIAttrGet(stmt->stmt, OCI_HTYPE_STMT, &stmt->type, 0, OCI_ATTR_STMT_TYPE, sql->err); if (sql->status != OCI_SUCCESS) { return 1; } - stmt->type = type; /* Perl sets PREFETCH_MEMORY here, but the docs say there's a working default */ #if 0 |