From c86976260973ac95bce52a835fa7ed73d1758f03 Mon Sep 17 00:00:00 2001 From: Cameron Porter Date: Wed, 23 Jan 2019 20:14:00 -0600 Subject: [PATCH 1/3] pdo_oci: Add PDO_OCI_ATTR_ACTION and CLIENT_INFO Add the ability to set the action and client info on the database session for PDO OCI using PDO attributes. --- ext/pdo_oci/oci_driver.c | 32 ++++++++++++++++++++++++++++++++ ext/pdo_oci/php_pdo_oci_int.h | 6 ++++++ 2 files changed, 38 insertions(+) diff --git a/ext/pdo_oci/oci_driver.c b/ext/pdo_oci/oci_driver.c index 4f7018b46b8e1..bb7e6f0d73835 100644 --- a/ext/pdo_oci/oci_driver.c +++ b/ext/pdo_oci/oci_driver.c @@ -452,6 +452,38 @@ static int oci_handle_set_attribute(pdo_dbh_t *dbh, zend_long attr, zval *val) / } else if (attr == PDO_ATTR_PREFETCH) { H->prefetch = pdo_oci_sanitize_prefetch(lval); return 1; + } else if (attr == PDO_OCI_ATTR_ACTION) { +#if (OCI_MAJOR_VERSION >= 10) + zend_string *action = zval_get_string(val); + + H->last_err = OCIAttrSet(H->session, OCI_HTYPE_SESSION, + (dvoid *) ZSTR_VAL(action), (ub4) ZSTR_LEN(action), + OCI_ATTR_ACTION, H->err); + if (H->last_err) { + oci_drv_error("OCIAttrSet: OCI_ATTR_ACTION"); + return 0; + } + return 1; +#else + oci_drv_error("Unsupported attribute type"); + return 0; +#endif + } else if (attr == PDO_OCI_ATTR_CLIENT_INFO) { +#if (OCI_MAJOR_VERSION >= 10) + zend_string *client_info = zval_get_string(val); + + H->last_err = OCIAttrSet(H->session, OCI_HTYPE_SESSION, + (dvoid *) ZSTR_VAL(client_info), (ub4) ZSTR_LEN(client_info), + OCI_ATTR_CLIENT_INFO, H->err); + if (H->last_err) { + oci_drv_error("OCIAttrSet: OCI_ATTR_CLIENT_INFO"); + return 0; + } + return 1; +#else + oci_drv_error("Unsupported attribute type"); + return 0; +#endif } else { return 0; } diff --git a/ext/pdo_oci/php_pdo_oci_int.h b/ext/pdo_oci/php_pdo_oci_int.h index e69b1f8a88c2d..ce47662262c70 100644 --- a/ext/pdo_oci/php_pdo_oci_int.h +++ b/ext/pdo_oci/php_pdo_oci_int.h @@ -98,3 +98,9 @@ extern const struct pdo_stmt_methods oci_stmt_methods; /* Arbitrary assumed row length for prefetch memory limit calcuation */ #define PDO_OCI_PREFETCH_ROWSIZE 1024 + + +enum { + PDO_OCI_ATTR_ACTION = PDO_ATTR_DRIVER_SPECIFIC, + PDO_OCI_ATTR_CLIENT_INFO, +}; \ No newline at end of file From ec29dc7f51bdf454ceb2b05d03a4df2736f965b4 Mon Sep 17 00:00:00 2001 From: Cameron Porter Date: Thu, 24 Jan 2019 12:40:26 -0600 Subject: [PATCH 2/3] pdo_oci: Register new attr constants and add tests --- ext/pdo_oci/pdo_oci.c | 3 + ext/pdo_oci/tests/pdo_oci_attr_action.phpt | 52 ++++++++++++++++ .../tests/pdo_oci_attr_client_info.phpt | 52 ++++++++++++++++ .../tests/pdo_oci_class_constants.phpt | 62 +++++++++++++++++++ 4 files changed, 169 insertions(+) create mode 100644 ext/pdo_oci/tests/pdo_oci_attr_action.phpt create mode 100644 ext/pdo_oci/tests/pdo_oci_attr_client_info.phpt create mode 100644 ext/pdo_oci/tests/pdo_oci_class_constants.phpt diff --git a/ext/pdo_oci/pdo_oci.c b/ext/pdo_oci/pdo_oci.c index 117de1879472a..e11bdfee84bce 100644 --- a/ext/pdo_oci/pdo_oci.c +++ b/ext/pdo_oci/pdo_oci.c @@ -90,6 +90,9 @@ static MUTEX_T pdo_oci_env_mutex; */ PHP_MINIT_FUNCTION(pdo_oci) { + REGISTER_PDO_CLASS_CONST_LONG("OCI_ATTR_ACTION", (zend_long)PDO_OCI_ATTR_ACTION); + REGISTER_PDO_CLASS_CONST_LONG("OCI_ATTR_CLIENT_INFO", (zend_long)PDO_OCI_ATTR_CLIENT_INFO); + php_pdo_register_driver(&pdo_oci_driver); // Defer OCI init to PHP_RINIT_FUNCTION because with php-fpm, diff --git a/ext/pdo_oci/tests/pdo_oci_attr_action.phpt b/ext/pdo_oci/tests/pdo_oci_attr_action.phpt new file mode 100644 index 0000000000000..50b8b74fc28de --- /dev/null +++ b/ext/pdo_oci/tests/pdo_oci_attr_action.phpt @@ -0,0 +1,52 @@ +--TEST-- +PDO_OCI: Attribute: Setting session action +--SKIPIF-- + +--FILE-- +query($query); +$row = $stmt->fetch(); +echo 'ACTION NOT SET: '; +var_dump($row['action']); + +$dbh->setAttribute(PDO::OCI_ATTR_ACTION, "some action"); + +$stmt = $dbh->query($query); +$row = $stmt->fetch(); +echo 'ACTION SET: '; +var_dump($row['action']); + +$dbh->setAttribute(PDO::OCI_ATTR_ACTION, "something else!"); + +$stmt = $dbh->query($query); +$row = $stmt->fetch(); +echo 'ACTION RESET: '; +var_dump($row['action']); + +$dbh->setAttribute(PDO::OCI_ATTR_ACTION, null); + +$stmt = $dbh->query($query); +$row = $stmt->fetch(); +echo 'ACTION NULLED: '; +var_dump($row['action']); + +echo "Done\n"; + +?> +--EXPECT-- +ACTION NOT SET: NULL +ACTION SET: string(11) "some action" +ACTION RESET: string(15) "something else!" +ACTION NULLED: NULL +Done diff --git a/ext/pdo_oci/tests/pdo_oci_attr_client_info.phpt b/ext/pdo_oci/tests/pdo_oci_attr_client_info.phpt new file mode 100644 index 0000000000000..7551365c17fff --- /dev/null +++ b/ext/pdo_oci/tests/pdo_oci_attr_client_info.phpt @@ -0,0 +1,52 @@ +--TEST-- +PDO_OCI: Attribute: Setting session client info +--SKIPIF-- + +--FILE-- +query($query); +$row = $stmt->fetch(); +echo 'CLIENT_INFO NOT SET: '; +var_dump($row['client_info']); + +$dbh->setAttribute(PDO::OCI_ATTR_CLIENT_INFO, "some client info"); + +$stmt = $dbh->query($query); +$row = $stmt->fetch(); +echo 'CLIENT_INFO SET: '; +var_dump($row['client_info']); + +$dbh->setAttribute(PDO::OCI_ATTR_CLIENT_INFO, "something else!"); + +$stmt = $dbh->query($query); +$row = $stmt->fetch(); +echo 'CLIENT_INFO RESET: '; +var_dump($row['client_info']); + +$dbh->setAttribute(PDO::OCI_ATTR_CLIENT_INFO, null); + +$stmt = $dbh->query($query); +$row = $stmt->fetch(); +echo 'CLIENT_INFO NULLED: '; +var_dump($row['client_info']); + +echo "Done\n"; + +?> +--EXPECT-- +CLIENT_INFO NOT SET: NULL +CLIENT_INFO SET: string(16) "some client info" +CLIENT_INFO RESET: string(15) "something else!" +CLIENT_INFO NULLED: NULL +Done diff --git a/ext/pdo_oci/tests/pdo_oci_class_constants.phpt b/ext/pdo_oci/tests/pdo_oci_class_constants.phpt new file mode 100644 index 0000000000000..34ad7aafde00e --- /dev/null +++ b/ext/pdo_oci/tests/pdo_oci_class_constants.phpt @@ -0,0 +1,62 @@ +--TEST-- +PDO OCI specific class constants +--SKIPIF-- + +--FILE-- + true, + 'OCI_ATTR_ACTION' => true, +]; + +$ref = new ReflectionClass('PDO'); +$constants = $ref->getConstants(); +$values = []; + +foreach ($constants as $name => $value) { + if (substr($name, 0, 8) == 'OCI_ATTR') { + if (!isset($values[$value])) { + $values[$value] = [$name]; + } else { + $values[$value][] = $name; + } + + if (isset($expected[$name])) { + unset($expected[$name]); + unset($constants[$name]); + } + + } else { + unset($constants[$name]); + } +} + +if (!empty($constants)) { + printf("[001] Dumping list of unexpected constants\n"); + var_dump($constants); +} + +if (!empty($expected)) { + printf("[002] Dumping list of missing constants\n"); + var_dump($expected); +} + +if (!empty($values)) { + foreach ($values as $value => $constants) { + if (count($constants) > 1) { + printf("[003] Several constants share the same value '%s'\n", $value); + var_dump($constants); + } + } +} + +print "done!"; +--EXPECT-- +done! From 91d2bea79bd5ef644b48ab7fc6cba73c7f612301 Mon Sep 17 00:00:00 2001 From: Cameron Porter Date: Fri, 25 Jan 2019 11:44:10 -0600 Subject: [PATCH 3/3] pdo_oci: Add client identifier and module attrs Add tests for the new attributes, and check the setAttribute return value. --- ext/pdo_oci/oci_driver.c | 113 ++++++++++++------ ext/pdo_oci/pdo_oci.c | 2 + ext/pdo_oci/php_pdo_oci_int.h | 4 +- ext/pdo_oci/tests/pdo_oci_attr_action.phpt | 11 +- .../tests/pdo_oci_attr_client_identifier.phpt | 55 +++++++++ .../tests/pdo_oci_attr_client_info.phpt | 11 +- ext/pdo_oci/tests/pdo_oci_attr_module.phpt | 49 ++++++++ .../tests/pdo_oci_class_constants.phpt | 6 +- 8 files changed, 206 insertions(+), 45 deletions(-) create mode 100644 ext/pdo_oci/tests/pdo_oci_attr_client_identifier.phpt create mode 100644 ext/pdo_oci/tests/pdo_oci_attr_module.phpt diff --git a/ext/pdo_oci/oci_driver.c b/ext/pdo_oci/oci_driver.c index bb7e6f0d73835..20f02f3ab378b 100644 --- a/ext/pdo_oci/oci_driver.c +++ b/ext/pdo_oci/oci_driver.c @@ -435,57 +435,102 @@ static int oci_handle_set_attribute(pdo_dbh_t *dbh, zend_long attr, zval *val) / zend_long lval = zval_get_long(val); pdo_oci_db_handle *H = (pdo_oci_db_handle *)dbh->driver_data; - if (attr == PDO_ATTR_AUTOCOMMIT) { - if (dbh->in_txn) { - /* Assume they want to commit whatever is outstanding */ - H->last_err = OCITransCommit(H->svc, H->err, 0); + switch (attr) { + case PDO_ATTR_AUTOCOMMIT: + { + if (dbh->in_txn) { + /* Assume they want to commit whatever is outstanding */ + H->last_err = OCITransCommit(H->svc, H->err, 0); - if (H->last_err) { - H->last_err = oci_drv_error("OCITransCommit"); - return 0; + if (H->last_err) { + H->last_err = oci_drv_error("OCITransCommit"); + return 0; + } + dbh->in_txn = 0; } - dbh->in_txn = 0; - } - dbh->auto_commit = (unsigned int)lval? 1 : 0; - return 1; - } else if (attr == PDO_ATTR_PREFETCH) { - H->prefetch = pdo_oci_sanitize_prefetch(lval); - return 1; - } else if (attr == PDO_OCI_ATTR_ACTION) { + dbh->auto_commit = (unsigned int)lval? 1 : 0; + return 1; + } + case PDO_ATTR_PREFETCH: + { + H->prefetch = pdo_oci_sanitize_prefetch(lval); + return 1; + } + case PDO_OCI_ATTR_ACTION: + { #if (OCI_MAJOR_VERSION >= 10) - zend_string *action = zval_get_string(val); + zend_string *action = zval_get_string(val); - H->last_err = OCIAttrSet(H->session, OCI_HTYPE_SESSION, + H->last_err = OCIAttrSet(H->session, OCI_HTYPE_SESSION, (dvoid *) ZSTR_VAL(action), (ub4) ZSTR_LEN(action), OCI_ATTR_ACTION, H->err); - if (H->last_err) { - oci_drv_error("OCIAttrSet: OCI_ATTR_ACTION"); - return 0; - } - return 1; + if (H->last_err) { + oci_drv_error("OCIAttrSet: OCI_ATTR_ACTION"); + return 0; + } + return 1; #else - oci_drv_error("Unsupported attribute type"); - return 0; + oci_drv_error("Unsupported attribute type"); + return 0; #endif - } else if (attr == PDO_OCI_ATTR_CLIENT_INFO) { + } + case PDO_OCI_ATTR_CLIENT_INFO: + { #if (OCI_MAJOR_VERSION >= 10) - zend_string *client_info = zval_get_string(val); + zend_string *client_info = zval_get_string(val); - H->last_err = OCIAttrSet(H->session, OCI_HTYPE_SESSION, + H->last_err = OCIAttrSet(H->session, OCI_HTYPE_SESSION, (dvoid *) ZSTR_VAL(client_info), (ub4) ZSTR_LEN(client_info), OCI_ATTR_CLIENT_INFO, H->err); - if (H->last_err) { - oci_drv_error("OCIAttrSet: OCI_ATTR_CLIENT_INFO"); + if (H->last_err) { + oci_drv_error("OCIAttrSet: OCI_ATTR_CLIENT_INFO"); + return 0; + } + return 1; +#else + oci_drv_error("Unsupported attribute type"); return 0; +#endif } - return 1; + case PDO_OCI_ATTR_CLIENT_IDENTIFIER: + { +#if (OCI_MAJOR_VERSION >= 10) + zend_string *identifier = zval_get_string(val); + + H->last_err = OCIAttrSet(H->session, OCI_HTYPE_SESSION, + (dvoid *) ZSTR_VAL(identifier), (ub4) ZSTR_LEN(identifier), + OCI_ATTR_CLIENT_IDENTIFIER, H->err); + if (H->last_err) { + oci_drv_error("OCIAttrSet: OCI_ATTR_CLIENT_IDENTIFIER"); + return 0; + } + return 1; #else - oci_drv_error("Unsupported attribute type"); - return 0; + oci_drv_error("Unsupported attribute type"); + return 0; #endif - } else { - return 0; + } + case PDO_OCI_ATTR_MODULE: + { +#if (OCI_MAJOR_VERSION >= 10) + zend_string *module = zval_get_string(val); + + H->last_err = OCIAttrSet(H->session, OCI_HTYPE_SESSION, + (dvoid *) ZSTR_VAL(module), (ub4) ZSTR_LEN(module), + OCI_ATTR_MODULE, H->err); + if (H->last_err) { + oci_drv_error("OCIAttrSet: OCI_ATTR_MODULE"); + return 0; + } + return 1; +#else + oci_drv_error("Unsupported attribute type"); + return 0; +#endif + } + default: + return 0; } } diff --git a/ext/pdo_oci/pdo_oci.c b/ext/pdo_oci/pdo_oci.c index e11bdfee84bce..e971f5680f482 100644 --- a/ext/pdo_oci/pdo_oci.c +++ b/ext/pdo_oci/pdo_oci.c @@ -92,6 +92,8 @@ PHP_MINIT_FUNCTION(pdo_oci) { REGISTER_PDO_CLASS_CONST_LONG("OCI_ATTR_ACTION", (zend_long)PDO_OCI_ATTR_ACTION); REGISTER_PDO_CLASS_CONST_LONG("OCI_ATTR_CLIENT_INFO", (zend_long)PDO_OCI_ATTR_CLIENT_INFO); + REGISTER_PDO_CLASS_CONST_LONG("OCI_ATTR_CLIENT_IDENTIFIER", (zend_long)PDO_OCI_ATTR_CLIENT_IDENTIFIER); + REGISTER_PDO_CLASS_CONST_LONG("OCI_ATTR_MODULE", (zend_long)PDO_OCI_ATTR_MODULE); php_pdo_register_driver(&pdo_oci_driver); diff --git a/ext/pdo_oci/php_pdo_oci_int.h b/ext/pdo_oci/php_pdo_oci_int.h index ce47662262c70..d64a725de2742 100644 --- a/ext/pdo_oci/php_pdo_oci_int.h +++ b/ext/pdo_oci/php_pdo_oci_int.h @@ -103,4 +103,6 @@ extern const struct pdo_stmt_methods oci_stmt_methods; enum { PDO_OCI_ATTR_ACTION = PDO_ATTR_DRIVER_SPECIFIC, PDO_OCI_ATTR_CLIENT_INFO, -}; \ No newline at end of file + PDO_OCI_ATTR_CLIENT_IDENTIFIER, + PDO_OCI_ATTR_MODULE +}; diff --git a/ext/pdo_oci/tests/pdo_oci_attr_action.phpt b/ext/pdo_oci/tests/pdo_oci_attr_action.phpt index 50b8b74fc28de..b4b9a8c78bff5 100644 --- a/ext/pdo_oci/tests/pdo_oci_attr_action.phpt +++ b/ext/pdo_oci/tests/pdo_oci_attr_action.phpt @@ -11,7 +11,7 @@ PDOTest::skip(); require(dirname(__FILE__) . '/../../pdo/tests/pdo_test.inc'); -$query = 'select action from v$session where sid = (select distinct sid from v$mystat)'; +$query = 'select action from v$session where sid = sys_context(\'USERENV\', \'SID\')'; $dbh = PDOTest::factory(); @@ -20,21 +20,21 @@ $row = $stmt->fetch(); echo 'ACTION NOT SET: '; var_dump($row['action']); -$dbh->setAttribute(PDO::OCI_ATTR_ACTION, "some action"); +var_dump($dbh->setAttribute(PDO::OCI_ATTR_ACTION, "some action")); $stmt = $dbh->query($query); $row = $stmt->fetch(); echo 'ACTION SET: '; var_dump($row['action']); -$dbh->setAttribute(PDO::OCI_ATTR_ACTION, "something else!"); +var_dump($dbh->setAttribute(PDO::OCI_ATTR_ACTION, "something else!")); $stmt = $dbh->query($query); $row = $stmt->fetch(); echo 'ACTION RESET: '; var_dump($row['action']); -$dbh->setAttribute(PDO::OCI_ATTR_ACTION, null); +var_dump($dbh->setAttribute(PDO::OCI_ATTR_ACTION, null)); $stmt = $dbh->query($query); $row = $stmt->fetch(); @@ -46,7 +46,10 @@ echo "Done\n"; ?> --EXPECT-- ACTION NOT SET: NULL +bool(true) ACTION SET: string(11) "some action" +bool(true) ACTION RESET: string(15) "something else!" +bool(true) ACTION NULLED: NULL Done diff --git a/ext/pdo_oci/tests/pdo_oci_attr_client_identifier.phpt b/ext/pdo_oci/tests/pdo_oci_attr_client_identifier.phpt new file mode 100644 index 0000000000000..3d49eb0411b38 --- /dev/null +++ b/ext/pdo_oci/tests/pdo_oci_attr_client_identifier.phpt @@ -0,0 +1,55 @@ +--TEST-- +PDO_OCI: Attribute: Setting session client identifier +--SKIPIF-- + +--FILE-- +query($query); +$row = $stmt->fetch(); +echo 'CLIENT_IDENTIFIER NOT SET: '; +var_dump($row['client_identifier']); + +var_dump($dbh->setAttribute(PDO::OCI_ATTR_CLIENT_IDENTIFIER, "some client identifier")); + +$stmt = $dbh->query($query); +$row = $stmt->fetch(); +echo 'CLIENT_IDENTIFIER SET: '; +var_dump($row['client_identifier']); + +var_dump($dbh->setAttribute(PDO::OCI_ATTR_CLIENT_IDENTIFIER, "something else!")); + +$stmt = $dbh->query($query); +$row = $stmt->fetch(); +echo 'CLIENT_IDENTIFIER RESET: '; +var_dump($row['client_identifier']); + +var_dump($dbh->setAttribute(PDO::OCI_ATTR_CLIENT_IDENTIFIER, null)); + +$stmt = $dbh->query($query); +$row = $stmt->fetch(); +echo 'CLIENT_IDENTIFIER NULLED: '; +var_dump($row['client_identifier']); + +echo "Done\n"; + +?> +--EXPECT-- +CLIENT_IDENTIFIER NOT SET: NULL +bool(true) +CLIENT_IDENTIFIER SET: string(22) "some client identifier" +bool(true) +CLIENT_IDENTIFIER RESET: string(15) "something else!" +bool(true) +CLIENT_IDENTIFIER NULLED: NULL +Done diff --git a/ext/pdo_oci/tests/pdo_oci_attr_client_info.phpt b/ext/pdo_oci/tests/pdo_oci_attr_client_info.phpt index 7551365c17fff..6bf936645f538 100644 --- a/ext/pdo_oci/tests/pdo_oci_attr_client_info.phpt +++ b/ext/pdo_oci/tests/pdo_oci_attr_client_info.phpt @@ -11,7 +11,7 @@ PDOTest::skip(); require(dirname(__FILE__) . '/../../pdo/tests/pdo_test.inc'); -$query = 'select client_info from v$session where sid = (select distinct sid from v$mystat)'; +$query = 'select client_info from v$session where sid = sys_context(\'USERENV\', \'SID\')'; $dbh = PDOTest::factory(); @@ -20,21 +20,21 @@ $row = $stmt->fetch(); echo 'CLIENT_INFO NOT SET: '; var_dump($row['client_info']); -$dbh->setAttribute(PDO::OCI_ATTR_CLIENT_INFO, "some client info"); +var_dump($dbh->setAttribute(PDO::OCI_ATTR_CLIENT_INFO, "some client info")); $stmt = $dbh->query($query); $row = $stmt->fetch(); echo 'CLIENT_INFO SET: '; var_dump($row['client_info']); -$dbh->setAttribute(PDO::OCI_ATTR_CLIENT_INFO, "something else!"); +var_dump($dbh->setAttribute(PDO::OCI_ATTR_CLIENT_INFO, "something else!")); $stmt = $dbh->query($query); $row = $stmt->fetch(); echo 'CLIENT_INFO RESET: '; var_dump($row['client_info']); -$dbh->setAttribute(PDO::OCI_ATTR_CLIENT_INFO, null); +var_dump($dbh->setAttribute(PDO::OCI_ATTR_CLIENT_INFO, null)); $stmt = $dbh->query($query); $row = $stmt->fetch(); @@ -46,7 +46,10 @@ echo "Done\n"; ?> --EXPECT-- CLIENT_INFO NOT SET: NULL +bool(true) CLIENT_INFO SET: string(16) "some client info" +bool(true) CLIENT_INFO RESET: string(15) "something else!" +bool(true) CLIENT_INFO NULLED: NULL Done diff --git a/ext/pdo_oci/tests/pdo_oci_attr_module.phpt b/ext/pdo_oci/tests/pdo_oci_attr_module.phpt new file mode 100644 index 0000000000000..d10304d585f38 --- /dev/null +++ b/ext/pdo_oci/tests/pdo_oci_attr_module.phpt @@ -0,0 +1,49 @@ +--TEST-- +PDO_OCI: Attribute: Setting session module +--SKIPIF-- + +--FILE-- +setAttribute(PDO::OCI_ATTR_MODULE, "some module")); + +$stmt = $dbh->query($query); +$row = $stmt->fetch(); +echo 'MODULE SET: '; +var_dump($row['module']); + +var_dump($dbh->setAttribute(PDO::OCI_ATTR_MODULE, "something else!")); + +$stmt = $dbh->query($query); +$row = $stmt->fetch(); +echo 'MODULE RESET: '; +var_dump($row['module']); + +var_dump($dbh->setAttribute(PDO::OCI_ATTR_MODULE, null)); + +$stmt = $dbh->query($query); +$row = $stmt->fetch(); +echo 'MODULE NULLED: '; +var_dump($row['module']); + +echo "Done\n"; + +?> +--EXPECT-- +bool(true) +MODULE SET: string(11) "some module" +bool(true) +MODULE RESET: string(15) "something else!" +bool(true) +MODULE NULLED: NULL +Done diff --git a/ext/pdo_oci/tests/pdo_oci_class_constants.phpt b/ext/pdo_oci/tests/pdo_oci_class_constants.phpt index 34ad7aafde00e..e910b995fc2f1 100644 --- a/ext/pdo_oci/tests/pdo_oci_class_constants.phpt +++ b/ext/pdo_oci/tests/pdo_oci_class_constants.phpt @@ -12,8 +12,10 @@ PDOTest::skip(); require(dirname(__FILE__) . '/../../pdo/tests/pdo_test.inc'); $expected = [ - 'OCI_ATTR_CLIENT_INFO' => true, - 'OCI_ATTR_ACTION' => true, + 'OCI_ATTR_CLIENT_INFO' => true, + 'OCI_ATTR_ACTION' => true, + 'OCI_ATTR_CLIENT_IDENTIFIER' => true, + 'OCI_ATTR_MODULE' => true, ]; $ref = new ReflectionClass('PDO');