summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xext/pdo_odbc/pdo_odbc.c10
-rwxr-xr-xext/pdo_odbc/tests/prepare.inc7
2 files changed, 15 insertions, 2 deletions
diff --git a/ext/pdo_odbc/pdo_odbc.c b/ext/pdo_odbc/pdo_odbc.c
index 1965da9fde..5a7709e7c8 100755
--- a/ext/pdo_odbc/pdo_odbc.c
+++ b/ext/pdo_odbc/pdo_odbc.c
@@ -36,9 +36,17 @@ function_entry pdo_odbc_functions[] = {
};
/* }}} */
+/* {{{ pdo_odbc_deps[] */
+static zend_module_dep pdo_odbc_deps[] = {
+ ZEND_MOD_REQUIRED("pdo")
+ {NULL, NULL, NULL}
+};
+/* }}} */
+
/* {{{ pdo_odbc_module_entry */
zend_module_entry pdo_odbc_module_entry = {
- STANDARD_MODULE_HEADER,
+ STANDARD_MODULE_HEADER_EX, NULL,
+ pdo_odbc_deps,
"PDO_ODBC",
pdo_odbc_functions,
PHP_MINIT(pdo_odbc),
diff --git a/ext/pdo_odbc/tests/prepare.inc b/ext/pdo_odbc/tests/prepare.inc
index 22a6fc720f..c5c12a97b7 100755
--- a/ext/pdo_odbc/tests/prepare.inc
+++ b/ext/pdo_odbc/tests/prepare.inc
@@ -7,7 +7,12 @@ $SQL = array(
);
//$DB = new pdo($CONNECTION, $USER, $PASSWD);
-$DB = new pdo($CONNECTION);
+try {
+ $DB = new pdo($CONNECTION);
+} catch (Exception $tmp) {
+ $DB = NULL;
+ return;
+}
foreach(array('test','classtypes') as $name)
{