sixd Mon, 05 Oct 2009 22:51:21 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=289233
Log:
Fix diff when full connection string used. Clean up helper files
Changed paths:
U php/php-src/branches/PHP_5_3/ext/oci8/tests/drop_table.inc
U php/php-src/branches/PHP_5_3/ext/oci8/tests/drop_type.inc
U php/php-src/branches/PHP_5_3/ext/oci8/tests/extauth_01.phpt
U php/php-src/branches/PHP_5_3/ext/oci8/tests/extauth_02.phpt
U php/php-src/branches/PHP_5_3/ext/oci8/tests/extauth_03.phpt
U php/php-src/trunk/ext/oci8/tests/drop_table.inc
U php/php-src/trunk/ext/oci8/tests/drop_type.inc
U php/php-src/trunk/ext/oci8/tests/extauth_01.phpt
U php/php-src/trunk/ext/oci8/tests/extauth_02.phpt
U php/php-src/trunk/ext/oci8/tests/extauth_03.phpt
Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/drop_table.inc
===================================================================
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/drop_table.inc 2009-10-05 19:59:25 UTC (rev 289232)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/drop_table.inc 2009-10-05 22:51:21 UTC (rev 289233)
@@ -1,12 +1,7 @@
<?php
-
- if ($c) {
- $ora_sql = "DROP TABLE
- ".$schema.$table_name."
- ";
-
- $statement = OCIParse($c,$ora_sql);
- OCIExecute($statement);
- }
-
+if ($c) {
+ $ora_sql = "DROP TABLE ".$schema.$table_name;
+ $statement = oci_parse($c,$ora_sql);
+ oci_execute($statement);
+}
?>
Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/drop_type.inc
===================================================================
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/drop_type.inc 2009-10-05 19:59:25 UTC (rev 289232)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/drop_type.inc 2009-10-05 22:51:21 UTC (rev 289233)
@@ -1,12 +1,7 @@
<?php
-
- if ($c) {
- $ora_sql = "DROP TYPE
- ".$type_name."
- ";
-
- $statement = OCIParse($c,$ora_sql);
- OCIExecute($statement);
- }
-
+if ($c) {
+ $ora_sql = "DROP TYPE ".$type_name;
+ $statement = oci_parse($c,$ora_sql);
+ oci_execute($statement);
+}
?>
Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/extauth_01.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/extauth_01.phpt 2009-10-05 19:59:25 UTC (rev 289232)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/extauth_01.phpt 2009-10-05 22:51:21 UTC (rev 289233)
@@ -139,12 +139,12 @@
bool(false)
Test 7
-Warning: oci_connect(): ORA-12154: TNS:could not resolve the connect identifier specified in %s on line %d
+Warning: oci_connect(): ORA-12154: %s in %s on line %d
array(4) {
[%u|b%"code"]=>
int(12154)
[%u|b%"message"]=>
- %unicode|string%(65) "ORA-12154: %s"
+ %unicode|string%(%d) "ORA-12154: %s"
[%u|b%"offset"]=>
int(0)
[%u|b%"sqltext"]=>
@@ -153,12 +153,12 @@
bool(false)
Test 8
-Warning: oci_connect(): ORA-12154: TNS:could not resolve the connect identifier specified in %s on line %d
+Warning: oci_connect(): ORA-12154: %s in %s on line %d
array(4) {
[%u|b%"code"]=>
int(12154)
[%u|b%"message"]=>
- %unicode|string%(65) "ORA-12154: %s"
+ %unicode|string%(%d) "ORA-12154: %s"
[%u|b%"offset"]=>
int(0)
[%u|b%"sqltext"]=>
Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/extauth_02.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/extauth_02.phpt 2009-10-05 19:59:25 UTC (rev 289232)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/extauth_02.phpt 2009-10-05 22:51:21 UTC (rev 289233)
@@ -139,12 +139,12 @@
bool(false)
Test 7
-Warning: oci_new_connect(): ORA-12154: TNS:could not resolve the connect identifier specified in %s on line %d
+Warning: oci_new_connect(): ORA-12154: %s in %s on line %d
array(4) {
[%u|b%"code"]=>
int(12154)
[%u|b%"message"]=>
- %unicode|string%(65) "ORA-12154: %s"
+ %unicode|string%(%d) "ORA-12154: %s"
[%u|b%"offset"]=>
int(0)
[%u|b%"sqltext"]=>
@@ -153,12 +153,12 @@
bool(false)
Test 8
-Warning: oci_new_connect(): ORA-12154: TNS:could not resolve the connect identifier specified in %s on line %d
+Warning: oci_new_connect(): ORA-12154: %s in %s on line %d
array(4) {
[%u|b%"code"]=>
int(12154)
[%u|b%"message"]=>
- %unicode|string%(65) "ORA-12154: %s"
+ %unicode|string%(%d) "ORA-12154: %s"
[%u|b%"offset"]=>
int(0)
[%u|b%"sqltext"]=>
Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/extauth_03.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/extauth_03.phpt 2009-10-05 19:59:25 UTC (rev 289232)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/extauth_03.phpt 2009-10-05 22:51:21 UTC (rev 289233)
@@ -139,12 +139,12 @@
bool(false)
Test 7
-Warning: oci_pconnect(): ORA-12154: TNS:could not resolve the connect identifier specified in %s on line %d
+Warning: oci_pconnect(): ORA-12154: %s in %s on line %d
array(4) {
[%u|b%"code"]=>
int(12154)
[%u|b%"message"]=>
- %unicode|string%(65) "ORA-12154: %s"
+ %unicode|string%(%d) "ORA-12154: %s"
[%u|b%"offset"]=>
int(0)
[%u|b%"sqltext"]=>
@@ -153,12 +153,12 @@
bool(false)
Test 8
-Warning: oci_pconnect(): ORA-12154: TNS:could not resolve the connect identifier specified in %s on line %d
+Warning: oci_pconnect(): ORA-12154: %s in %s on line %d
array(4) {
[%u|b%"code"]=>
int(12154)
[%u|b%"message"]=>
- %unicode|string%(65) "ORA-12154: %s"
+ %unicode|string%(%d) "ORA-12154: %s"
[%u|b%"offset"]=>
int(0)
[%u|b%"sqltext"]=>
Modified: php/php-src/trunk/ext/oci8/tests/drop_table.inc
===================================================================
--- php/php-src/trunk/ext/oci8/tests/drop_table.inc 2009-10-05 19:59:25 UTC (rev 289232)
+++ php/php-src/trunk/ext/oci8/tests/drop_table.inc 2009-10-05 22:51:21 UTC (rev 289233)
@@ -1,12 +1,7 @@
<?php
-
- if ($c) {
- $ora_sql = "DROP TABLE
- ".$schema.$table_name."
- ";
-
- $statement = OCIParse($c,$ora_sql);
- OCIExecute($statement);
- }
-
+if ($c) {
+ $ora_sql = "DROP TABLE ".$schema.$table_name;
+ $statement = oci_parse($c,$ora_sql);
+ oci_execute($statement);
+}
?>
Modified: php/php-src/trunk/ext/oci8/tests/drop_type.inc
===================================================================
--- php/php-src/trunk/ext/oci8/tests/drop_type.inc 2009-10-05 19:59:25 UTC (rev 289232)
+++ php/php-src/trunk/ext/oci8/tests/drop_type.inc 2009-10-05 22:51:21 UTC (rev 289233)
@@ -1,12 +1,7 @@
<?php
-
- if ($c) {
- $ora_sql = "DROP TYPE
- ".$type_name."
- ";
-
- $statement = OCIParse($c,$ora_sql);
- OCIExecute($statement);
+if ($c) {
+ $ora_sql = "DROP TYPE ".$type_name;
+ $statement = oci_parse($c,$ora_sql);
+ oci_execute($statement);
}
-
?>
Modified: php/php-src/trunk/ext/oci8/tests/extauth_01.phpt
===================================================================
--- php/php-src/trunk/ext/oci8/tests/extauth_01.phpt 2009-10-05 19:59:25 UTC (rev 289232)
+++ php/php-src/trunk/ext/oci8/tests/extauth_01.phpt 2009-10-05 22:51:21 UTC (rev 289233)
@@ -139,12 +139,12 @@
bool(false)
Test 7
-Warning: oci_connect(): ORA-12154: TNS:could not resolve the connect identifier specified in %s on line %d
+Warning: oci_connect(): ORA-12154: %s in %s on line %d
array(4) {
[%u|b%"code"]=>
int(12154)
[%u|b%"message"]=>
- %unicode|string%(65) "ORA-12154: %s"
+ %unicode|string%(%d) "ORA-12154: %s"
[%u|b%"offset"]=>
int(0)
[%u|b%"sqltext"]=>
@@ -153,12 +153,12 @@
bool(false)
Test 8
-Warning: oci_connect(): ORA-12154: TNS:could not resolve the connect identifier specified in %s on line %d
+Warning: oci_connect(): ORA-12154: %s in %s on line %d
array(4) {
[%u|b%"code"]=>
int(12154)
[%u|b%"message"]=>
- %unicode|string%(65) "ORA-12154: %s"
+ %unicode|string%(%d) "ORA-12154: %s"
[%u|b%"offset"]=>
int(0)
[%u|b%"sqltext"]=>
Modified: php/php-src/trunk/ext/oci8/tests/extauth_02.phpt
===================================================================
--- php/php-src/trunk/ext/oci8/tests/extauth_02.phpt 2009-10-05 19:59:25 UTC (rev 289232)
+++ php/php-src/trunk/ext/oci8/tests/extauth_02.phpt 2009-10-05 22:51:21 UTC (rev 289233)
@@ -139,12 +139,12 @@
bool(false)
Test 7
-Warning: oci_new_connect(): ORA-12154: TNS:could not resolve the connect identifier specified in %s on line %d
+Warning: oci_new_connect(): ORA-12154: %s in %s on line %d
array(4) {
[%u|b%"code"]=>
int(12154)
[%u|b%"message"]=>
- %unicode|string%(65) "ORA-12154: %s"
+ %unicode|string%(%d) "ORA-12154: %s"
[%u|b%"offset"]=>
int(0)
[%u|b%"sqltext"]=>
@@ -153,12 +153,12 @@
bool(false)
Test 8
-Warning: oci_new_connect(): ORA-12154: TNS:could not resolve the connect identifier specified in %s on line %d
+Warning: oci_new_connect(): ORA-12154: %s in %s on line %d
array(4) {
[%u|b%"code"]=>
int(12154)
[%u|b%"message"]=>
- %unicode|string%(65) "ORA-12154: %s"
+ %unicode|string%(%d) "ORA-12154: %s"
[%u|b%"offset"]=>
int(0)
[%u|b%"sqltext"]=>
Modified: php/php-src/trunk/ext/oci8/tests/extauth_03.phpt
===================================================================
--- php/php-src/trunk/ext/oci8/tests/extauth_03.phpt 2009-10-05 19:59:25 UTC (rev 289232)
+++ php/php-src/trunk/ext/oci8/tests/extauth_03.phpt 2009-10-05 22:51:21 UTC (rev 289233)
@@ -139,12 +139,12 @@
bool(false)
Test 7
-Warning: oci_pconnect(): ORA-12154: TNS:could not resolve the connect identifier specified in %s on line %d
+Warning: oci_pconnect(): ORA-12154: %s in %s on line %d
array(4) {
[%u|b%"code"]=>
int(12154)
[%u|b%"message"]=>
- %unicode|string%(65) "ORA-12154: %s"
+ %unicode|string%(%d) "ORA-12154: %s"
[%u|b%"offset"]=>
int(0)
[%u|b%"sqltext"]=>
@@ -153,12 +153,12 @@
bool(false)
Test 8
-Warning: oci_pconnect(): ORA-12154: TNS:could not resolve the connect identifier specified in %s on line %d
+Warning: oci_pconnect(): ORA-12154: %s in %s on line %d
array(4) {
[%u|b%"code"]=>
int(12154)
[%u|b%"message"]=>
- %unicode|string%(65) "ORA-12154: %s"
+ %unicode|string%(%d) "ORA-12154: %s"
[%u|b%"offset"]=>
int(0)
[%u|b%"sqltext"]=>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
