From: Marcus Boerger <helly@php.net>
Date: Sun, 3 Nov 2002 15:22:32 +0000 (+0000)
Subject: cdb interface is currently readonly
X-Git-Tag: php-4.3.0RC1~320
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ea7b5d41d3d79f336eb6013c0778a36dc35a5d69;p=php

cdb interface is currently readonly
---

diff --git a/ext/dba/tests/dba_cdb.phpt b/ext/dba/tests/dba_cdb.phpt
index 88873e917e..c1828f550e 100644
--- a/ext/dba/tests/dba_cdb.phpt
+++ b/ext/dba/tests/dba_cdb.phpt
@@ -4,6 +4,7 @@ DBA CDB handler test
 <?php 
 	require_once('skipif.inc');
 	if (!in_array('cdb', dba_handlers())) die('skip CDB handler not available');
+	die('skip CDB currently supports only reading');
 ?>
 --FILE--
 <?php
diff --git a/ext/dba/tests/dba_cdb_read.phpt b/ext/dba/tests/dba_cdb_read.phpt
index 8598d19d2e..6ead2f34d9 100644
--- a/ext/dba/tests/dba_cdb_read.phpt
+++ b/ext/dba/tests/dba_cdb_read.phpt
@@ -2,7 +2,7 @@
 DBA CDB handler test (read only)
 --SKIPIF--
 <?php 
-	require_once('skipif.inc');
+	if (!extension_loaded('dba')) die('skip dba extension not available');
 	if (!in_array('cdb', dba_handlers())) die('skip CDB handler not available');
 ?>
 --FILE--
diff --git a/ext/dba/tests/skipif.inc b/ext/dba/tests/skipif.inc
index 9a35e1e06b..3dc7157fe0 100644
--- a/ext/dba/tests/skipif.inc
+++ b/ext/dba/tests/skipif.inc
@@ -2,4 +2,11 @@
 	if (!extension_loaded('dba')) die('skip dba extension not available');
 	if (!function_exists('dba_handlers')) die ('skip dba_handlers() not available');
 	if (!sizeof(dba_handlers())) die('skip no handlers installed');
+	// CDB currently supports only reading 
+	$handler = dba_handlers(); 
+	if ($handler[0]=='cdb') {
+		if (count($handler)==1) {
+			die('skip CDB currently supports only reading ');
+		}
+	}
 ?>
diff --git a/ext/dba/tests/test.inc b/ext/dba/tests/test.inc
index 3ca3a49194..768fc8dac5 100644
--- a/ext/dba/tests/test.inc
+++ b/ext/dba/tests/test.inc
@@ -1,5 +1,13 @@
 <?php
 	$db_file = dirname(__FILE__).'/test0.dbm'; 
 	$handler = dba_handlers(); 
-	$handler = $handler[0];
+	// CDB currently supports only reading 
+	if ($handler[0]=='cdb') {
+		if (count($handler)==1) {
+			die('CDB currently supports only reading ');
+		}
+		$handler = $handler[1];
+	} else {
+		$handler = $handler[0];
+	}
 ?>