sixd Wed, 12 Aug 2009 14:54:16 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=287164
Log: refactor & WS for local test config change Changed paths: U php/php-src/branches/PHP_5_3/ext/oci8/tests/connect.inc U php/php-src/branches/PHP_5_3/ext/oci8/tests/details.inc U php/php-src/trunk/ext/oci8/tests/connect.inc U php/php-src/trunk/ext/oci8/tests/details.inc Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/connect.inc =================================================================== --- php/php-src/branches/PHP_5_3/ext/oci8/tests/connect.inc 2009-08-12 14:45:30 UTC (rev 287163) +++ php/php-src/branches/PHP_5_3/ext/oci8/tests/connect.inc 2009-08-12 14:54:16 UTC (rev 287164) @@ -1,22 +1,18 @@ <?php -if (file_exists("details_local.inc")) { - include("details_local.inc"); // this file is not part of the source distribution; make it your own local variant of details.inc -} else { - include "details.inc"; -} +require("details.inc"); if (!empty($dbase)) { - $c = @oci_connect($user, $password, $dbase); + $c = @oci_connect($user, $password, $dbase); } else { - $c = @oci_connect($user, $password); + $c = @oci_connect($user, $password); } if (!$c) { - echo "connect.inc: Failed to connect as '$user' to '$dbase'\n"; - $e = oci_error(); - echo $e['message']."\n"; + echo "connect.inc: Failed to connect as '$user' to '$dbase'\n"; + $e = oci_error(); + echo $e['message']."\n"; } ?> Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/details.inc =================================================================== --- php/php-src/branches/PHP_5_3/ext/oci8/tests/details.inc 2009-08-12 14:45:30 UTC (rev 287163) +++ php/php-src/branches/PHP_5_3/ext/oci8/tests/details.inc 2009-08-12 14:54:16 UTC (rev 287164) @@ -14,36 +14,40 @@ * string like hostname:port/service_name:POOLED */ -if (false !== getenv('PHP_OCI8_TEST_DB')) { - $user = getenv('PHP_OCI8_TEST_USER'); // Database username for tests - $password = getenv('PHP_OCI8_TEST_PASS'); // Password for $user - $dbase = getenv('PHP_OCI8_TEST_DB'); // Database connection string - $test_drcp = getenv('PHP_OCI8_TEST_DRCP'); - if (false !== $test_drcp && 0 == strcasecmp($test_drcp,'TRUE')) { - $test_drcp = TRUE; - } else { - $test_drcp = FALSE; - } - $oracle_on_localhost = getenv('PHP_OCI8_TEST_DB_ON_LOCALHOST'); - if (false !== $oracle_on_localhost && 0 == strcasecmp($oracle_on_localhost,'TRUE')) { - $oracle_on_localhost = TRUE; - } else { - $oracle_on_localhost = FALSE; - } +if (file_exists(dirname(__FILE__)."/details_local.inc")) { + include(dirname(__FILE__)."/details_local.inc"); // this file is not part of the source distribution; make it your own local variant of details.inc } else { - $user = "system"; - $password = "oracle"; - $dbase = "localhost/XE"; - $oracle_on_localhost = TRUE; - $test_drcp = FALSE; + if (false !== getenv('PHP_OCI8_TEST_DB')) { + $user = getenv('PHP_OCI8_TEST_USER'); // Database username for tests + $password = getenv('PHP_OCI8_TEST_PASS'); // Password for $user + $dbase = getenv('PHP_OCI8_TEST_DB'); // Database connection string + $test_drcp = getenv('PHP_OCI8_TEST_DRCP'); + if (false !== $test_drcp && 0 == strcasecmp($test_drcp,'TRUE')) { + $test_drcp = TRUE; + } else { + $test_drcp = FALSE; + } + $oracle_on_localhost = getenv('PHP_OCI8_TEST_DB_ON_LOCALHOST'); + if (false !== $oracle_on_localhost && 0 == strcasecmp($oracle_on_localhost,'TRUE')) { + $oracle_on_localhost = TRUE; + } else { + $oracle_on_localhost = FALSE; + } + } else { + $user = "system"; + $password = "oracle"; + $dbase = "localhost/XE"; + $oracle_on_localhost = TRUE; + $test_drcp = FALSE; + } + + /* + * Common object names for scripts to use + */ + + $table_name = "tb".substr(str_replace(Array(".", "-"), "_", php_uname("n")), 0, 5); + $type_name = strtoupper("tp".substr(str_replace(Array(".", "-"), "_", php_uname("n")), 0, 5)); + $schema = ''; } -/* - * Common object names for scripts to use - */ - -$table_name = "tb".substr(str_replace(Array(".", "-"), "_", php_uname("n")), 0, 5); -$type_name = strtoupper("tp".substr(str_replace(Array(".", "-"), "_", php_uname("n")), 0, 5)); -$schema = ''; - ?> Modified: php/php-src/trunk/ext/oci8/tests/connect.inc =================================================================== --- php/php-src/trunk/ext/oci8/tests/connect.inc 2009-08-12 14:45:30 UTC (rev 287163) +++ php/php-src/trunk/ext/oci8/tests/connect.inc 2009-08-12 14:54:16 UTC (rev 287164) @@ -1,10 +1,6 @@ <?php -if (file_exists("details_local.inc")) { - include("details_local.inc"); // this file is not part of the source distribution; make it your own local variant of details.inc -} else { - include "details.inc"; -} +require("details.inc"); if (!empty($dbase)) { $c = @oci_connect($user, $password, $dbase); Modified: php/php-src/trunk/ext/oci8/tests/details.inc =================================================================== --- php/php-src/trunk/ext/oci8/tests/details.inc 2009-08-12 14:45:30 UTC (rev 287163) +++ php/php-src/trunk/ext/oci8/tests/details.inc 2009-08-12 14:54:16 UTC (rev 287164) @@ -14,36 +14,40 @@ * string like hostname:port/service_name:POOLED */ -if (false !== getenv('PHP_OCI8_TEST_DB')) { - $user = getenv('PHP_OCI8_TEST_USER'); // Database username for tests - $password = getenv('PHP_OCI8_TEST_PASS'); // Password for $user - $dbase = getenv('PHP_OCI8_TEST_DB'); // Database connection string - $test_drcp = getenv('PHP_OCI8_TEST_DRCP'); - if (false !== $test_drcp && 0 == strcasecmp($test_drcp,'TRUE')) { - $test_drcp = TRUE; - } else { - $test_drcp = FALSE; - } - $oracle_on_localhost = getenv('PHP_OCI8_TEST_DB_ON_LOCALHOST'); - if (false !== $oracle_on_localhost && 0 == strcasecmp($oracle_on_localhost,'TRUE')) { - $oracle_on_localhost = TRUE; - } else { - $oracle_on_localhost = FALSE; - } +if (file_exists(dirname(__FILE__)."/details_local.inc")) { + include(dirname(__FILE__)."/details_local.inc"); // this file is not part of the source distribution; make it your own local variant of details.inc } else { - $user = "system"; - $password = "oracle"; - $dbase = "localhost/XE"; - $oracle_on_localhost = TRUE; - $test_drcp = FALSE; + if (false !== getenv('PHP_OCI8_TEST_DB')) { + $user = getenv('PHP_OCI8_TEST_USER'); // Database username for tests + $password = getenv('PHP_OCI8_TEST_PASS'); // Password for $user + $dbase = getenv('PHP_OCI8_TEST_DB'); // Database connection string + $test_drcp = getenv('PHP_OCI8_TEST_DRCP'); + if (false !== $test_drcp && 0 == strcasecmp($test_drcp,'TRUE')) { + $test_drcp = TRUE; + } else { + $test_drcp = FALSE; + } + $oracle_on_localhost = getenv('PHP_OCI8_TEST_DB_ON_LOCALHOST'); + if (false !== $oracle_on_localhost && 0 == strcasecmp($oracle_on_localhost,'TRUE')) { + $oracle_on_localhost = TRUE; + } else { + $oracle_on_localhost = FALSE; + } + } else { + $user = "system"; + $password = "oracle"; + $dbase = "localhost/XE"; + $oracle_on_localhost = TRUE; + $test_drcp = FALSE; + } + + /* + * Common object names for scripts to use + */ + + $table_name = "tb".substr(str_replace(Array(".", "-"), "_", php_uname("n")), 0, 5); + $type_name = strtoupper("tp".substr(str_replace(Array(".", "-"), "_", php_uname("n")), 0, 5)); + $schema = ''; } -/* - * Common object names for scripts to use - */ - -$table_name = "tb".substr(str_replace(Array(".", "-"), "_", php_uname("n")), 0, 5); -$type_name = strtoupper("tp".substr(str_replace(Array(".", "-"), "_", php_uname("n")), 0, 5)); -$schema = ''; - ?>
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php