cvs: php-src /ext/oci8 oci8_interface.c /ext/oci8/tests statement_type.phpt

tony2001 Wed Dec 6 16:42:27 2006 UTC Modified files: /php-src/ext/oci8 oci8_interface.c /php-src/ext/oci8/tests statement_type.phpt Log: add Unicode support to oci_statement_type() http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_interface.c?r1=1.21&r2=1.22&diff_format=u Index: php-src/ext/oci8/oci8_interface.c diff -u php-src/ext/oci8/oci8_interface.c:1.21 php-src/ext/oci8/oci8_interface.c:1.22 --- php-src/ext/oci8/oci8_interface.c:1.21 Wed Dec 6 16:36:27 2006 +++ php-src/ext/oci8/oci8_interface.c Wed Dec 6 16:42:27 2006 @@ -25,7 +25,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oci8_interface.c,v 1.21 2006/12/06 16:36:27 tony2001 Exp $ */ +/* $Id: oci8_interface.c,v 1.22 2006/12/06 16:42:27 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1837,7 +1837,7 @@ } /* }}} */ -/* {{{ 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 @@ 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); } } /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/statement_type.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/oci8/tests/statement_type.phpt diff -u php-src/ext/oci8/tests/statement_type.phpt:1.3 php-src/ext/oci8/tests/statement_type.phpt:1.4 --- php-src/ext/oci8/tests/statement_type.phpt:1.3 Tue Dec 6 19:26:57 2005 +++ php-src/ext/oci8/tests/statement_type.phpt Wed Dec 6 16:42:27 2006 @@ -44,3 +44,14 @@ 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