diff options
| author | Christopher Jones <christopher.jones@oracle.com> | 2017-03-02 15:28:01 +1100 |
|---|---|---|
| committer | Christopher Jones <christopher.jones@oracle.com> | 2017-03-02 15:28:01 +1100 |
| commit | e80ea04c79fb1bb38cdd836e0622f7598727e888 (patch) | |
| tree | 3fcb0c0fdb3c0ebdefa62e1456a9733cc92efeaf /ext/pdo_oci/oci_driver.c | |
| parent | dfcb11d7d1c4ec7cc7ef77d8e42190f91cb75f97 (diff) | |
| download | php-git-e80ea04c79fb1bb38cdd836e0622f7598727e888.tar.gz | |
Fixed bug #54379 (PDO_OCI: UTF-8 output gets truncated)
This was a modification of an incomplete PR #2276.
Diffstat (limited to 'ext/pdo_oci/oci_driver.c')
| -rw-r--r-- | ext/pdo_oci/oci_driver.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/ext/pdo_oci/oci_driver.c b/ext/pdo_oci/oci_driver.c index 367f478e12..a86b6d9613 100644 --- a/ext/pdo_oci/oci_driver.c +++ b/ext/pdo_oci/oci_driver.c @@ -699,6 +699,13 @@ static int pdo_oci_handle_factory(pdo_dbh_t *dbh, zval *driver_options) /* {{{ * goto cleanup; } + /* Get max character width */ + H->last_err = OCINlsNumericInfoGet(H->env, H->err, &H->max_char_width, OCI_NLS_CHARSET_MAXBYTESZ); + if (H->last_err) { + oci_drv_error("OCINlsNumericInfoGet: OCI_NLS_CHARSET_MAXBYTESZ"); + goto cleanup; + } + dbh->methods = &oci_methods; dbh->alloc_own_columns = 1; dbh->native_case = PDO_CASE_UPPER; |