add Unicode support to oci_statement_type()

diff --git a/ext/oci8/oci8_interface.c b/ext/oci8/oci8_interface.c
index 621d85c01a25d87e24651d50565236f603079c50..4ae50c6fa7cf7c539b34897daf11d5883c5411ee 100644 (file)
--- a/ext/oci8/oci8_interface.c
+++ b/ext/oci8/oci8_interface.c
@@ -1837,7 +1837,7 @@ PHP_FUNCTION(oci_server_version)
 }
 /* }}} */
 
-/* {{{ proto string oci_statement_type(resource stmt)
+/* {{{ proto string oci_statement_type(resource stmt) U
    Return the query type of an OCI statement */
 PHP_FUNCTION(oci_statement_type)
 {
@@ -1857,34 +1857,34 @@ PHP_FUNCTION(oci_statement_type)
 
        switch (type) {
                case OCI_STMT_SELECT:
-                       RETVAL_STRING("SELECT",1);
+                       RETVAL_ASCII_STRING("SELECT", ZSTR_DUPLICATE);
                        break;
                case OCI_STMT_UPDATE:
-                       RETVAL_STRING("UPDATE",1);
+                       RETVAL_ASCII_STRING("UPDATE", ZSTR_DUPLICATE);
                        break;
                case OCI_STMT_DELETE:
-                       RETVAL_STRING("DELETE",1);
+                       RETVAL_ASCII_STRING("DELETE", ZSTR_DUPLICATE);
                        break;
                case OCI_STMT_INSERT:
-                       RETVAL_STRING("INSERT",1);
+                       RETVAL_ASCII_STRING("INSERT", ZSTR_DUPLICATE);
                        break;
                case OCI_STMT_CREATE:
-                       RETVAL_STRING("CREATE",1);
+                       RETVAL_ASCII_STRING("CREATE", ZSTR_DUPLICATE);
                        break;
                case OCI_STMT_DROP:
-                       RETVAL_STRING("DROP",1);
+                       RETVAL_ASCII_STRING("DROP", ZSTR_DUPLICATE);
                        break;
                case OCI_STMT_ALTER:
-                       RETVAL_STRING("ALTER",1);
+                       RETVAL_ASCII_STRING("ALTER", ZSTR_DUPLICATE);
                        break;
                case OCI_STMT_BEGIN:
-                       RETVAL_STRING("BEGIN",1);
+                       RETVAL_ASCII_STRING("BEGIN", ZSTR_DUPLICATE);
                        break;
                case OCI_STMT_DECLARE:
-                       RETVAL_STRING("DECLARE",1);
+                       RETVAL_ASCII_STRING("DECLARE", ZSTR_DUPLICATE);
                        break;
                default:
-                       RETVAL_STRING("UNKNOWN",1);
+                       RETVAL_ASCII_STRING("UNKNOWN", ZSTR_DUPLICATE);
        }
 }
 /* }}} */

diff --git a/ext/oci8/tests/statement_type.phpt b/ext/oci8/tests/statement_type.phpt
index 45221a6c779430638809ca5472bfcb2e26885548..f7ac43efc8dd65b1e8640a7ff25c5dfdf6b22ce1 100644 (file)
--- a/ext/oci8/tests/statement_type.phpt
+++ b/ext/oci8/tests/statement_type.phpt
@@ -44,3 +44,14 @@ string(6) "CREATE"
 string(7) "UNKNOWN"
 string(7) "UNKNOWN"
 Done
+--UEXPECTF--
+resource(%d) of type (oci8 connection)
+unicode(6) "SELECT"
+unicode(6) "DELETE"
+unicode(6) "INSERT"
+unicode(6) "UPDATE"
+unicode(4) "DROP"
+unicode(6) "CREATE"
+unicode(7) "UNKNOWN"
+unicode(7) "UNKNOWN"
+Done