summaryrefslogtreecommitdiff
path: root/ext/pdo_oci/oci_driver.c
diff options
context:
space:
mode:
authorChristopher Jones <christopher.jones@oracle.com>2017-03-02 15:33:50 +1100
committerChristopher Jones <christopher.jones@oracle.com>2017-03-02 15:33:50 +1100
commitf997d6f4ca27661e10570c102d4275e1138e7164 (patch)
tree659a5fd02defb66a3325f5a2a2ee6a2a527a54a0 /ext/pdo_oci/oci_driver.c
parent2f099739682d57e7cddd17862292c72fdd355b6b (diff)
parent06e5ec9e32c85fd2be082c1267b4a245e38008a1 (diff)
downloadphp-git-f997d6f4ca27661e10570c102d4275e1138e7164.tar.gz
Merge branch 'PHP-7.1'
Diffstat (limited to 'ext/pdo_oci/oci_driver.c')
-rw-r--r--ext/pdo_oci/oci_driver.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/ext/pdo_oci/oci_driver.c b/ext/pdo_oci/oci_driver.c
index ac52d10b99..60205a8e31 100644
--- a/ext/pdo_oci/oci_driver.c
+++ b/ext/pdo_oci/oci_driver.c
@@ -693,6 +693,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;